diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index c3c62e30d3..a1bfc0f1c5 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -19,7 +19,7 @@ "Template" ] }, - "Microsoft.DotNet.Web.ProjectTemplates.2.1": { + "Microsoft.DotNet.Web.ProjectTemplates.2.2": { "packageTypes": [ "Template" ] @@ -31,4 +31,4 @@ } } } -} +} \ No newline at end of file diff --git a/build/dependencies.props b/build/dependencies.props index 3d64bf599b..985e436e58 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,42 +4,42 @@ 0.9.9 - 2.2.0-preview1-34184 - 2.2.0-preview1-17051 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-34228 + 2.2.0-preview1-17057 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 15.6.82 15.6.82 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 2.0.0 2.1.0-rc1 2.2.0-preview1-26509-06 - 2.2.0-preview1-34184 + 2.2.0-preview1-34228 15.6.1 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-34228 + 2.2.0-preview1-34228 2.0.3 0.19.0 3.7.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 56263a26fc..bd99bc5c6c 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17051 -commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b +version:2.2.0-preview1-17057 +commithash:dc12ed3ec0248281f96bdb99834310ec67507ee3 diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 0b5bb534e7..ca58cc72be 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,6 +2,8 @@ false false + + 99.9 diff --git a/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj b/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj index fa34138de5..a54a8699ca 100644 --- a/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj +++ b/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1 + netcoreapp2.2 Web Client-Side File Templates for Microsoft Template Engine diff --git a/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj b/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj index 6a6bf62bb8..c789a961e6 100644 --- a/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj +++ b/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1 + netcoreapp2.2 Web File Templates for Microsoft Template Engine diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index 0db9c70633..ba9103aa17 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -1,16 +1,23 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride + + 99.9 + ${MicrosoftNETCoreApp22PackageVersion} + + + + - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in index 5e029bbfd5..4491281d5f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -1,10 +1,17 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride + + 99.9 + ${MicrosoftNETCoreApp22PackageVersion} + + + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index bb2d8decf8..ab46f63cd9 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -3,8 +3,8 @@ - netcoreapp2.1 - Microsoft.DotNet.Web.ProjectTemplates.2.1 + netcoreapp2.2 + Microsoft.DotNet.Web.ProjectTemplates.2.2 ASP.NET Core Web Template Pack for Microsoft Template Engine @@ -32,6 +32,7 @@ MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion); MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion); MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion); + MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion); MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion); MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion); MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion); diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 3a54e436b5..663fc68bce 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -1,13 +1,20 @@ - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d full 0 1 + + 99.9 + ${MicrosoftNETCoreApp22PackageVersion} + + + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 3cb7c4ce52..57807a17e6 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -1,13 +1,20 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride full aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 + + 99.9 + ${MicrosoftNETCoreApp22PackageVersion} + + + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 43aa9c21f6..5afc2e41f8 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -1,11 +1,18 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride true + + 99.9 + ${MicrosoftNETCoreApp22PackageVersion} + + + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index b57b346386..28b4517c53 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -1,19 +1,26 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 + + 99.9 + ${MicrosoftNETCoreApp22PackageVersion} + + + + - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index 9a435ae260..fc557dbd7d 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -1,10 +1,17 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride + + 99.9 + ${MicrosoftNETCoreApp22PackageVersion} + + + + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json index 0b474de835..fa1a686e36 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json @@ -10,7 +10,7 @@ "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.", "groupIdentity": "Microsoft.Web.Empty", "precedence": "3000", - "identity": "Microsoft.Web.Empty.CSharp.2.1", + "identity": "Microsoft.Web.Empty.CSharp.2.2", "shortName": "web", "tags": { "language": "C#", @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "copyrightYear": { "type": "generated", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json index 332ead6554..b625c29b16 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json @@ -9,7 +9,7 @@ "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.", "groupIdentity": "Microsoft.Web.Empty", "precedence": "3000", - "identity": "Microsoft.Web.Empty.FSharp.2.1", + "identity": "Microsoft.Web.Empty.FSharp.2.2", "shortName": "web", "tags": { "language": "F#", @@ -95,12 +95,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "copyrightYear": { "type": "generated", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json index 93b250c60c..5855186742 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json @@ -1,13 +1,18 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": ["Web", "Razor", "Library", "Razor Class Library"], + "classifications": [ + "Web", + "Razor", + "Library", + "Razor Class Library" + ], "name": "Razor Class Library", "generatorVersions": "[1.0.0.0-*)", "description": "A project for creating a Razor class library that targets .NET Standard", "groupIdentity": "Microsoft.Web.Razor", "precedence": "3000", - "identity": "Microsoft.Web.Razor.Library.CSharp.2.1", + "identity": "Microsoft.Web.Razor.Library.CSharp.2.2", "shortName": "razorclasslib", "tags": { "language": "C#", @@ -29,11 +34,11 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "defaultValue": "netcoreapp2.1" + "defaultValue": "netcoreapp2.2" }, "HostIdentifier": { "type": "bind", @@ -47,7 +52,9 @@ } }, "primaryOutputs": [ - { "path": "Company.RazorClassLibrary1.csproj" }, + { + "path": "Company.RazorClassLibrary1.csproj" + }, { "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "Areas/MyFeature/Pages/Page1.cshtml" @@ -59,7 +66,9 @@ "condition": "(!skipRestore)", "description": "Restore NuGet packages required by this project.", "manualInstructions": [ - { "text": "Run 'dotnet restore'" } + { + "text": "Run 'dotnet restore'" + } ], "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", "continueOnError": true diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json index 154d9094f2..91c964a10a 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json @@ -11,8 +11,11 @@ "description": "A project template for creating an ASP.NET Core application with example ASP.NET Razor Pages content", "groupIdentity": "Microsoft.Web.RazorPages", "precedence": "3000", - "identity": "Microsoft.Web.RazorPages.CSharp.2.1", - "shortName": [ "razor", "webapp" ], + "identity": "Microsoft.Web.RazorPages.CSharp.2.2", + "shortName": [ + "razor", + "webapp" + ], "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { "language": "C#", @@ -326,12 +329,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "copyrightYear": { "type": "generated", @@ -361,4 +364,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json index ae39c7f26e..c1b8bcda52 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json @@ -10,7 +10,7 @@ "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.", "groupIdentity": "Microsoft.Web.Mvc", "precedence": "3000", - "identity": "Microsoft.Web.Mvc.CSharp.2.1", + "identity": "Microsoft.Web.Mvc.CSharp.2.2", "shortName": "mvc", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { @@ -319,12 +319,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "copyrightYear": { "type": "generated", @@ -360,4 +360,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json index 44f417b380..dad23ea741 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json @@ -10,7 +10,7 @@ "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.", "groupIdentity": "Microsoft.Web.Mvc", "precedence": "3000", - "identity": "Microsoft.Web.Mvc.FSharp.2.1", + "identity": "Microsoft.Web.Mvc.FSharp.2.2", "shortName": "mvc", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { @@ -106,12 +106,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "copyrightYear": { "type": "generated", diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json index 2374e93237..00b4b90a85 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json @@ -10,7 +10,7 @@ "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.", "groupIdentity": "Microsoft.Web.WebApi", "precedence": "3000", - "identity": "Microsoft.Web.WebApi.CSharp.2.1", + "identity": "Microsoft.Web.WebApi.CSharp.2.2", "shortName": "webapi", "tags": { "language": "C#", @@ -222,12 +222,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "copyrightYear": { "type": "generated", @@ -263,4 +263,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json index 901221dcd1..36a84c89ea 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json @@ -9,7 +9,7 @@ "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.", "groupIdentity": "Microsoft.Web.WebApi", "precedence": "3000", - "identity": "Microsoft.Web.WebApi.FSharp.2.1", + "identity": "Microsoft.Web.WebApi.FSharp.2.2", "shortName": "webapi", "tags": { "language": "F#", @@ -95,12 +95,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "copyrightYear": { "type": "generated", diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index 88b34c2d94..0b4b8f451c 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride true Latest @@ -11,6 +11,8 @@ false + + 99.9 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 5cb599a956..d4ebf83c23 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 @@ -3,7 +3,7 @@ - netcoreapp2.1 + netcoreapp2.2 Single Page Application templates for ASP.NET Core $(PackageTags);spa diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 39c1ebe549..be23dc22f7 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -1,13 +1,15 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride true Latest false ClientApp\ $(DefaultItemExcludes);$(SpaRoot)node_modules\** + + 99.9 diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index f782f4fcba..abf4252943 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -1,13 +1,15 @@  - netcoreapp2.1 + netcoreapp2.2 TargetFrameworkOverride true Latest false ClientApp\ $(DefaultItemExcludes);$(SpaRoot)node_modules\** + + 99.9 diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json index e7b2a59892..b38a66ff1e 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular", - "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.2.1", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.2.2", "name": "ASP.NET Core with Angular", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "HostIdentifier": { "type": "bind", diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Directory.Build.targets b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Directory.Build.targets index 0f803ab0e0..5fda1097ce 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Directory.Build.targets +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Directory.Build.targets @@ -4,4 +4,6 @@ This file intentionally left mostly blank to ensure the template projects are independent from the template package build config. --> + + 99.9 diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json index df23986cfa..fcc131cb9a 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React", - "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.2.1", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.2.2", "name": "ASP.NET Core with React.js", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "HostIdentifier": { "type": "bind", @@ -140,4 +140,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json index 91b5774e42..cb404dd503 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/.template.config/template.json @@ -6,7 +6,7 @@ "SPA" ], "groupIdentity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux", - "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.2.1", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.2.2", "name": "ASP.NET Core with React.js and Redux", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.1", - "description": "Target netcoreapp2.1" + "choice": "netcoreapp2.2", + "description": "Target netcoreapp2.2" } ], - "replaces": "netcoreapp2.1", - "defaultValue": "netcoreapp2.1" + "replaces": "netcoreapp2.2", + "defaultValue": "netcoreapp2.2" }, "HostIdentifier": { "type": "bind", @@ -140,4 +140,4 @@ "continueOnError": true } ] -} +} \ No newline at end of file diff --git a/test/GenerateTestProps.targets b/test/GenerateTestProps.targets index befec39da5..51c0b31f09 100644 --- a/test/GenerateTestProps.targets +++ b/test/GenerateTestProps.targets @@ -9,12 +9,12 @@ - BundledAspNetCoreAllTargetFrameworkVersion=2.1 + BundledAspNetCoreAllTargetFrameworkVersion=2.2 $(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion) - BundledAspNetCoreAppTargetFrameworkVersion=2.1 + BundledAspNetCoreAppTargetFrameworkVersion=2.2 $(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion) diff --git a/test/Templates.Test/Helpers/AspNetProcess.cs b/test/Templates.Test/Helpers/AspNetProcess.cs index ab6984537a..b8e9ab6b3f 100644 --- a/test/Templates.Test/Helpers/AspNetProcess.cs +++ b/test/Templates.Test/Helpers/AspNetProcess.cs @@ -18,7 +18,7 @@ namespace Templates.Test.Helpers { public class AspNetProcess : IDisposable { - private const string DefaultFramework = "netcoreapp2.1"; + private const string DefaultFramework = "netcoreapp2.2"; private const string ListeningMessagePrefix = "Now listening on: "; private static int Port = 5000 + new Random().Next(3000); diff --git a/test/Templates.Test/Helpers/TemplatePackageInstaller.cs b/test/Templates.Test/Helpers/TemplatePackageInstaller.cs index cd5de94a73..1361d7fcd9 100644 --- a/test/Templates.Test/Helpers/TemplatePackageInstaller.cs +++ b/test/Templates.Test/Helpers/TemplatePackageInstaller.cs @@ -18,6 +18,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.ProjectTemplates.2.2", "Microsoft.DotNet.Web.Spa.ProjectTemplates", }; diff --git a/test/Templates.Test/Helpers/TemplateTestBase.cs b/test/Templates.Test/Helpers/TemplateTestBase.cs index c93cd5d17b..449fa3151f 100644 --- a/test/Templates.Test/Helpers/TemplateTestBase.cs +++ b/test/Templates.Test/Helpers/TemplateTestBase.cs @@ -75,7 +75,7 @@ $@" if (!string.IsNullOrEmpty(auth)) { - args += $" -au {auth}"; + args += $" --auth {auth}"; } if (!string.IsNullOrEmpty(language)) @@ -85,7 +85,7 @@ $@" if (useLocalDB) { - args += $" -uld"; + args += $" --use-local-db"; } if (noHttps) diff --git a/test/Templates.Test/Templates.Test.csproj b/test/Templates.Test/Templates.Test.csproj index 90c08ea8e6..de576ce746 100644 --- a/test/Templates.Test/Templates.Test.csproj +++ b/test/Templates.Test/Templates.Test.csproj @@ -33,7 +33,7 @@ <_Parameter1>DotNetEfFullPath - <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp2.1/any/dotnet-ef.dll + <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp2.2/any/dotnet-ef.dll