From 59d43346e6578985e9e9570c3ac3bb9154919bad Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 11 Jul 2019 15:35:47 -0700 Subject: [PATCH 1/7] Update branding to 2.1.12 (#12096) * also improve PreparingPatchUpdates.md - document changes to dependencies.props - reflect changes in how Templating is handled - e.g. use EF Core examples - nit: adjust indentation to avoid markdown warnings --- build/dependencies.props | 6 +-- docs/PreparingPatchUpdates.md | 38 +++++++++++-------- eng/Baseline.Designer.props | 6 +-- eng/Baseline.xml | 4 +- eng/PatchConfig.props | 4 ++ .../ArchiveBaseline.2.1.12.txt | 1 + .../ArchiveBaseline.2.1.12.txt | 1 + version.props | 2 +- 8 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt diff --git a/build/dependencies.props b/build/dependencies.props index 062cf99832..da966e4990 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,10 +2,10 @@ - 2.1.11 - 2.1.11 + 2.1.12 + 2.1.12 - 4.5.2 + 4.5.2 diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md index 34813e8162..05e334abb0 100644 --- a/docs/PreparingPatchUpdates.md +++ b/docs/PreparingPatchUpdates.md @@ -16,26 +16,32 @@ In order to prepare this repo to build a new servicing update, the following cha * Update the package baselines. This is used to ensure packages keep a consistent set of dependencies between releases. See [eng/tools/BaselineGenerator/](/eng/tools/BaselineGenerator/README.md) for instructions on how to run this tool. +* **For the subset of external dependencies mentioned at the top of [build/dependencies.props](/build/dependencies.props):** + If a package (Microsoft.NetCore.App for example) shipped in the last release, update the package version properties. + + * Changes made above to external dependencies listed in [eng/Baseline.Designer.props](/eng/Baseline.Designer.props) + should _not_ require further updates. The versions of affected packages should have been updated in + [build/dependencies.props](/build/dependencies.props) during the previous patching cycle. + * **For packages with source code in this repo (not a submodule):** Update the list of packages in [eng/PatchConfig.props](/eng/PatchConfig.props) to list which packages should be patching in this release. * **For packages still building from submodules:** Update the list of repositories which will contain changes in [build/submodules.props](/build/submodules.props). - * `` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch. - * `` items represent repos which will produce new packages in this patch. - * It is usually best to move everything to `` and then iteratively add them back to `` as new repos receive approval to patch. - * Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed. + * `` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch. + * `` items represent repos which will produce new packages in this patch. + * It is usually best to move everything to `` and then iteratively add them back to `` as new repos receive approval to patch. + * But, do not change the Templating item at all. That is only _treated_ as a submodule. + * Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed. -* For each repository still listed as a ``, update the version.props file in that submodule. For example, https://github.com/aspnet/Templating/pull/824 +* **For each repository still listed as a ``:** Update the version.props file in that submodule. For example, https://github.com/aspnet/EntityFrameworkCore/pull/15369/files#diff-2a92b4d7f8df251ffd3a0aa63e97aad5 - * The version prefix in repos should match the version of ASP.NET Core. - * Exception: SignalR, which is "1.1", not "2.1". - * This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example: - * EF Core ships patches in 2.1.4 as "2.1.4" - * EF Core does not ship patches in 2.1.5 or 2.1.6 - * EF Core ships in 2.1.7, therefore, EFCore's version.props file should jump from 2.1.4 to 2.1.7. + * This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example: + * EF Core ships patches in 2.1.8 as "2.1.8" + * EF Core does not ship patches in 2.1.9 or 2.1.10 + * EF Core ships in 2.1.11, therefore, EFCore's version.props file should jump from 2.1.8 to 2.1.11. - ```diff - - - 2.1.4 - + 2.1.7 - ``` + ```diff + + - 8 + + 11 + ``` diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 519b19b9db..a830a66044 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.11 + 2.1.12 @@ -898,14 +898,14 @@ - 2.1.1 + 2.1.12 - + diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 6011202d83..dff0b069c0 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. --> - + @@ -97,7 +97,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 47f840db70..0965ea09da 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -40,4 +40,8 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.Server.HttpSys; + + + + diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.12.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.12.txt @@ -0,0 +1 @@ + diff --git a/version.props b/version.props index 8c94afbed8..e65ef23479 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 1 - 12 + 13 servicing Servicing t000 From 4fd1d01467df0e6439ef16d33cc13c220d32931d Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 12 Jul 2019 06:56:50 -0700 Subject: [PATCH 2/7] Update branding to 2.2.7 (#12100) * Add Microsoft.AspNetCore.Mvc.Api.Analyzers to baselines * also improve PreparingPatchUpdates.md - document changes to dependencies.props - reflect changes in how Templating is handled - e.g. use EF Core examples - nit: adjust indentation to avoid markdown warnings --- build/dependencies.props | 16 +++++++-------- build/submodules.props | 2 +- docs/PreparingPatchUpdates.md | 38 ++++++++++++++++++++--------------- eng/Baseline.Designer.props | 19 +++++++++++------- eng/Baseline.xml | 11 +++++----- eng/PatchConfig.props | 4 ++++ version.props | 2 +- 7 files changed, 54 insertions(+), 38 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index ff1b314c33..5f51ce3667 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,17 +2,17 @@ - 2.2.5 - 2.2.5 + 2.2.6 + 2.2.6 - 2.2.4 - 2.2.4 - 2.2.4 - 2.2.4 - 2.2.4 - 2.2.4 + 2.2.6 + 2.2.6 + 2.2.6 + 2.2.6 + 2.2.6 + 2.2.6 diff --git a/build/submodules.props b/build/submodules.props index a088430493..4370c412c7 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -37,6 +37,6 @@ - + diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md index 34813e8162..05e334abb0 100644 --- a/docs/PreparingPatchUpdates.md +++ b/docs/PreparingPatchUpdates.md @@ -16,26 +16,32 @@ In order to prepare this repo to build a new servicing update, the following cha * Update the package baselines. This is used to ensure packages keep a consistent set of dependencies between releases. See [eng/tools/BaselineGenerator/](/eng/tools/BaselineGenerator/README.md) for instructions on how to run this tool. +* **For the subset of external dependencies mentioned at the top of [build/dependencies.props](/build/dependencies.props):** + If a package (Microsoft.NetCore.App for example) shipped in the last release, update the package version properties. + + * Changes made above to external dependencies listed in [eng/Baseline.Designer.props](/eng/Baseline.Designer.props) + should _not_ require further updates. The versions of affected packages should have been updated in + [build/dependencies.props](/build/dependencies.props) during the previous patching cycle. + * **For packages with source code in this repo (not a submodule):** Update the list of packages in [eng/PatchConfig.props](/eng/PatchConfig.props) to list which packages should be patching in this release. * **For packages still building from submodules:** Update the list of repositories which will contain changes in [build/submodules.props](/build/submodules.props). - * `` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch. - * `` items represent repos which will produce new packages in this patch. - * It is usually best to move everything to `` and then iteratively add them back to `` as new repos receive approval to patch. - * Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed. + * `` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch. + * `` items represent repos which will produce new packages in this patch. + * It is usually best to move everything to `` and then iteratively add them back to `` as new repos receive approval to patch. + * But, do not change the Templating item at all. That is only _treated_ as a submodule. + * Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed. -* For each repository still listed as a ``, update the version.props file in that submodule. For example, https://github.com/aspnet/Templating/pull/824 +* **For each repository still listed as a ``:** Update the version.props file in that submodule. For example, https://github.com/aspnet/EntityFrameworkCore/pull/15369/files#diff-2a92b4d7f8df251ffd3a0aa63e97aad5 - * The version prefix in repos should match the version of ASP.NET Core. - * Exception: SignalR, which is "1.1", not "2.1". - * This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example: - * EF Core ships patches in 2.1.4 as "2.1.4" - * EF Core does not ship patches in 2.1.5 or 2.1.6 - * EF Core ships in 2.1.7, therefore, EFCore's version.props file should jump from 2.1.4 to 2.1.7. + * This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example: + * EF Core ships patches in 2.1.8 as "2.1.8" + * EF Core does not ship patches in 2.1.9 or 2.1.10 + * EF Core ships in 2.1.11, therefore, EFCore's version.props file should jump from 2.1.8 to 2.1.11. - ```diff - - - 2.1.4 - + 2.1.7 - ``` + ```diff + + - 8 + + 11 + ``` diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 62cc7a6854..02e35937c3 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.5 + 2.2.6 @@ -77,12 +77,12 @@ - 2.2.5 + 2.2.6 - 2.2.5 + 2.2.6 @@ -649,6 +649,11 @@ 2.2.0 + + + 2.2.6 + + 2.2.0 @@ -954,7 +959,7 @@ - 2.2.0 + 2.2.6 @@ -965,13 +970,13 @@ - 2.2.2 + 2.2.6 - + @@ -1347,4 +1352,4 @@ - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index cc802678a3..4edbdbadf4 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. --> - + @@ -12,8 +12,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - - + + @@ -74,6 +74,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. + @@ -102,8 +103,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - - + + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 3daf32fba4..196624c7d6 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -73,4 +73,8 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.Server.IIS; + + + + diff --git a/version.props b/version.props index f5ceabf956..6dd444f335 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 2 - 6 + 7 servicing $([System.DateTime]::Now.ToString('yyMMdd'))-99 From c8fc054096fccbcec3a01e919f0402e68428b57b Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 12 Jul 2019 11:45:46 -0700 Subject: [PATCH 3/7] 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 @@ - + 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 @@ - + 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 @@ netcoreapp2.1 + Microsoft.DotNet.Web.Spa.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) Single Page Application templates for ASP.NET Core $(PackageTags);spa 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"); From 797f7b167012bb2bc54123cd97c5ac07c9cafaf0 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 12 Jul 2019 11:46:06 -0700 Subject: [PATCH 4/7] 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 @@ - + 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 @@ netcoreapp2.2 + Microsoft.DotNet.Web.Spa.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) Single Page Application templates for ASP.NET Core To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. From 6ed7bf85b198a22a3cdd5b61c4eca5657959dadc Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 12 Jul 2019 11:11:45 -0700 Subject: [PATCH 5/7] Re-pin System.Threading.Tasks.Extensions - not shipping this time around --- build/dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index da966e4990..0b1adf4cf1 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,7 +5,6 @@ 2.1.12 2.1.12 - 4.5.2 @@ -188,6 +187,7 @@ 4.5.0 5.2.0 3.1.1 + 4.5.3 4.5.3 4.3.4 4.5.3 @@ -205,8 +205,8 @@ 4.5.0 4.5.0 4.9.0 + 4.5.2 4.5.0 - 4.5.3 4.5.3 1.3.7 9.0.1 From 5712263ddaa0d0f849ec727a58da82cb8be23de2 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sat, 13 Jul 2019 11:05:28 -0700 Subject: [PATCH 6/7] Re-pin EF dependencies (#12132) - not shipping this time around - bump a few versions to match newer 'release/2.1' dependencies - System.Diagnostics.DiagnosticSource - System.Security.Principal.Windows - System.Threading.Tasks.Extensions (will bump this again in 'release/2.1') --- build/dependencies.props | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5f51ce3667..574bb8be33 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,15 +6,6 @@ 2.2.6 - - 2.2.6 - 2.2.6 - 2.2.6 - 2.2.6 - 2.2.6 - 2.2.6 - - @@ -102,6 +93,12 @@ 0.6.0-rtm-final 2.2.0-rtm-35687 + 2.2.6 + 2.2.6 + 2.2.6 + 2.2.6 + 2.2.6 + 2.2.6 0.9.9 @@ -220,7 +217,7 @@ 1.5.0 4.5.0 4.6.1 - 4.5.0 + 4.5.1 4.5.0 5.3.0 3.2.0 @@ -231,18 +228,18 @@ 4.5.0 3.1.1 4.3.0 - 4.5.2 1.6.0 + 4.5.2 4.3.0 4.5.0 4.5.0 4.5.0 - 4.5.0 + 4.5.1 4.5.0 4.5.0 4.5.0 4.9.0 - 4.5.1 + 4.5.3 4.5.0 4.5.3 1.3.7 From 2d335f3647f14f03be843f1e097fc19b05ef0674 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 15 Jul 2019 18:22:29 -0700 Subject: [PATCH 7/7] List all SPA project template names --- .../test/Templates.Test/Helpers/TemplatePackageInstaller.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs index 304bfb3dd5..27133552f0 100644 --- a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs +++ b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs @@ -46,6 +46,7 @@ namespace Templates.Test.Helpers "Microsoft.DotNet.Web.ProjectTemplates.2.2", "Microsoft.DotNet.Web.ProjectTemplates.3.0", "Microsoft.DotNet.Web.Spa.ProjectTemplates", + "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1", "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2", "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" };