diff --git a/build/repo.props b/build/repo.props index a26aa6736f..1aec80281f 100644 --- a/build/repo.props +++ b/build/repo.props @@ -8,7 +8,6 @@ - diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in b/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in index 944bf6dba6..84729585f9 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in +++ b/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride true Latest diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in b/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in index 944bf6dba6..84729585f9 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in +++ b/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride true Latest diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj b/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj index f1f2f63094..2cfec022ce 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj +++ b/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 Microsoft.AspNetCore.SpaTemplates.nuspec diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in b/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in index 944bf6dba6..84729585f9 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in +++ b/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride true Latest diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json index d360b45e93..6d595f5a0e 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.0", - "description": "Target netcoreapp2.0" + "choice": "netcoreapp2.1", + "description": "Target netcoreapp2.1" } ], - "replaces": "netcoreapp2.0", - "defaultValue": "netcoreapp2.0" + "replaces": "netcoreapp2.1", + "defaultValue": "netcoreapp2.1" }, "HostIdentifier": { "type": "bind", diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json index d5917eee94..d593dd2c50 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.0", - "description": "Target netcoreapp2.0" + "choice": "netcoreapp2.1", + "description": "Target netcoreapp2.1" } ], - "replaces": "netcoreapp2.0", - "defaultValue": "netcoreapp2.0" + "replaces": "netcoreapp2.1", + "defaultValue": "netcoreapp2.1" }, "HostIdentifier": { "type": "bind", diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json index 2219dfcc14..aa22732976 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.0", - "description": "Target netcoreapp2.0" + "choice": "netcoreapp2.1", + "description": "Target netcoreapp2.1" } ], - "replaces": "netcoreapp2.0", - "defaultValue": "netcoreapp2.0" + "replaces": "netcoreapp2.1", + "defaultValue": "netcoreapp2.1" }, "HostIdentifier": { "type": "bind", 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 964becb06d..bfeaf5583c 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.0 + netcoreapp2.1 Microsoft.DotNet.Web.Client.ItemTemplates.nuspec 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 b52a39bd72..6a2c8e0762 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.0 + netcoreapp2.1 Microsoft.DotNet.Web.ItemTemplates.nuspec diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in index 020b57bc6e..76ce08321e 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -1,10 +1,10 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp20PackageVersion} - ${NETStandardLibraryPackageVersion} + ${MicrosoftNETCoreApp21PackageVersion} + ${NETStandardLibraryPackageVersion} diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in index 7d68e6d3ea..82453e4d8e 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -1,10 +1,10 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp20PackageVersion} - ${NETStandardLibraryPackageVersion} + ${MicrosoftNETCoreApp21PackageVersion} + ${NETStandardLibraryPackageVersion} 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 43260fc5bc..e0e1bb5a8f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -3,7 +3,7 @@ - netcoreapp2.0 + netcoreapp2.1 Microsoft.DotNet.Web.ProjectTemplates.2.1 Microsoft.DotNet.Web.ProjectTemplates.nuspec @@ -33,7 +33,7 @@ MicrosoftVisualStudioWebBrowserLinkPackageVersion=$(MicrosoftVisualStudioWebBrowserLinkPackageVersion); MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion); MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion=$(MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion); - MicrosoftNETCoreApp20PackageVersion=$(MicrosoftNETCoreApp20PackageVersion); + MicrosoftNETCoreApp21PackageVersion=$(MicrosoftNETCoreApp21PackageVersion); NETStandardLibraryPackageVersion=$(NETStandardLibraryPackageVersion); diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 91412ff6c5..5421350f15 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -1,10 +1,10 @@ - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp20PackageVersion} - ${NETStandardLibraryPackageVersion} + ${MicrosoftNETCoreApp21PackageVersion} + ${NETStandardLibraryPackageVersion} aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d 0 1 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 80a347ece1..fa0418f000 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -1,10 +1,10 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp20PackageVersion} - ${NETStandardLibraryPackageVersion} + ${MicrosoftNETCoreApp21PackageVersion} + ${NETStandardLibraryPackageVersion} aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index de2e78b7fc..e2ff0d0658 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -1,10 +1,10 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp20PackageVersion} - ${NETStandardLibraryPackageVersion} + ${MicrosoftNETCoreApp21PackageVersion} + ${NETStandardLibraryPackageVersion} true diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index 55519673c1..e9bdb82d13 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -1,10 +1,10 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp20PackageVersion} - ${NETStandardLibraryPackageVersion} + ${MicrosoftNETCoreApp21PackageVersion} + ${NETStandardLibraryPackageVersion} aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index f24338372f..63fdbba6b8 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -1,10 +1,10 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride - ${MicrosoftNETCoreApp20PackageVersion} - ${NETStandardLibraryPackageVersion} + ${MicrosoftNETCoreApp21PackageVersion} + ${NETStandardLibraryPackageVersion} 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 e50c079e01..18d50119a3 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.0 + netcoreapp2.1 TargetFrameworkOverride true Latest 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 3b83293db1..b5e36c8ba0 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.0 + netcoreapp2.1 Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec 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 fd54abde2d..00c17e7f4a 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride true Latest 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 05835b6070..a01c2e73e1 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 TargetFrameworkOverride true Latest 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 bc4eb15db0..81b7931069 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 @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.0", - "description": "Target netcoreapp2.0" + "choice": "netcoreapp2.1", + "description": "Target netcoreapp2.1" } ], - "replaces": "netcoreapp2.0", - "defaultValue": "netcoreapp2.0" + "replaces": "netcoreapp2.1", + "defaultValue": "netcoreapp2.1" }, "HostIdentifier": { "type": "bind", 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 d05e327c7e..d50b0e58d9 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 @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.0", - "description": "Target netcoreapp2.0" + "choice": "netcoreapp2.1", + "description": "Target netcoreapp2.1" } ], - "replaces": "netcoreapp2.0", - "defaultValue": "netcoreapp2.0" + "replaces": "netcoreapp2.1", + "defaultValue": "netcoreapp2.1" }, "HostIdentifier": { "type": "bind", 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 d4b71d7930..0cf95d3d41 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 @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.0", - "description": "Target netcoreapp2.0" + "choice": "netcoreapp2.1", + "description": "Target netcoreapp2.1" } ], - "replaces": "netcoreapp2.0", - "defaultValue": "netcoreapp2.0" + "replaces": "netcoreapp2.1", + "defaultValue": "netcoreapp2.1" }, "HostIdentifier": { "type": "bind", diff --git a/test/Templates.Test/Helpers/AspNetProcess.cs b/test/Templates.Test/Helpers/AspNetProcess.cs index f9579f4548..428638b761 100644 --- a/test/Templates.Test/Helpers/AspNetProcess.cs +++ b/test/Templates.Test/Helpers/AspNetProcess.cs @@ -15,7 +15,7 @@ namespace Templates.Test.Helpers { public class AspNetProcess : IDisposable { - private const string DefaultFramework = "netcoreapp2.0"; + private const string DefaultFramework = "netcoreapp2.1"; private const string ListeningMessagePrefix = "Now listening on: "; private static int Port = 5000 + new Random().Next(3000); diff --git a/test/Templates.Test/Templates.Test.csproj b/test/Templates.Test/Templates.Test.csproj index ce0d03dcfb..6e699e9215 100644 --- a/test/Templates.Test/Templates.Test.csproj +++ b/test/Templates.Test/Templates.Test.csproj @@ -1,7 +1,7 @@ - netcoreapp2.0 + netcoreapp2.1 $(DefineConstants);XPLAT