Bump Microsoft.NET.Test.Sdk from 17.3.2 to 17.4.0 (#5098)

NLog · Nov 9, 2022 · ee95998 · ee95998
1 parent ace23d8
commit ee95998
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 version: 5.0.0-{build} # Only change for mayor versions (e.g. 6.0)
 image:
   - Visual Studio 2022
-  - Previous Ubuntu
+  - Ubuntu
 configuration: Release
 build: no
 test: no
@@ -54,7 +54,7 @@ for:
   -
     matrix:
       only:
-        - image: Previous Ubuntu
+        - image: Ubuntu
     environment:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       FrameworkPathOverride: /usr/lib/mono/4.6.1-api/

diff --git a/run-tests.ps1 b/run-tests.ps1
@@ -23,14 +23,14 @@ if ($isWindows -or $Env:WinDir)
 	dotnet msbuild /t:Build /p:targetFramework=net461 /p:Configuration=Release /p:DebugType=Full /p:TestTargetFramework=net35 ./tests/NLog.UnitTests/
 	if (-Not $LastExitCode -eq 0)
 		{ exit $LastExitCode }
-	dotnet vstest ./tests/NLog.UnitTests/bin/Release/net35/NLog.UnitTests.dll
+	dotnet vstest ./tests/NLog.UnitTests/bin/release/net35/NLog.UnitTests.dll
 	if (-Not $LastExitCode -eq 0)
 		{ exit $LastExitCode }
 
 	dotnet msbuild /t:Build /p:targetFramework=net461 /p:Configuration=Release /p:DebugType=Full /p:TestTargetFramework=net45 ./tests/NLog.UnitTests/
 	if (-Not $LastExitCode -eq 0)
 		{ exit $LastExitCode }
-	dotnet vstest ./tests/NLog.UnitTests/bin/Release/net45/NLog.UnitTests.dll
+	dotnet vstest ./tests/NLog.UnitTests/bin/release/net45/NLog.UnitTests.dll
 	if (-Not $LastExitCode -eq 0)
 		{ exit $LastExitCode }
 
@@ -43,15 +43,19 @@ if ($isWindows -or $Env:WinDir)
 }
 else
 {
+	dotnet test ./tests/NLog.Database.Tests/ --framework netcoreapp3.1 --configuration release
+	if (-Not $LastExitCode -eq 0)
+		{ exit $LastExitCode }
+
 	# Need help from MONO to run normal .NetFramework tests
-	dotnet msbuild /t:Restore,Rebuild /p:targetframework=net461 /p:Configuration=Release /p:DebugType=Full /p:monobuild=1 tests/NLog.UnitTests
+	dotnet msbuild /t:restore ./tests/NLog.UnitTests/ /p:RestoreForce=true /p:monobuild=1
+	if (-Not $LastExitCode -eq 0)
+		{ exit $LastExitCode }
+	dotnet build ./tests/NLog.UnitTests/ --framework net461 --configuration release --no-restore --no-incremental /p:monobuild=1
     if (-Not $LastExitCode -eq 0)
 	    { exit $LastExitCode }
-	dotnet vstest ./tests/NLog.UnitTests/bin/Release/net461/NLog.UnitTests.dll
+
+	dotnet vstest ./tests/NLog.UnitTests/bin/release/net461/NLog.UnitTests.dll
     if (-Not $LastExitCode -eq 0)
 	    { exit $LastExitCode }
-
-	dotnet test ./tests/NLog.Database.Tests/ --framework netcoreapp3.1 --configuration release
-	if (-Not $LastExitCode -eq 0)
-		{ exit $LastExitCode }
 }
diff --git a/src/NLog/NLog.csproj b/src/NLog/NLog.csproj
@@ -167,7 +167,7 @@ For all config options and platform support, check https://nlog-project.org/conf
   <ItemGroup Condition=" '$(monobuild)' != '' ">
     <Reference Include="Mono.Posix" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <None Update="Common\InternalLogger-generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>

diff --git a/tests/NLog.Database.Tests/NLog.Database.Tests.csproj b/tests/NLog.Database.Tests/NLog.Database.Tests.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.4" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.5" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.17" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.2" />  <!-- Help Microsoft.Data.Sqlite -->

diff --git a/tests/NLog.UnitTests/NLog.UnitTests.csproj b/tests/NLog.UnitTests/NLog.UnitTests.csproj
@@ -39,12 +39,8 @@
     <PackageReference Include="NSubstitute" Version="4.4.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.3.2" Condition="'$(OS)' != 'Windows_NT'" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.4.0" Condition="'$(OS)' != 'Windows_NT'" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">

diff --git a/tests/NLog.WindowsRegistry.Tests/NLog.WindowsRegistry.Tests.csproj b/tests/NLog.WindowsRegistry.Tests/NLog.WindowsRegistry.Tests.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />