FIx targets and tests

nunit · Jan 31, 2025 · 9dc13fc · 9dc13fc
2 parents 935992d + 25a1573
commit 9dc13fc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 30 deletions.
diff --git a/.github/workflows/NUnit3TestAdapter.CI.yml b/.github/workflows/NUnit3TestAdapter.CI.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/[email protected].0
+    - uses: actions/[email protected].2
     - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |

diff --git a/.github/workflows/NUnit3TestAdapter.Myget.Publish.yml b/.github/workflows/NUnit3TestAdapter.Myget.Publish.yml
@@ -6,7 +6,6 @@ on:
       - main
       - master
       - release
-      - 'v3'
       - myget
   workflow_dispatch:
 
@@ -27,9 +26,7 @@ jobs:
       with:
         dotnet-version: |
           3.1.x
-          5.0.x
           6.0.x
-          7.0.x
           8.0.x
            
     - name: Build  
@@ -46,6 +43,4 @@ jobs:
           foreach($file in (Get-ChildItem package -Recurse -Include *.nupkg)) {
               dotnet nuget push $file --api-key "${{ secrets.PUBLISHMYGET }}" --source https://www.myget.org/F/nunit/api/v3/index.json --skip-duplicate
           }
-          foreach($file in (Get-ChildItem "package" -Recurse -Include *.snupkg)) {
-              dotnet nuget push $file --api-key "${{ secrets.PUBLISHMYGET }}" --source https://www.myget.org/F/nunit/api/v3/index.json --skip-duplicate
-          } 
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,8 +4,9 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageVersion Include="NSubstitute" Version="5.1.0" />
+
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="nunit" Version="4.2.2" />
     <PackageVersion Include="nunit.engine" Version="3.18.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />

diff --git a/build.cake b/build.cake
@@ -1,5 +1,5 @@
 #tool vswhere&version=3.1.7
-#tool Microsoft.TestPlatform&version=17.9.0
+#tool Microsoft.TestPlatform&version=17.12.0
 
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS

diff --git a/nuget/NUnit3TestAdapter.nuspec b/nuget/NUnit3TestAdapter.nuspec
@@ -19,20 +19,20 @@
       For VS 2017 and forward, you should add this package to every test project in your solution. (Earlier versions only require a single adapter package per solution.)
     </description>
     <releaseNotes>See https://docs.nunit.org/articles/vs-test-adapter/Adapter-Release-Notes.html </releaseNotes>
-    <copyright>Copyright (c) 2011-2021 Charlie Poole, 2014-2024 Terje Sandstrom</copyright>
+    <copyright>Copyright (c) 2011-2021 Charlie Poole, 2014-2025 Terje Sandstrom</copyright>
     <language>en-US</language>
     <tags>test visualstudio testadapter nunit nunit3 dotnet</tags>
 
     <developmentDependency>false</developmentDependency>
 
     <dependencies>
       <group targetFramework="net462">
-        <dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="1.5.1" />
-        <dependency id="Microsoft.Testing.Platform.MSBuild" version="1.5.1" />
+        <dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="1.5.3" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="1.5.3" />
       </group>
       <group targetFramework="netcoreapp3.1">
-        <dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="1.5.1" />
-        <dependency id="Microsoft.Testing.Platform.MSBuild" version="1.5.1" />
+        <dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="1.5.3" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="1.5.3" />
       </group>
     </dependencies>
   </metadata>

diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/AcceptanceTests.cs b/src/NUnit.TestAdapter.Tests.Acceptance/AcceptanceTests.cs
@@ -38,15 +38,12 @@ public abstract class AcceptanceTests
     protected static IEnumerable<string> DotNetCliTargetFrameworks =>
     [
         Frameworks.NetCoreApp31,
-        Frameworks.Net50,
         Frameworks.Net60,
-        Frameworks.Net70
     ];
 
     protected static IEnumerable<string> ModernDotNetCliTargetFrameworks =>
     [
         Frameworks.Net60,
-        Frameworks.Net70,
         Frameworks.Net80
     ];
 
@@ -95,11 +92,6 @@ public class SingleFrameworkSource
                 Framework = Frameworks.NetCoreApp31,
                 NUnitVersion = NUnit3
             },
-            new ()
-            {
-                Framework = Frameworks.Net50,
-                NUnitVersion = NUnit3
-            }
         ];
 
         public static IEnumerable<SingleFrameworkSource> ModernDotNetFramework =>
@@ -110,11 +102,6 @@ public class SingleFrameworkSource
                 NUnitVersion = NUnit4
             },
             new ()
-            {
-                Framework = Frameworks.Net70,
-                NUnitVersion = NUnit4
-            },
-            new ()
             {
                 Framework = Frameworks.Net80,
                 NUnitVersion = NUnit4
@@ -128,8 +115,7 @@ public class SingleFrameworkSource
     protected string NUnitVersion(string targetFramework) =>
         targetFramework switch
         {
-            Frameworks.NetCoreApp31
-                or Frameworks.Net50 => NUnit3,
+            Frameworks.NetCoreApp31 => NUnit3,
             _ => NUnit4,
         };