- update NUnit3TestAdapter to v4.2.1 on .NET Core 2.1+

- update `NUnit` to v3.13.3 - update `Microsoft.NET.Test.Sdk` to v7.1.0 on .NET 6.0+
nunit · Mar 28, 2022 · 34ab5de · 34ab5de
1 parent 194a929
commit 34ab5de
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 21 deletions.
diff --git a/Content/dotnet-new-nunit-csharp/.template.config/template.json b/Content/dotnet-new-nunit-csharp/.template.config/template.json
@@ -136,9 +136,13 @@
       "type": "computed",
       "value": "(Framework >= \"netcoreapp2.1\" && Framework <= \"netcoreapp9\")"
     },
-    "DotNetCoreGreaterOrEqualThan50": {
+    "DotNet50": {
       "type": "computed",
-      "value": "(Framework >= \"net5.0\" && Framework < \"net9.0\")"
+      "value": "(Framework >= \"net5.0\" && Framework < \"net6.0\")"
+    },
+    "DotNetCoreGreaterOrEqualThan60": {
+      "type": "computed",
+      "value": "(Framework >= \"net6.0\" && Framework < \"net9.0\")"
     },
     "EnablePack": {
       "type": "parameter",

diff --git a/Content/dotnet-new-nunit-csharp/Company.TestProject1.csproj b/Content/dotnet-new-nunit-csharp/Company.TestProject1.csproj
@@ -10,15 +10,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" Condition="$(DotNetCoreLessThan21)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetCoreGreaterOrEqualThan21)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetCoreGreaterOrEqualThan50)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetFramework)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetCoreGreaterOrEqualThan21)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNet50)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetCoreGreaterOrEqualThan60)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetFramework)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="$(DotNetCoreLessThan20)"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetCoreGreaterOrEqualThan20)"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetCoreGreaterOrEqualThan50)"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNet50)"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetFramework)"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" Condition="$(DotNetCoreGreaterOrEqualThan60)"/>
   </ItemGroup>
 
 </Project>
diff --git a/Content/dotnet-new-nunit-fsharp/.template.config/template.json b/Content/dotnet-new-nunit-fsharp/.template.config/template.json
@@ -136,9 +136,13 @@
       "type": "computed",
       "value": "(Framework >= \"netcoreapp2.1\" && Framework <= \"netcoreapp9\")"
     },
-    "DotNetCoreGreaterOrEqualThan50": {
+    "DotNet50": {
       "type": "computed",
-      "value": "(Framework >= \"net5.0\" && Framework < \"net9.0\")"
+      "value": "(Framework >= \"net5.0\" && Framework < \"net6.0\")"
+    },
+    "DotNetCoreGreaterOrEqualThan60": {
+      "type": "computed",
+      "value": "(Framework >= \"net6.0\" && Framework < \"net9.0\")"
     },
     "EnablePack": {
       "type": "parameter",

diff --git a/Content/dotnet-new-nunit-fsharp/Company.TestProject1.fsproj b/Content/dotnet-new-nunit-fsharp/Company.TestProject1.fsproj
@@ -11,15 +11,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" Condition="$(DotNetCoreLessThan21)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetCoreGreaterOrEqualThan21)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetCoreGreaterOrEqualThan50)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetFramework)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetCoreGreaterOrEqualThan21)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNet50)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetCoreGreaterOrEqualThan60)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetFramework)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="$(DotNetCoreLessThan20)"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetCoreGreaterOrEqualThan20)"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetCoreGreaterOrEqualThan50)"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNet50)"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetFramework)"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" Condition="$(DotNetCoreGreaterOrEqualThan60)"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Content/dotnet-new-nunit-visualbasic/.template.config/template.json b/Content/dotnet-new-nunit-visualbasic/.template.config/template.json
@@ -136,9 +136,13 @@
       "type": "computed",
       "value": "(Framework >= \"netcoreapp2.1\" && Framework <= \"netcoreapp9\")"
     },
-    "DotNetCoreGreaterOrEqualThan50": {
+    "DotNet50": {
       "type": "computed",
-      "value": "(Framework >= \"net5.0\" && Framework < \"net9.0\")"
+      "value": "(Framework >= \"net5.0\" && Framework < \"net6.0\")"
+    },
+    "DotNetCoreGreaterOrEqualThan60": {
+      "type": "computed",
+      "value": "(Framework >= \"net6.0\" && Framework < \"net9.0\")"
     },
     "EnablePack": {
       "type": "parameter",

diff --git a/Content/dotnet-new-nunit-visualbasic/Company.TestProject1.vbproj b/Content/dotnet-new-nunit-visualbasic/Company.TestProject1.vbproj
@@ -9,15 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" Condition="$(DotNetCoreLessThan21)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetCoreGreaterOrEqualThan21)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetCoreGreaterOrEqualThan50)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" Condition="$(DotNetFramework)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetCoreGreaterOrEqualThan21)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNet50)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetCoreGreaterOrEqualThan60)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" Condition="$(DotNetFramework)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="$(DotNetCoreLessThan20)"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetCoreGreaterOrEqualThan20)"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetCoreGreaterOrEqualThan50)"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNet50)"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" Condition="$(DotNetFramework)"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" Condition="$(DotNetCoreGreaterOrEqualThan60)"/>
   </ItemGroup>
 
 </Project>
diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,9 @@
 - remove Travis build
 - add new `--framework` supported parameters:
     + net6.0
+- update `NUnit3TestAdapter` to v4.2.1 on .NET Core 2.1+
+- update `NUnit` to v3.13.3
+- update `Microsoft.NET.Test.Sdk` to v7.1.0 on .NET 6.0+
 
 15 April 2020, v1.8.1
 ---------------------