nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3683 from jlewin/master

Browse source 
Upgrade NUnit
This commit is contained in:
johnlewin 2018-09-01 11:39:23 -07:00 • committed by GitHub
commit 0ec7764fc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControl.csproj
View file

@ -727,9 +727,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Markdig" Version="0.15.0" />
<PackageReference Include="Markdig" Version="0.15.2" />
<PackageReference Include="MIConvexHull" Version="1.1.17.1019" />
<PackageReference Include="Mindscape.Raygun4Net" Version="5.5.2" />
<PackageReference Include="Mindscape.Raygun4Net" Version="5.5.4" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Zeroconf" Version="3.0.30" />
</ItemGroup>

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 5bd330ebea3fb84476240ffe4fa6f5fd22725cfb
Subproject commit d96a853fdd15ac16fbda56be6f00b52490562cf3

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 2283295f465f50440c0e71f842039512000e843f
Subproject commit 0713241a06f9766047df59ae9bde133cc28c2095

4
Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
View file

@ -42,8 +42,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit.ApplicationDomain" Version="11.0.0" />
<PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="NUnit.ApplicationDomain" Version="11.1.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\MatterControl.Tests\MatterControl\MatterControlUtilities.cs">

4
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

@ -45,8 +45,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit.ApplicationDomain" Version="11.0.0" />
<PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="NUnit.ApplicationDomain" Version="11.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
</ItemGroup>
<ItemGroup>