From fc45a64fb63f744dd48ed0eb65012ef203ce9564 Mon Sep 17 00:00:00 2001
From: Terje Sandstrom <terje@hermit.no>
Date: Mon, 27 Feb 2023 19:42:28 +0100
Subject: [PATCH 1/5] minor fixes to nuspec and update package for acceptance

---
 nuget/NUnit3TestAdapter.nuspec                            | 8 ++++++--
 .../NUnit.TestAdapter.Tests.Acceptance.csproj             | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nuget/NUnit3TestAdapter.nuspec b/nuget/NUnit3TestAdapter.nuspec
index 137d066f..7e7be88d 100644
--- a/nuget/NUnit3TestAdapter.nuspec
+++ b/nuget/NUnit3TestAdapter.nuspec
@@ -8,11 +8,12 @@
     <license type="expression">MIT</license>
     <projectUrl>https://docs.nunit.org/articles/vs-test-adapter/Index.html</projectUrl>
     <repository type="git" url="https://github.com/nunit/nunit3-vs-adapter"/>
-    <iconUrl>https://cdn.rawgit.com/nunit/resources/master/images/icon/nunit_256.png</iconUrl>
+    <icon>images\nunit_256.png</icon>
+    <readme>README.md</readme>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>NUnit3 adapter for running tests in Visual Studio and DotNet. Works with NUnit 3.x, use the NUnit 2 adapter for 2.x tests.</summary>
     <description>
-      The NUnit3 TestAdapter for Visual Studio, all versions from 2012 and onwards, and DotNet (incl. .Net core).
+      The NUnit3 TestAdapter for Visual Studio, all versions from 2012 and onwards, and DotNet (incl. .Net core), versions .net framework 4.6.2 or higher, .net core 3.1, .net 5 or higher.
 
       Note that this package ONLY contains the adapter, not the NUnit framework.
       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.)
@@ -25,6 +26,9 @@
     <developmentDependency>false</developmentDependency>
   </metadata>
   <files>
+    <file src="images\nunit_256.png" target="" />
+    <file src="README.md" target="docs\" />
+
     <file src="build\net462\NUnit3.TestAdapter.dll" target="build\net462\NUnit3.TestAdapter.dll" />
     <file src="build\net462\NUnit3.TestAdapter.pdb" target="build\net462\NUnit3.TestAdapter.pdb" />
     <file src="build\net462\nunit.engine.dll" target="build\net462\nunit.engine.dll" />
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 7f7cbf68..066c0be3 100644
--- a/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj
+++ b/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.0-beta.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.6.0" />
   </ItemGroup>

From 5c4f2c9f93b4b63b68a4447eadf93a03fd06e11f Mon Sep 17 00:00:00 2001
From: Terje Sandstrom <terje@hermit.no>
Date: Mon, 27 Feb 2023 20:13:47 +0100
Subject: [PATCH 2/5] Fixes for issues #1065 and #1066

---
 NUnit3TestAdapter.sln                         | 6 ++++++
 build.cake                                    | 4 ++--
 nuget.config                                  | 2 +-
 nuget/NUnit3TestAdapter.nuspec                | 8 ++++----
 src/NUnitTestAdapter/NUnit.TestAdapter.csproj | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/NUnit3TestAdapter.sln b/NUnit3TestAdapter.sln
index 8dcaba4d..880d2f99 100644
--- a/NUnit3TestAdapter.sln
+++ b/NUnit3TestAdapter.sln
@@ -62,6 +62,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcoreapp3.1", "netcoreapp
 		nuget\netcoreapp3.1\NUnit3TestAdapter.props = nuget\netcoreapp3.1\NUnit3TestAdapter.props
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{3D1159FD-FC4D-4750-87EA-F477B3912B3C}"
+	ProjectSection(SolutionItems) = preProject
+		images\nunit_256.png = images\nunit_256.png
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -101,6 +106,7 @@ Global
 		{062B1763-73C8-4B5A-92DF-C66A36C43CE1} = {7CE30108-5D81-4850-BE6B-C8BCA35D3592}
 		{7D708804-B2F1-4A31-A9FB-85A0C7433200} = {062B1763-73C8-4B5A-92DF-C66A36C43CE1}
 		{2F940513-5B8F-45A5-A188-7C5D03D1B50D} = {DE347D88-F6ED-4031-AFC2-318F63E39BC9}
+		{3D1159FD-FC4D-4750-87EA-F477B3912B3C} = {7CE30108-5D81-4850-BE6B-C8BCA35D3592}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8EF03474-188E-44A8-8C76-9FBCF9A382EC}
diff --git a/build.cake b/build.cake
index 3f90bd0b..bfc32646 100644
--- a/build.cake
+++ b/build.cake
@@ -12,8 +12,8 @@ var configuration = Argument("configuration", "Release");
 // SET PACKAGE VERSION
 //////////////////////////////////////////////////////////////////////
 
-var version = "4.4.0";
-var modifier = "";
+var version = "4.4.1";
+var modifier = "-alpha.1";
 
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
diff --git a/nuget.config b/nuget.config
index 44d04257..485a6c6e 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,6 +4,6 @@
     <clear />
     <!--<add key="Local" value="C:\nuget" />-->
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <!--<add key="Local" value="c:\nuget" />-->
+    <add key="Local" value="c:\nuget" />
   </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/nuget/NUnit3TestAdapter.nuspec b/nuget/NUnit3TestAdapter.nuspec
index 7e7be88d..fe70321d 100644
--- a/nuget/NUnit3TestAdapter.nuspec
+++ b/nuget/NUnit3TestAdapter.nuspec
@@ -8,8 +8,8 @@
     <license type="expression">MIT</license>
     <projectUrl>https://docs.nunit.org/articles/vs-test-adapter/Index.html</projectUrl>
     <repository type="git" url="https://github.com/nunit/nunit3-vs-adapter"/>
-    <icon>images\nunit_256.png</icon>
-    <readme>README.md</readme>
+    <icon>nunit_256.png</icon>
+    <readme>docs\README.md</readme>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>NUnit3 adapter for running tests in Visual Studio and DotNet. Works with NUnit 3.x, use the NUnit 2 adapter for 2.x tests.</summary>
     <description>
@@ -26,8 +26,8 @@
     <developmentDependency>false</developmentDependency>
   </metadata>
   <files>
-    <file src="images\nunit_256.png" target="" />
-    <file src="README.md" target="docs\" />
+    <file src="..\..\images\nunit_256.png" target="" />
+    <file src="..\..\README.md" target="docs\" />
 
     <file src="build\net462\NUnit3.TestAdapter.dll" target="build\net462\NUnit3.TestAdapter.dll" />
     <file src="build\net462\NUnit3.TestAdapter.pdb" target="build\net462\NUnit3.TestAdapter.pdb" />
diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
index 6cd5423d..51689a32 100644
--- a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
+++ b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-    <PackageReference Include="nunit.engine" Version="3.16.3" />
+    <PackageReference Include="nunit.engine" Version="3.15.3-net8-3153-1" />
     <PackageReference Include="TestCentric.Metadata" Version="1.7.1" Aliases="TestCentric" />
   </ItemGroup>
 

From 9cc3dfa9e2ff65ae7512a1f6493324acd624f4ee Mon Sep 17 00:00:00 2001
From: Terje Sandstrom <terje@hermit.no>
Date: Wed, 1 Mar 2023 18:25:29 +0100
Subject: [PATCH 3/5] updated version

---
 build.cake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.cake b/build.cake
index bfc32646..dd4fac03 100644
--- a/build.cake
+++ b/build.cake
@@ -13,7 +13,7 @@ var configuration = Argument("configuration", "Release");
 //////////////////////////////////////////////////////////////////////
 
 var version = "4.4.1";
-var modifier = "-alpha.1";
+var modifier = "";
 
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";

From 3846cd23e1f07d768277335543f501aed09bbd66 Mon Sep 17 00:00:00 2001
From: Terje Sandstrom <terje@hermit.no>
Date: Wed, 1 Mar 2023 18:34:59 +0100
Subject: [PATCH 4/5] removed local feed

---
 nuget.config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nuget.config b/nuget.config
index 485a6c6e..01dd41bc 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,8 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <!--<add key="Local" value="C:\nuget" />-->
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="Local" value="c:\nuget" />
+    <!--<add key="Local" value="c:\nuget" />-->
   </packageSources>
 </configuration>
\ No newline at end of file

From bfbee5a7892540cfbf3607e6589cf43b9c04289c Mon Sep 17 00:00:00 2001
From: Terje Sandstrom <terje@hermit.no>
Date: Wed, 1 Mar 2023 18:51:58 +0100
Subject: [PATCH 5/5] updated to 4.4.2, removed refs to dependencymodel package

---
 build.cake                                    | 2 +-
 nuget/NUnit3TestAdapter.nuspec                | 2 +-
 nuget/netcoreapp3.1/NUnit3TestAdapter.props   | 5 -----
 src/NUnitTestAdapter/NUnit.TestAdapter.csproj | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/build.cake b/build.cake
index dd4fac03..d5356259 100644
--- a/build.cake
+++ b/build.cake
@@ -12,7 +12,7 @@ var configuration = Argument("configuration", "Release");
 // SET PACKAGE VERSION
 //////////////////////////////////////////////////////////////////////
 
-var version = "4.4.1";
+var version = "4.4.2";
 var modifier = "";
 
 
diff --git a/nuget/NUnit3TestAdapter.nuspec b/nuget/NUnit3TestAdapter.nuspec
index fe70321d..387fc517 100644
--- a/nuget/NUnit3TestAdapter.nuspec
+++ b/nuget/NUnit3TestAdapter.nuspec
@@ -44,7 +44,7 @@
     <file src="build\netcoreapp3.1\nunit.engine.core.dll" target="build\netcoreapp3.1\nunit.engine.core.dll" />
     <file src="build\netcoreapp3.1\testcentric.engine.metadata.dll" target="build\netcoreapp3.1\testcentric.engine.metadata.dll"/>
     <file src="build\netcoreapp3.1\NUnit3TestAdapter.props" target="build\netcoreapp3.1\NUnit3TestAdapter.props" />
-    <file src="build\netcoreapp3.1\Microsoft.Extensions.DependencyModel.dll" target="build\netcoreapp3.1\Microsoft.Extensions.DependencyModel.dll" />
+
 
   </files>
 </package>
diff --git a/nuget/netcoreapp3.1/NUnit3TestAdapter.props b/nuget/netcoreapp3.1/NUnit3TestAdapter.props
index b812e855..5e45aede 100644
--- a/nuget/netcoreapp3.1/NUnit3TestAdapter.props
+++ b/nuget/netcoreapp3.1/NUnit3TestAdapter.props
@@ -31,10 +31,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyModel.dll">
-        <Link>Microsoft.Extensions.DependencyModel.dll</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <Visible>False</Visible>
-    </None>
   </ItemGroup>
 </Project>
diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
index 51689a32..6f14e4d7 100644
--- a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
+++ b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -34,7 +34,6 @@
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>