From 797f7b167012bb2bc54123cd97c5ac07c9cafaf0 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Fri, 12 Jul 2019 11:46:06 -0700
Subject: [PATCH] Version the SPA template package (#11773)

* Version the SPA template package

* Fix templates
---
 build/artifacts.props                                         | 2 +-
 src/Templating/NuGetPackageVerifier.json                      | 4 ++--
 .../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj          | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/artifacts.props b/build/artifacts.props
index 232539cb25..cfcf7445c5 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -152,7 +152,7 @@
     <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="ship" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="ship" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.2" Category="ship" />
-    <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="ship" />
+    <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Abstractions" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Analyzers" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Cosmos" Category="noship" />
diff --git a/src/Templating/NuGetPackageVerifier.json b/src/Templating/NuGetPackageVerifier.json
index a1bfc0f1c5..062bbdbe04 100644
--- a/src/Templating/NuGetPackageVerifier.json
+++ b/src/Templating/NuGetPackageVerifier.json
@@ -24,11 +24,11 @@
           "Template"
         ]
       },
-      "Microsoft.DotNet.Web.Spa.ProjectTemplates": {
+      "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2": {
         "packageTypes": [
           "Template"
         ]
       }
     }
   }
-}
\ No newline at end of file
+}
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 b31f3d8ddd..fb7c42b621 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.2</TargetFramework>
+    <PackageId>Microsoft.DotNet.Web.Spa.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</PackageId>
     <Description>Single Page Application templates for ASP.NET Core
 
     To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.</Description>