From 026695bb0c0a66d35beeda6cf19d0746961054ba Mon Sep 17 00:00:00 2001
From: halex2005 <harl_aa@skbkontur.ru>
Date: Wed, 30 Oct 2019 23:03:30 +0500
Subject: [PATCH] update nunit3 templates versions: (#5335)

- issued new v1.6.4 for .NET Core 3 with updated dependencies versions
- issued new v1.7.0 wih support for .NET Core 3.1 targeting, netcoreapp3.1 is the default targeting since that version
---
 eng/Versions.props                          | 4 ++--
 src/redist/targets/BundledTemplates.targets | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 2a1204248..73110b579 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
-    <NUnit3DotNetNewTemplatePackageVersion>1.6.3</NUnit3DotNetNewTemplatePackageVersion>
+    <NUnit3DotNetNewTemplatePackageVersion>1.7.0</NUnit3DotNetNewTemplatePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -93,7 +93,7 @@
     <!-- 3.0 Template versions -->
     <MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
     <MicrosoftDotNetWpfProjectTemplates30PackageVersion>3.0.0</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
-    <NUnit3Templates30PackageVersion>1.6.3</NUnit3Templates30PackageVersion>
+    <NUnit3Templates30PackageVersion>1.6.4</NUnit3Templates30PackageVersion>
     <MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates30PackageVersion>
     <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplates30PackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
     <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index c3770d204..3755bdefd 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -124,7 +124,7 @@
 
     <PackageDownload Update="Microsoft.DotNet.Common.ItemTemplates"
                      Version="[$(MicrosoftDotNetCommonItemTemplates21PackageVersion)];
-                              [$(MicrosoftDotNetCommonItemTemplates22PackageVersion)]; 
+                              [$(MicrosoftDotNetCommonItemTemplates22PackageVersion)];
                               [$(MicrosoftDotNetCommonItemTemplates30PackageVersion)];
                               [$(MicrosoftDotNetCommonItemTemplates31PackageVersion)];
                               " />
@@ -145,14 +145,15 @@
                      Version="[$(NUnit3Templates21PackageVersion)];
                               [$(NUnit3Templates22PackageVersion)];
                               [$(NUnit3Templates30PackageVersion)];
+                              [$(NUnit3Templates31PackageVersion)];
                               " />
 
-   <PackageDownload Update="Microsoft.Dotnet.Wpf.ProjectTemplates" 
+   <PackageDownload Update="Microsoft.Dotnet.Wpf.ProjectTemplates"
                     Version="[$(MicrosoftDotnetWpfProjectTemplates30PackageVersion)];
                              [$(MicrosoftDotnetWpfProjectTemplates31PackageVersion)];
                              " />
 
-    <PackageDownload Update="Microsoft.Dotnet.Winforms.ProjectTemplates" 
+    <PackageDownload Update="Microsoft.Dotnet.Winforms.ProjectTemplates"
                      Version="[$(MicrosoftDotnetWinFormsProjectTemplates30PackageVersion)];
                               [$(MicrosoftDotnetWinFormsProjectTemplates31PackageVersion)];
                              " />
@@ -160,7 +161,7 @@
 
   <Target Name="LayoutTemplates"
         DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor31MSI;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
-    
+
   <Target Name="LayoutTemplatesForSDK"
           DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions">
     <ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">