From d0913e7dc2f169de502951f6e71eb7432b52f97b Mon Sep 17 00:00:00 2001
From: Terje Sandstrom <terje@hermit.no>
Date: Tue, 26 Sep 2023 17:54:39 +0200
Subject: [PATCH] Package updates

---
 README.md                                         |  2 +-
 build.cake                                        |  6 +++---
 src/Directory.Build.props                         | 15 ---------------
 .../NUnit.TestAdapter.Tests.Acceptance.csproj     |  2 +-
 src/NUnitTestAdapterTests/AdapterSettingsTests.cs | 13 ++++++-------
 .../NUnit.TestAdapter.Tests.csproj                |  6 +++---
 6 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 7ae85d28..c87eed34 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # NUnit 3 VS Test Adapter #
 
-The NUnit 3 Test Adapter runs NUnit 3.x tests in Visual Studio 2012 and newer.
+The NUnit 3 Test Adapter runs NUnit 3.x and higher tests in Visual Studio 2012 and newer.
 
 
 
diff --git a/build.cake b/build.cake
index a64397a1..ca720c11 100644
--- a/build.cake
+++ b/build.cake
@@ -1,5 +1,5 @@
 #tool vswhere&version=3.1.1
-#tool Microsoft.TestPlatform&version=17.4.0
+#tool Microsoft.TestPlatform&version=17.7.2
 
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -13,9 +13,9 @@ var configuration = Argument("configuration", "Release");
 //////////////////////////////////////////////////////////////////////
 
 
-var version = "4.5.0";
+var version = "4.6.0";
 
-var modifier = "";
+var modifier = "-beta.1";
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
 var packageVersion = version + modifier + dbgSuffix;
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index a295239c..2e86a1fa 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -15,19 +15,4 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
   </ItemGroup>
-
-  <Target Name="RemoveReferencesToEmbeddedAssembles" AfterTargets="ResolveAssemblyReferences">
-    <ItemGroup>
-      <!-- Don’t copy Mono.Cecil to the output directory. Useful for debugging the embedded loading mechanism. -->
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(Filename)' == 'Mono.Cecil'" />
-
-      <!-- Important: remove references to Mono.Cecil at compile time. This is insurance.
-           If the compiled assembly has a reference to Mono.Cecil, the VSTest could try to load Mono.Cecil
-           while reflecting over the adapter types looking for interface implementations. Since VSTest would
-           be triggering the load of Mono.Cecil before we have a chance to handle AssemblyResolve, the load
-           would fail. VSTest does ignore the adapter assembly in this scenario. -->
-      <ReferencePath Remove="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)' == 'Mono.Cecil'" />
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj b/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj
index c41ad1b1..da229795 100644
--- a/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj
+++ b/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit.Analyzers" Version="3.8.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/NUnitTestAdapterTests/AdapterSettingsTests.cs b/src/NUnitTestAdapterTests/AdapterSettingsTests.cs
index 56b65280..118a4bb0 100644
--- a/src/NUnitTestAdapterTests/AdapterSettingsTests.cs
+++ b/src/NUnitTestAdapterTests/AdapterSettingsTests.cs
@@ -209,10 +209,7 @@ public void TestOutputSetting()
             _settings.Load(@"<RunSettings><NUnit><WorkDirectory>C:\Whatever</WorkDirectory><TestOutputXml>/my/work/dir</TestOutputXml></NUnit></RunSettings>");
             Assert.That(_settings.UseTestOutputXml);
             _settings.SetTestOutputFolder(_settings.WorkDirectory);
-            Assert.Multiple(() =>
-            {
-                Assert.That(_settings.TestOutputFolder, Does.Contain(@"/my/work/dir"));
-            });
+            Assert.That(_settings.TestOutputFolder, Does.Contain(@"/my/work/dir"));
         }
 
         /// <summary>
@@ -260,11 +257,13 @@ public void TestOutputSettingAsSpecified()
             _settings.Load(@"<RunSettings><NUnit><TestOutputXml>c:\whatever</TestOutputXml></NUnit></RunSettings>");
             Assert.That(_settings.UseTestOutputXml, "Settings not loaded properly");
             _settings.SetTestOutputFolder(_settings.WorkDirectory);
-            Assert.That(_settings.TestOutputFolder, Is.EqualTo(@"c:\whatever"), "Content not correct");
-            Assert.That(_settings.OutputXmlFolderMode, Is.EqualTo(OutputXmlFolderMode.AsSpecified), "Should be set default AsSpecified with absolute path in");
+            Assert.Multiple(() =>
+            {
+                Assert.That(_settings.TestOutputFolder, Is.EqualTo(@"c:\whatever"), "Content not correct");
+                Assert.That(_settings.OutputXmlFolderMode, Is.EqualTo(OutputXmlFolderMode.AsSpecified), "Should be set default AsSpecified with absolute path in");
+            });
         }
 
-
         [Test]
         public void NumberOfTestWorkersSetting()
         {
diff --git a/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj b/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj
index 96f81507..b61f24d2 100644
--- a/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj
+++ b/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj
@@ -23,12 +23,12 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
   </ItemGroup>
 
   <ItemGroup>