From c8fc054096fccbcec3a01e919f0402e68428b57b Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Fri, 12 Jul 2019 11:45:46 -0700
Subject: [PATCH] Version the SPA template package [release/2.1] (#11774)

* Version the SPA template package

* Update src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj

* Fix templates
---
 build/artifacts.props                                           | 2 +-
 src/AzureIntegration/build/repo.targets                         | 2 +-
 src/Templating/NuGetPackageVerifier.json                        | 2 +-
 .../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj            | 1 +
 .../content/Angular-CSharp/.template.config/template.json       | 2 +-
 .../test/Templates.Test/Helpers/TemplatePackageInstaller.cs     | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/artifacts.props b/build/artifacts.props
index 075e0d5d20..e51a66c3f8 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -145,7 +145,7 @@
     <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Category="shipoob" />
-    <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Category="shipoob" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Analyzers" Analyzer="true" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" />
diff --git a/src/AzureIntegration/build/repo.targets b/src/AzureIntegration/build/repo.targets
index 4f6c94e8f2..856963004f 100644
--- a/src/AzureIntegration/build/repo.targets
+++ b/src/AzureIntegration/build/repo.targets
@@ -70,7 +70,7 @@
 
       <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(PackageVersion)" />
       <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="$(PackageVersion)" />
-      <BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(PackageVersion)" />
+      <BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="$(PackageVersion)" />
     </ItemGroup>
 
     <Message Text="Removing %(_CleanupFiles.Identity)" Importance="High" />
diff --git a/src/Templating/NuGetPackageVerifier.json b/src/Templating/NuGetPackageVerifier.json
index c3c62e30d3..42e021f202 100644
--- a/src/Templating/NuGetPackageVerifier.json
+++ b/src/Templating/NuGetPackageVerifier.json
@@ -24,7 +24,7 @@
           "Template"
         ]
       },
-      "Microsoft.DotNet.Web.Spa.ProjectTemplates": {
+      "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1": {
         "packageTypes": [
           "Template"
         ]
diff --git a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index 576f467305..37899ac5e3 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <PackageId>Microsoft.DotNet.Web.Spa.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</PackageId>
     <Description>Single Page Application templates for ASP.NET Core</Description>
     <PackageTags>$(PackageTags);spa</PackageTags>
   </PropertyGroup>
diff --git a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
index e7b2a59892..fb783b15d7 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
+++ b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json
@@ -140,4 +140,4 @@
       "continueOnError": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
index 4493d1fb31..fd60b79630 100644
--- a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
+++ b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
@@ -21,7 +21,7 @@ namespace Templates.Test.Helpers
             "Microsoft.DotNet.Web.ProjectTemplates.1.x",
             "Microsoft.DotNet.Web.ProjectTemplates.2.0",
             "Microsoft.DotNet.Web.ProjectTemplates.2.1",
-            "Microsoft.DotNet.Web.Spa.ProjectTemplates",
+            "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1",
         };
 
         public static string CustomHivePath { get; } = Path.Combine(AppContext.BaseDirectory, ".templateengine");