From 3683deb0444e6fe43ebfa9723d034f739223a0f4 Mon Sep 17 00:00:00 2001
From: Terje Sandstrom <terje@hermit.no>
Date: Wed, 1 Mar 2023 18:39:10 +0100
Subject: [PATCH] Enginefix (#1071)

* minor fixes to nuspec and update package for acceptance

* Fixes for issues #1065 and #1066

* updated version

* removed local feed
---
 NUnit3TestAdapter.sln                                     | 6 ++++++
 build.cake                                                | 2 +-
 nuget.config                                              | 1 -
 nuget/NUnit3TestAdapter.nuspec                            | 8 ++++++--
 .../NUnit.TestAdapter.Tests.Acceptance.csproj             | 2 +-
 src/NUnitTestAdapter/NUnit.TestAdapter.csproj             | 2 +-
 6 files changed, 15 insertions(+), 6 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..dd4fac03 100644
--- a/build.cake
+++ b/build.cake
@@ -12,7 +12,7 @@ var configuration = Argument("configuration", "Release");
 // SET PACKAGE VERSION
 //////////////////////////////////////////////////////////////////////
 
-var version = "4.4.0";
+var version = "4.4.1";
 var modifier = "";
 
 
diff --git a/nuget.config b/nuget.config
index 44d04257..01dd41bc 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,7 +2,6 @@
 <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" />-->
   </packageSources>
diff --git a/nuget/NUnit3TestAdapter.nuspec b/nuget/NUnit3TestAdapter.nuspec
index 137d066f..fe70321d 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>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>
-      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>
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>