Prepare 4.3.0 (#1024)

OsirisTerje · web-flow · commit 2d1b1bffc0be · 2022-10-29T16:33:50.000+02:00
* Prepare 4.3.0-rc.1

* updated acceptance tests

* updated outputxmlmode

* Update displayname

* Prepare 4.3.0
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2011-2020 Charlie Poole, 2014-2020 Terje Sandstrom
+Copyright (c) 2011-2020 Charlie Poole, 2014-2022 Terje Sandstrom
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/NUnit3TestAdapter.ndproj b/NUnit3TestAdapter.ndproj
diff --git a/NUnit3TestAdapter.sln b/NUnit3TestAdapter.sln
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build.ps1 = build.ps1
 		src\Directory.Build.props = src\Directory.Build.props
 		DisableAppDomain.runsettings = DisableAppDomain.runsettings
-		LICENSE.txt = LICENSE.txt
+		LICENSE = LICENSE
 		src\native-assembly\NativeTests.dll = src\native-assembly\NativeTests.dll
 		NuGet.Config = NuGet.Config
 		NUnit3TestAdapter.sln.DotSettings = NUnit3TestAdapter.sln.DotSettings
diff --git a/README.md b/README.md
@@ -2,13 +2,13 @@
 
 The NUnit 3 Test Adapter runs NUnit 3.x tests in Visual Studio 2012 and newer.
 
-This adapter works with NUnit 3.0 and higher only. Use the NUnit 2 Adapter to run NUnit 2.x tests.
+
 
 You can download the latest release version ![](https://img.shields.io/github/release-date/nunit/nunit3-vs-adapter.svg?style=flat)
 
 [![NuGet Version](https://img.shields.io/nuget/v/NUnit3TestAdapter.svg)](https://www.nuget.org/packages/NUnit3TestAdapter)  ![](https://img.shields.io/nuget/dt/NUnit3TestAdapter.svg?style=flat)
 
-or the latest pre-release version
+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)
 
@@ -43,7 +43,7 @@ The NUnit 3 Test Adapter is Open Source software released under the [![](https:/
 
 ## Developing
 
-Visual Studio 2019 is the minimum required version to build the adapter.
+Visual Studio 2022 is the recommended version to build and test the adapter.
 
 Use `.\build -t test` at the command line to build and run complete tests.
 
@@ -64,6 +64,12 @@ The NuGet package and the VSIX contain source-linked PDBs for the adapter.
 If you’re in the middle of a debugging session and realize you’d like to be able to step into NUnit adapter code,
 set breakpoints and watch variables, [follow these steps](https://github.com/nunit/docs/wiki/Adapter-Source-Stepping).
 
-## Announcement
+## Notes
+
+* This adapter works with NUnit 3.0 and higher only. Use the NUnit 2 Adapter to run NUnit 2.x tests.
+
+
+## Announcements
 * From version 3.9 the NUnit3TestAdapter will stop supporting Visual Studio 2012 RTM (!), note only RTM, the later updates will still be supported fully. If you're using VS 2012 and want to update NUnit3TestAdapter, please update your Visual Studio RTM to any of the subsequent updates (Update 1-5)
 * From version 3.16 the NUnit3TestAdapter will stop supporting .net core 1 
+* From version 4.0 the NUnit3TestAdapter will only be released as a nuget package, the VSIX is deprecated.
diff --git a/build.cake b/build.cake
@@ -13,7 +13,7 @@ var configuration = Argument("configuration", "Release");
 //////////////////////////////////////////////////////////////////////
 
 var version = "4.3.0";
-var modifier = "-alpha-108";
+var modifier = "";
 
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
diff --git a/global.json b/global.json
diff --git a/nuget/NUnit3TestAdapter.nuspec b/nuget/NUnit3TestAdapter.nuspec
@@ -18,7 +18,7 @@
           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-2021 Terje Sandstrom</copyright>
+        <copyright>Copyright (c) 2011-2021 Charlie Poole, 2014-2022 Terje Sandstrom</copyright>
         <language>en-US</language>
         <tags>test visualstudio testadapter nunit nunit3 dotnet</tags>
 
diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/AcceptanceTests.cs b/src/NUnit.TestAdapter.Tests.Acceptance/AcceptanceTests.cs
@@ -16,6 +16,7 @@ public class Frameworks
         public const string NetCoreApp21 = "netcoreapp2.1";
         public const string Net50 = "net5.0";
         public const string Net60 = "net6.0";
+        public const string Net70 = "net7.0";
     }
 
     [Category("Acceptance")]
@@ -39,7 +40,8 @@ public abstract class AcceptanceTests
             Frameworks.NetCoreApp21,
             Frameworks.NetCoreApp31,
             Frameworks.Net50,
-            Frameworks.Net60
+            Frameworks.Net60,
+            Frameworks.Net70
         };
 
         private static readonly Lazy<(IsolatedWorkspaceManager Manager, string NupkgVersion, bool KeepWorkspaces)> Initialization = new(() =>
@@ -71,7 +73,7 @@ public abstract class AcceptanceTests
                downloadCachePath: Path.Combine(directory, ".toolcache"));
 
            if (keepWorkspaces) manager.PreserveDirectory("The KeepWorkspaces test parameter was set to true.");
-
+           TestContext.WriteLine($"Directory: {directory}, NugetPackageDirectory {nupkgDirectory},NugetPackageVersion: {nupkgVersion}");
            return (manager, nupkgVersion, keepWorkspaces);
        });
 
diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj b/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj
@@ -11,13 +11,13 @@
 
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0-rc.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit.Analyzers" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/NUnit3AdapterExternalTests/NUnit3AdapterExternalTests.csproj b/src/NUnit3AdapterExternalTests/NUnit3AdapterExternalTests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/NUnitTestAdapter/AdapterSettings.cs b/src/NUnitTestAdapter/AdapterSettings.cs
@@ -433,6 +433,9 @@ private void SetTestOutputFolder()
                 case OutputXmlFolderMode.RelativeToWorkFolder:
                     TestOutputFolder = Path.Combine(WorkDirectory, TestOutputXml);
                     return;
+                case OutputXmlFolderMode.AsSpecified:
+                default:
+                    return;
             }
         }
 
@@ -667,6 +670,7 @@ public enum OutputXmlFolderMode
     {
         UseResultDirectory,
         RelativeToResultDirectory,
-        RelativeToWorkFolder
+        RelativeToWorkFolder,
+        AsSpecified
     }
 }
diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyDescription("A package containing the NUnit3 TestAdapter for Visual Studio 2012 onwards. \n\r\nThe package works with Visual Studio 2012 and newer, dotnet test and VSTest.Console.\r\n")]
 [assembly: AssemblyCompany("NUnit Project")]
 [assembly: AssemblyProduct("NUnit3TestAdapter")]
-[assembly: AssemblyCopyright("Copyright © 2011-2021 Charlie Poole, 2014-2021 Terje Sandstrom")]
+[assembly: AssemblyCopyright("Copyright © 2011-2021 Charlie Poole, 2014-2022 Terje Sandstrom")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: CLSCompliant(false)]
diff --git a/src/NUnitTestAdapter/TestConverter.cs b/src/NUnitTestAdapter/TestConverter.cs
@@ -231,7 +231,13 @@ bool CheckCodeFilePathOverride()
         private string CreateDisplayName(string fullyQualifiedName, string testNodeName)
         {
             return adapterSettings.FreakMode
-                ? "N:Name -> MS:DisplayName (default)"
+                ? adapterSettings.DisplayName switch
+                {
+                    DisplayNameOptions.Name => "N:Name -> MS:DisplayName (default)",
+                    DisplayNameOptions.FullName => "N:FullyQualifiedName -> MS:DisplayName",
+                    DisplayNameOptions.FullNameSep => $"N:FullyQualifiedName -> MS:DisplayName, with separator '.' replaced with '{adapterSettings.FullnameSeparator}'",
+                    _ => $"Invalid setting: {adapterSettings.DisplayName}"
+                }
                 : adapterSettings.DisplayName switch
                 {
                     DisplayNameOptions.Name => testNodeName,
diff --git a/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj b/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/empty-assembly/empty-assembly.csproj b/src/empty-assembly/empty-assembly.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/mock-assembly/mock-assembly.csproj b/src/mock-assembly/mock-assembly.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -433,6 +433,9 @@ private void SetTestOutputFolder()`
`433`	`433`	`case OutputXmlFolderMode.RelativeToWorkFolder:`
`434`	`434`	`TestOutputFolder = Path.Combine(WorkDirectory, TestOutputXml);`
`435`	`435`	`return;`
	`436`	`+ case OutputXmlFolderMode.AsSpecified:`
	`437`	`+ default:`
	`438`	`+ return;`
`436`	`439`	`}`
`437`	`440`	`}`
`438`	`441`
`@@ -667,6 +670,7 @@ public enum OutputXmlFolderMode`
`667`	`670`	`{`
`668`	`671`	`UseResultDirectory,`
`669`	`672`	`RelativeToResultDirectory,`
`670`		`- RelativeToWorkFolder`
	`673`	`+ RelativeToWorkFolder,`
	`674`	`+ AsSpecified`
`671`	`675`	`}`
`672`	`676`	`}`