diff --git a/.vscode/settings.json b/.vscode/settings.json index 7ebee63d8a..534619fc0c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "files.associations": { - "*.json.in": "json" + "*.json.in": "json", + "*.*proj.in": "xml" }, "[json]": { "editor.tabSize": 2 diff --git a/src/Microsoft.AspNetCore.SpaTemplates/.gitignore b/src/Microsoft.AspNetCore.SpaTemplates/.gitignore index 3db277b523..dc70ec650b 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/.gitignore +++ b/src/Microsoft.AspNetCore.SpaTemplates/.gitignore @@ -1,2 +1,2 @@ # This file is generated by the build -content/*/.template.config/template.json +content/*/*.*proj diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/KnockoutSpa.csproj b/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in similarity index 86% rename from src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/KnockoutSpa.csproj rename to src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in index 555c8dac7f..f9921057ee 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/KnockoutSpa.csproj +++ b/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/VueSpa.csproj b/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in similarity index 86% rename from src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/VueSpa.csproj rename to src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in index 555c8dac7f..f9921057ee 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/VueSpa.csproj +++ b/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj b/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj index 4f06f6bdc5..5a5bdc3b3a 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj +++ b/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj @@ -21,13 +21,13 @@ - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/AureliaSpa.csproj b/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in similarity index 86% rename from src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/AureliaSpa.csproj rename to src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in index 555c8dac7f..f9921057ee 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/AureliaSpa.csproj +++ b/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.template.json.in b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json similarity index 52% rename from src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.template.json.in rename to src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json index a817ec5344..d6f128e26a 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.template.json.in +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json @@ -55,60 +55,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreSpaServicesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.SpaServices", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreSpaServicesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreSpaServicesPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "tags": { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.template.json.in b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json similarity index 52% rename from src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.template.json.in rename to src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json index 032f1e147e..ef80d53bf9 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.template.json.in +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json @@ -55,60 +55,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreSpaServicesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.SpaServices", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreSpaServicesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreSpaServicesPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "tags": { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.template.json.in b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json similarity index 52% rename from src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.template.json.in rename to src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json index 0b74a3035e..727ae230f8 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.template.json.in +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json @@ -55,60 +55,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreSpaServicesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.SpaServices", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreSpaServicesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreSpaServicesPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "tags": { diff --git a/src/Microsoft.DotNet.Web.ItemTemplates/content/RazorPage/.template.config/template.json b/src/Microsoft.DotNet.Web.ItemTemplates/content/RazorPage/.template.config/template.json index 9eb2ad2304..c88a03a35b 100644 --- a/src/Microsoft.DotNet.Web.ItemTemplates/content/RazorPage/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ItemTemplates/content/RazorPage/.template.config/template.json @@ -47,7 +47,7 @@ "binding": "HostIdentifier" }, "NameIsPage": { - "type": "computed", + "type": "computed", "value": "(name == \"Page\")" } }, diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/.gitignore b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/.gitignore index 3db277b523..dc70ec650b 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/.gitignore +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/.gitignore @@ -1,2 +1,2 @@ # This file is generated by the build -content/*/.template.config/template.json +content/*/*.*proj diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-CSharp/Company.WebApplication1.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-CSharp.csproj.in similarity index 79% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-CSharp/Company.WebApplication1.csproj rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-CSharp.csproj.in index 94f4de20f3..b49bb296f5 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-CSharp/Company.WebApplication1.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-CSharp.csproj.in @@ -10,10 +10,10 @@ - + - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-FSharp/Company.WebApplication1.fsproj b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-FSharp.fsproj.in similarity index 91% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-FSharp/Company.WebApplication1.fsproj rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-FSharp.fsproj.in index 79cd0925c7..c53237d89d 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-FSharp/Company.WebApplication1.fsproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-FSharp.fsproj.in @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/Microsoft.DotNet.Web.ProjectTemplates.2.0.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/Microsoft.DotNet.Web.ProjectTemplates.2.0.csproj index 04fbf2ea3c..f3c1f168de 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/Microsoft.DotNet.Web.ProjectTemplates.2.0.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/Microsoft.DotNet.Web.ProjectTemplates.2.0.csproj @@ -35,25 +35,25 @@ - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Company.WebApplication1.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/RazorPagesWeb-CSharp.csproj.in similarity index 57% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Company.WebApplication1.csproj rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/RazorPagesWeb-CSharp.csproj.in index f3789061b9..63fa1a4258 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Company.WebApplication1.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/RazorPagesWeb-CSharp.csproj.in @@ -10,29 +10,29 @@ - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Company.WebApplication1.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-CSharp.csproj.in similarity index 57% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Company.WebApplication1.csproj rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-CSharp.csproj.in index 4e92c4268f..bd22bc3faf 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Company.WebApplication1.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-CSharp.csproj.in @@ -15,31 +15,31 @@ - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-FSharp/Company.WebApplication1.fsproj b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-FSharp.fsproj.in similarity index 72% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-FSharp/Company.WebApplication1.fsproj rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-FSharp.fsproj.in index f8079c6135..da4895ba95 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-FSharp/Company.WebApplication1.fsproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-FSharp.fsproj.in @@ -14,13 +14,13 @@ - + - - - - + + + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-CSharp/Company.WebApplication1.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-CSharp.csproj.in similarity index 72% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-CSharp/Company.WebApplication1.csproj rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-CSharp.csproj.in index bd4bd00f95..3e4926788c 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-CSharp/Company.WebApplication1.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-CSharp.csproj.in @@ -13,17 +13,17 @@ - + - - - + + + - - + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-FSharp/Company.WebApplication1.fsproj b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-FSharp.fsproj.in similarity index 79% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-FSharp/Company.WebApplication1.fsproj rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-FSharp.fsproj.in index d7778a0e68..e1b1835bc3 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-FSharp/Company.WebApplication1.fsproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-FSharp.fsproj.in @@ -12,11 +12,11 @@ - + - - + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-CSharp.template.json.in b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-CSharp/.template.config/template.json similarity index 84% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-CSharp.template.json.in rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-CSharp/.template.config/template.json index 6b47a99cee..8440e08c61 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-CSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-CSharp/.template.config/template.json @@ -110,24 +110,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" } }, "primaryOutputs": [ @@ -149,4 +131,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-FSharp.template.json.in b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-FSharp/.template.config/template.json similarity index 85% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-FSharp.template.json.in rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-FSharp/.template.config/template.json index 33cfcbf8de..7acb09bccf 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/EmptyWeb-FSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-FSharp/.template.config/template.json @@ -52,15 +52,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" } }, "primaryOutputs": [ @@ -82,4 +73,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/RazorPagesWeb-CSharp.template.json.in b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/.template.config/template.json similarity index 62% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/RazorPagesWeb-CSharp.template.json.in rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/.template.config/template.json index dddc3bcd4f..23f2da2c2b 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/RazorPagesWeb-CSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/.template.config/template.json @@ -351,168 +351,6 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreAuthenticationCookiesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Authentication.Cookies", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAuthenticationCookiesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftEntityFrameworkCoreSqlitePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.Sqlite", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" - }, - "MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion)" - }, - "MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Identity.EntityFrameworkCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion)" - }, - "MicrosoftEntityFrameworkCoreSqlServerPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.SqlServer", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreSqlServerPackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" - }, - "MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Authentication.OpenIdConnect", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftVisualStudioWebBrowserLinkPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.BrowserLink", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebBrowserLinkPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebBrowserLinkPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Design", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion)" - }, - "MicrosoftEntityFrameworkCoreDesignPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.Design", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreDesignPackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreDesignPackageVersion)" - }, - "MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion)" - }, - "MicrosoftEntityFrameworkCoreToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreToolsPackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" - }, - "MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.Tools.DotNet", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion)" - }, - "MicrosoftExtensionsSecretManagerToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.Extensions.SecretManager.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftExtensionsSecretManagerToolsPackageVersion}" - }, - "replaces": "$(MicrosoftExtensionsSecretManagerToolsPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" } }, "primaryOutputs": [ diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-CSharp.template.json.in b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/.template.config/template.json similarity index 62% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-CSharp.template.json.in rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/.template.config/template.json index 68af40dee2..1b39b165d6 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-CSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/.template.config/template.json @@ -344,168 +344,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreAuthenticationCookiesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Authentication.Cookies", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAuthenticationCookiesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftEntityFrameworkCoreSqlitePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.Sqlite", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" - }, - "MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion)" - }, - "MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Identity.EntityFrameworkCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion)" - }, - "MicrosoftEntityFrameworkCoreSqlServerPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.SqlServer", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreSqlServerPackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" - }, - "MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Authentication.OpenIdConnect", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftVisualStudioWebBrowserLinkPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.BrowserLink", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebBrowserLinkPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebBrowserLinkPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Design", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion)" - }, - "MicrosoftEntityFrameworkCoreDesignPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.Design", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreDesignPackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreDesignPackageVersion)" - }, - "MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion)" - }, - "MicrosoftEntityFrameworkCoreToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreToolsPackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" - }, - "MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.EntityFrameworkCore.Tools.DotNet", - "generator": "constant", - "parameters": { - "value": "${MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion}" - }, - "replaces": "$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion)" - }, - "MicrosoftExtensionsSecretManagerToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.Extensions.SecretManager.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftExtensionsSecretManagerToolsPackageVersion}" - }, - "replaces": "$(MicrosoftExtensionsSecretManagerToolsPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" } }, "primaryOutputs": [ diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-FSharp.template.json.in b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-FSharp/.template.config/template.json similarity index 54% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-FSharp.template.json.in rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-FSharp/.template.config/template.json index 13f61804b7..ea0c822105 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/StarterWeb-FSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-FSharp/.template.config/template.json @@ -53,51 +53,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "primaryOutputs": [ @@ -119,4 +74,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-CSharp.template.json.in b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-CSharp/.template.config/template.json similarity index 79% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-CSharp.template.json.in rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-CSharp/.template.config/template.json index d0ee87b3b0..becd788417 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-CSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-CSharp/.template.config/template.json @@ -263,60 +263,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftExtensionsSecretManagerToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.Extensions.SecretManager.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftExtensionsSecretManagerToolsPackageVersion}" - }, - "replaces": "$(MicrosoftExtensionsSecretManagerToolsPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Authentication.JwtBearer", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "primaryOutputs": [ diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-FSharp.template.json.in b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-FSharp/.template.config/template.json similarity index 67% rename from src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-FSharp.template.json.in rename to src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-FSharp/.template.config/template.json index 0bb2842f5d..61f05b5f09 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/WebApi-FSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-FSharp/.template.config/template.json @@ -52,33 +52,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "primaryOutputs": [ @@ -100,4 +73,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/.gitignore b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/.gitignore index 3db277b523..dc70ec650b 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/.gitignore +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/.gitignore @@ -1,2 +1,2 @@ # This file is generated by the build -content/*/.template.config/template.json +content/*/*.*proj diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ReactSpa.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in similarity index 87% rename from src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ReactSpa.csproj rename to src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index 2ceb02847f..2c5b3d549f 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ReactSpa.csproj +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj index 646231f310..301175f1f7 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj @@ -22,13 +22,13 @@ - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ReactReduxSpa.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in similarity index 87% rename from src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ReactReduxSpa.csproj rename to src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 2ceb02847f..2c5b3d549f 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ReactReduxSpa.csproj +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/AngularSpa.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in similarity index 87% rename from src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/AngularSpa.csproj rename to src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index 2ceb02847f..2c5b3d549f 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/AngularSpa.csproj +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -9,17 +9,17 @@ - + - - - - + + + + - + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.template.json.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json similarity index 52% rename from src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.template.json.in rename to src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json index 2396b980d7..e6e58992d0 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json @@ -55,60 +55,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreSpaServicesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.SpaServices", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreSpaServicesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreSpaServicesPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "tags": { @@ -138,4 +84,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.template.json.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json similarity index 52% rename from src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.template.json.in rename to src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json index b08158ae4a..a62f9300d3 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json @@ -55,60 +55,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreSpaServicesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.SpaServices", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreSpaServicesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreSpaServicesPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "tags": { diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.template.json.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json similarity index 53% rename from src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.template.json.in rename to src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json index 4895245d52..38418e8db8 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.template.json.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json @@ -55,60 +55,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "MicrosoftAspNetCoreAllPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.All", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreAllPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreAllPackageVersion)" - }, - "MicrosoftAspNetCorePackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCorePackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCorePackageVersion)" - }, - "MicrosoftAspNetCoreStaticFilesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.StaticFiles", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreStaticFilesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreStaticFilesPackageVersion)" - }, - "MicrosoftAspNetCoreSpaServicesPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.SpaServices", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreSpaServicesPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreSpaServicesPackageVersion)" - }, - "MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.VisualStudio.Web.CodeGeneration.Tools", - "generator": "constant", - "parameters": { - "value": "${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" - }, - "replaces": "$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion)" - }, - "MicrosoftAspNetCoreMvcPackageVersion": { - "type": "generated", - "description": "The package version for Microsoft.AspNetCore.Mvc", - "generator": "constant", - "parameters": { - "value": "${MicrosoftAspNetCoreMvcPackageVersion}" - }, - "replaces": "$(MicrosoftAspNetCoreMvcPackageVersion)" } }, "tags": { @@ -138,4 +84,4 @@ ] } ] -} +} \ No newline at end of file