Merge pull request #33 from halex2005/master

fix version condition for Microsoft.NET.Test.Sdk

Content/dotnet-new-nunit-csharp/Company.TestProject1.csproj

@@ -12,8 +12,8 @@
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(TargetFrameworkOverride)' &lt; 'netcoreapp2.0'"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" Condition="'$(TargetFrameworkOverride)' &gt;= 'netcoreapp2.0'"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(Framework)' &lt; 'netcoreapp2.0'"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" Condition="'$(Framework)' &gt;= 'netcoreapp2.0'"/>
   </ItemGroup>
 
 </Project>

Content/dotnet-new-nunit-fsharp/Company.TestProject1.fsproj

@@ -13,8 +13,8 @@
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(TargetFrameworkOverride)' &lt; 'netcoreapp2.0'"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" Condition="'$(TargetFrameworkOverride)' &gt;= 'netcoreapp2.0'"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(Framework)' &lt; 'netcoreapp2.0'"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" Condition="'$(Framework)' &gt;= 'netcoreapp2.0'"/>
   </ItemGroup>
 
   <ItemGroup>

Content/dotnet-new-nunit-visualbasic/Company.TestProject1.vbproj

@@ -11,8 +11,8 @@
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(TargetFrameworkOverride)' &lt; 'netcoreapp2.0'"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" Condition="'$(TargetFrameworkOverride)' &gt;= 'netcoreapp2.0'"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(Framework)' &lt; 'netcoreapp2.0'"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" Condition="'$(Framework)' &gt;= 'netcoreapp2.0'"/>
   </ItemGroup>
 
 </Project>

changelog.md

@@ -1,3 +1,9 @@
+12 November 2019, 1.6.5 and 1.7.1
+---------------------------------
+
+- update `Microsoft.NET.Test.Sdk` dependency to v16.4.0
+- fix condition to include latest version of `Microsoft.NET.Test.Sdk` for netcoreapp2 and higher
+
 25 October 2019, 1.7.0
 ----------------------
 
@@ -8,27 +14,27 @@
 23 October 2019, 1.6.4
 ----------------------
 
-- update NUnit3TestAdapter to v3.15.1
-- update Microsoft.NET.Test.Sdk to v16.3.0
+- update `NUnit3TestAdapter` to v3.15.1
+- update `Microsoft.NET.Test.Sdk` to v16.3.0
 
 6 August 2019, 1.6.3
 --------------------
 
-- update nunit dependency to v3.12.0
-- update Microsoft.NET.Test.Sdk dependency to v16.2.0
+- update `nunit` dependency to v3.12.0
+- update `Microsoft.NET.Test.Sdk` dependency to v16.2.0
 - F# unit test templates are made module based instead of class based (thanks to [zanaptak](https://github.com/zanaptak), #27)
 
 9 April 2019, 1.6.2
 -------------------
 
-- update NUnit3TestAdapter dependency to v3.13.0
-- update Microsoft.NET.Test.Sdk dependency to v16.0.1
+- update `NUnit3TestAdapter` dependency to v3.13.0
+- update `Microsoft.NET.Test.Sdk` dependency to v16.0.1
 
 11 January 2019, 1.6.1
 ----------------------
 
 - update all project templates to default to .NET Core 3.0 (netcoreapp3.0). Other frameworks can still be selected with the `--framework` command line option.
-- update NUnit3TestAdapter dependency to v3.12.0
+- update `NUnit3TestAdapter` dependency to v3.12.0
 
 19 November 2018, 1.6.0
 -----------------------
@@ -38,9 +44,9 @@
     + .NET Core 3.0 version netcoreapp3.0
     + .NET Framework 4.8 version net48
 - update all project templates to default to .NET Core 2.2 (netcoreapp2.2). Other frameworks can still be selected with the `--framework` command line option.
-- update nunit dependency to v3.11.0
-- update NUnit3TestAdapter dependency to v3.11.0
-- update Microsoft.NET.Test.Sdk dependency to v15.9.0
+- update `nunit` dependency to v3.11.0
+- update `NUnit3TestAdapter` dependency to v3.11.0
+- update `Microsoft.NET.Test.Sdk` dependency to v15.9.0
 
 23 October 2018, v1.5.3
 -----------------------
@@ -51,7 +57,7 @@
 -------------------------
 
 - open UnitTest.cs file when project created in Visual Studio (thanks to [jmarolf](https://github.com/jmarolf), #14)
-- update Microsoft.NET.Test.Sdk dependency to v15.8.0
+- update `Microsoft.NET.Test.Sdk` dependency to v15.8.0
 
 07 May 2018, v1.5.1
 -------------------
@@ -62,17 +68,17 @@
 05 May 2018, v1.5.0
 -------------------
 
-- update Microsoft.NET.Test.Sdk dependency to v15.7.2
+- update `Microsoft.NET.Test.Sdk` dependency to v15.7.2
 - add new `--framework` supported parameters:
     + .NET Framework version net472
 - add NUnit test fixture item templates
 
 19 March 2018, v1.4.0
 ---------------------
 
-- update nunit dependency to v3.10.1
-- update NUnit3TestAdapter dependency to v3.10.0
-- update Microsoft.NET.Test.Sdk dependency to v15.6.1
+- update `nunit` dependency to v3.10.1
+- update `NUnit3TestAdapter` dependency to v3.10.0
+- update `Microsoft.NET.Test.Sdk` dependency to v15.6.1
 - add new `--framework` supported parameters:
     + .NET Framework versions (net35, net40, net45, net451, net452, net46, net461, net462, net47, net471)
     + .NET Core 2.1 (netcoreapp2.1)
@@ -81,22 +87,22 @@
 14 November 2017, v1.3.0
 ------------------------
 
-- update nunit dependency to v3.9.0
-- update Microsoft.NET.Test.Sdk dependency to v15.5.0
+- update `nunit` dependency to v3.9.0
+- update `Microsoft.NET.Test.Sdk` dependency to v15.5.0
 
 09 November 2017, v1.2.0
 ------------------------
 
-- update nunit dependency to v3.8.1
-- update NUnit3TestAdapter dependency to v3.9.0
-- update Microsoft.NET.Test.Sdk dependency to v15.3.0
+- update `nunit` dependency to v3.8.1
+- update `NUnit3TestAdapter` dependency to v3.9.0
+- update `Microsoft.NET.Test.Sdk` dependency to v15.3.0
 
 24 July 2017, v1.1.0
 --------------------
 
 - add support for F# and VB test project templates (thanks to [Echo-8-ERA](https://github.com/Echo-8-ERA))
-- update nunit dependency to v3.7.1
-- update NUnit3TestAdapter dependency to release v3.8.0
+- update `nunit` dependency to v3.7.1
+- update `NUnit3TestAdapter` dependency to release v3.8.0
 
 30 May 2017, v1.0.0, v1.0.1
 ---------------------------

nunit-template.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>NUnit3.DotNetNew.Template</id>
     <title>NUnit 3 template for dotnet-new</title>
-    <version>1.7.0</version>
+    <version>1.7.1</version>
     <description>Project and item templates containing basic NUnit 3 Test Project.</description>
     <tags>NUnit dotnet core</tags>
     <authors>akharlov</authors>
@@ -18,7 +18,7 @@
     <releaseNotes>
 - NUnit v3.12.0
 - NUnit3TestAdapter v3.15.1
-- Microsoft.NET.Test.Sdk v16.3.0
+- Microsoft.NET.Test.Sdk v16.4.0
 - add new `--framework` supported parameters: .NET Core 3.1 version netcoreapp3.1
 - update all project templates to default to .NET Core 3.1 (netcoreapp3.1). Other frameworks can still be selected with the `--framework` command line option.
     </releaseNotes>