Merge pull request #1397 from nunit/prepare61

OsirisTerje · web-flow · commit 4ff7e11cd67a · 2026-01-07T21:13:44.000+01:00
Prepare version 6.1
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="nunit" Version="4.4.0" />
-    <PackageVersion Include="nunit.engine" Version="3.22.0-alpha.11" />
+    <PackageVersion Include="nunit.engine" Version="3.22.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.0.1" />
     <PackageVersion Include="SourceLink.Create.CommandLine" Version="2.8.3" />
     <PackageVersion Include="TestCentric.Metadata" Version="3.0.4" />
diff --git a/README.md b/README.md
@@ -11,6 +11,7 @@ or the latest developer build version
 [![MyGet version](https://img.shields.io/myget/nunit/vpre/NUnit3TestAdapter.svg?label=Myget%3A%20Latest%20pre-release&style=flat)](https://www.myget.org/feed/nunit/package/nuget/NUnit3TestAdapter)
 
 ##### Builds on main
+
 ![NUnit3TestAdapter.CI](https://img.shields.io/github/actions/workflow/status/nunit/nunit3-vs-adapter/NUnit3TestAdapter.CI.yml?branch=main)
 
 ##### Support
@@ -28,8 +29,7 @@ Also check the [release notes](https://docs.nunit.org/articles/vs-test-adapter/A
 
 The NUnit 3 Test Adapter is Open Source software released under the [![MIT license](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/nunit/nunit3-vs-adapter/blob/main/LICENSE).
 
-
-## Developing
+## Development
 
 Visual Studio 2026 is the recommended version to build and test the adapter.
 
diff --git a/build.cake b/build.cake
@@ -13,9 +13,9 @@ var configuration = Argument("configuration", "Release");
 //////////////////////////////////////////////////////////////////////
 
 
-var version = "6.0.2";
+var version = "6.1.0";
 
-var modifier = "-beta.1";
+var modifier = "";
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
 var packageVersion = version + modifier + dbgSuffix;
diff --git a/nuget.config b/nuget.config
@@ -3,6 +3,5 @@
   <packageSources>
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="myget" value="https://www.myget.org/F/nunit/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/renovate.json b/renovate.json
@@ -7,7 +7,7 @@
       "matchPackageNames": [
         "nunit.engine"
       ],
-      "allowedVersions": "3.18.1",
+      "allowedVersions": "3.22.0",
       "enabled": false
     },
     {
diff --git a/src/NUnitTestAdapter/AdapterSettings.cs b/src/NUnitTestAdapter/AdapterSettings.cs
@@ -1,5 +1,5 @@
 // ***********************************************************************
-// Copyright (c) 2014-2021 Charlie Poole, 2014-2025 Terje Sandstrom
+// Copyright (c) 2014-2021 Charlie Poole, 2014-2026 Terje Sandstrom
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -9,8 +9,9 @@
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <SourceLinkOriginUrl>https://github.com/nunit/nunit3-vs-adapter</SourceLinkOriginUrl>
         <SourceLinkCreate>true</SourceLinkCreate>
-        <AssemblyVersion>6.0.0.0</AssemblyVersion>
-        <FileVersion>6.0.2.100</FileVersion>
+        <AssemblyVersion>6.1.0.0</AssemblyVersion>
+        <FileVersion>6.1.0.0</FileVersion>
+        <Version>$(PackageVersion)</Version>
         <NeutralLanguage>en</NeutralLanguage>
         <Title>NUnit3 Test Adapter for Visual Studio</Title>
         <Copyright>Copyright © 2011-2021 Charlie Poole, 2014-2026 Terje Sandstrom</Copyright>
diff --git a/src/NUnitTestAdapter/NUnitEventListener.cs b/src/NUnitTestAdapter/NUnitEventListener.cs
@@ -1,5 +1,5 @@
 ﻿// ***********************************************************************
-// Copyright (c) 2011-2021 Charlie Poole, 2014-2025 Terje Sandstrom
+// Copyright (c) 2011-2021 Charlie Poole, 2014-2026 Terje Sandstrom
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
diff --git a/src/NUnitTestAdapter/NUnitTestAdapter.cs b/src/NUnitTestAdapter/NUnitTestAdapter.cs
@@ -192,8 +192,6 @@ protected TestPackage CreateTestPackage(string assemblyName, IGrouping<string, T
     {
         var package = new TestPackage(assemblyName);
 
-
-
         if (Settings.ShadowCopyFiles)
         {
             package.Settings[PackageSettings.ShadowCopyFiles] = true;
diff --git a/src/NUnitTestAdapter/PackageSettings.cs b/src/NUnitTestAdapter/PackageSettings.cs
@@ -1,5 +1,5 @@
 // ***********************************************************************
-// Copyright (c) 2011-2021 Charlie Poole, 2014-2025 Terje Sandstrom
+// Copyright (c) 2011-2021 Charlie Poole, 2014-2026 Terje Sandstrom
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
diff --git a/src/NUnitTestAdapter/TestConverter.cs b/src/NUnitTestAdapter/TestConverter.cs
@@ -1,5 +1,5 @@
 // ***********************************************************************
-// Copyright (c) 2011-2021 Charlie Poole, 2011 - 2025 Terje Sandstrom
+// Copyright (c) 2011-2021 Charlie Poole, 2011-2026 Terje Sandstrom
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
diff --git a/src/NUnitTestAdapter/TestFilterConverter/FullyQualifiedNameFilterParser.cs b/src/NUnitTestAdapter/TestFilterConverter/FullyQualifiedNameFilterParser.cs
@@ -1,5 +1,5 @@
 ﻿// ***********************************************************************
-// Copyright (c) 2011-2021 Charlie Poole, 2014-2025 Terje Sandstrom
+// Copyright (c) 2011-2021 Charlie Poole, 2014-2026 Terje Sandstrom
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"matchPackageNames": [`
`8`	`8`	`"nunit.engine"`
`9`	`9`	`],`
`10`		`- "allowedVersions": "3.18.1",`
	`10`	`+ "allowedVersions": "3.22.0",`
`11`	`11`	`"enabled": false`
`12`	`12`	`},`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,6 @@ protected TestPackage CreateTestPackage(string assemblyName, IGrouping<string, T`
`192`	`192`	`{`
`193`	`193`	`var package = new TestPackage(assemblyName);`
`194`	`194`
`195`		`-`
`196`		`-`
`197`	`195`	`if (Settings.ShadowCopyFiles)`
`198`	`196`	`{`
`199`	`197`	`package.Settings[PackageSettings.ShadowCopyFiles] = true;`