From e5c3cc860659c974346d4cf006ed22675d75ffba Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 28 Jun 2018 16:49:02 -0700 Subject: [PATCH 01/25] Bumping version from 2.2.0 to 3.0.0 --- version.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.props b/version.props index bb9881ed0c..bfb9ede187 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - + - 2.2.0 - preview1 + 3.0.0 + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 1f2e966454d34aa823d667658a399e3162ca50f8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 29 Jun 2018 16:09:57 -0700 Subject: [PATCH 02/25] Update templating to use netcoreapp3.0 --- Directory.Build.targets | 6 ++---- NuGetPackageVerifier.json | 4 ++-- build/dependencies.props | 4 +--- build/repo.props | 3 +-- migrations/updateMigrations.cmd | 2 +- .../Microsoft.DotNet.Web.Client.ItemTemplates.csproj | 2 +- .../Microsoft.DotNet.Web.ItemTemplates.csproj | 2 +- .../EmptyWeb-CSharp.csproj.in | 6 +++--- .../EmptyWeb-FSharp.fsproj.in | 6 +++--- .../Microsoft.DotNet.Web.ProjectTemplates.csproj | 6 +++--- .../RazorPagesWeb-CSharp.csproj.in | 6 +++--- .../StarterWeb-CSharp.csproj.in | 6 +++--- .../StarterWeb-FSharp.fsproj.in | 6 +++--- .../WebApi-CSharp.csproj.in | 6 +++--- .../WebApi-FSharp.fsproj.in | 6 +++--- .../EmptyWeb-CSharp/.template.config/template.json | 12 ++++++------ .../EmptyWeb-FSharp/.template.config/template.json | 12 ++++++------ .../.template.config/template.json | 10 +++++----- .../.template.config/template.json | 12 ++++++------ .../StarterWeb-CSharp/.template.config/template.json | 12 ++++++------ .../StarterWeb-FSharp/.template.config/template.json | 12 ++++++------ .../WebApi-CSharp/.template.config/template.json | 12 ++++++------ .../WebApi-FSharp/.template.config/template.json | 12 ++++++------ .../Angular-CSharp.csproj.in | 2 +- .../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj | 2 +- .../React-CSharp.csproj.in | 2 +- .../ReactRedux-CSharp.csproj.in | 2 +- .../Angular-CSharp/.template.config/template.json | 12 ++++++------ .../React-CSharp/.template.config/template.json | 12 ++++++------ .../ReactRedux-CSharp/.template.config/template.json | 12 ++++++------ .../DotNetToolsInstaller/DotNetToolsInstaller.csproj | 4 ++-- test/GenerateTestProps.targets | 4 ++-- test/TemplateTests.targets.in | 4 ++++ test/Templates.Test/Helpers/AspNetProcess.cs | 2 +- test/Templates.Test/Templates.Test.csproj | 7 +++++-- 35 files changed, 116 insertions(+), 114 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 9a6821f5e3..4bcc9df925 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,10 +1,8 @@ - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) + $(MicrosoftNETCoreApp30PackageVersion) $(NETStandardLibrary20PackageVersion) 99.9 - \ No newline at end of file + diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index a1bfc0f1c5..bc3d3ec447 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -19,7 +19,7 @@ "Template" ] }, - "Microsoft.DotNet.Web.ProjectTemplates.2.2": { + "Microsoft.DotNet.Web.ProjectTemplates.3.0": { "packageTypes": [ "Template" ] @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/build/dependencies.props b/build/dependencies.props index a8bb50f8ac..34cea5caf5 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -33,9 +33,7 @@ 2.2.0-preview1-34530 2.2.0-preview1-34530 2.2.0-preview1-34530 - 2.0.0 - 2.1.0 - 2.2.0-preview1-26618-02 + 2.2.0-preview1-26618-02 2.2.0-preview1-34530 15.6.1 2.2.0-preview1-34530 diff --git a/build/repo.props b/build/repo.props index de6ed02ca5..f31319821d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -8,8 +8,7 @@ - - + - netcoreapp2.2 + netcoreapp3.0 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 c789a961e6..66041173c3 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.2 + netcoreapp3.0 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 ba9103aa17..afebc28397 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in @@ -1,15 +1,15 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride 99.9 - ${MicrosoftNETCoreApp22PackageVersion} + ${MicrosoftNETCoreApp30PackageVersion} - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in index 4491281d5f..fe5b75b11a 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in @@ -1,15 +1,15 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride 99.9 - ${MicrosoftNETCoreApp22PackageVersion} + ${MicrosoftNETCoreApp30PackageVersion} - + 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 ab46f63cd9..ac56dc261a 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.2 - Microsoft.DotNet.Web.ProjectTemplates.2.2 + netcoreapp3.0 + Microsoft.DotNet.Web.ProjectTemplates.3.0 ASP.NET Core Web Template Pack for Microsoft Template Engine @@ -32,7 +32,7 @@ MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion); MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion=$(MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion); MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion); - MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion); + MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion); 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 1837cfec18..98955e555d 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d full @@ -9,11 +9,11 @@ 1 99.9 - ${MicrosoftNETCoreApp22PackageVersion} + ${MicrosoftNETCoreApp30PackageVersion} - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index e5d4c7cbee..8c87ef713f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride full aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 @@ -9,11 +9,11 @@ 1 99.9 - ${MicrosoftNETCoreApp22PackageVersion} + ${MicrosoftNETCoreApp30PackageVersion} - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 5afc2e41f8..73e370d707 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -1,16 +1,16 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride true 99.9 - ${MicrosoftNETCoreApp22PackageVersion} + ${MicrosoftNETCoreApp30PackageVersion} - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in index 28b4517c53..4291cc403f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -1,18 +1,18 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502 0 1 99.9 - ${MicrosoftNETCoreApp22PackageVersion} + ${MicrosoftNETCoreApp30PackageVersion} - + diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in index fc557dbd7d..a78e8ea142 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -1,15 +1,15 @@  - netcoreapp2.2 + netcoreapp3.0 TargetFrameworkOverride 99.9 - ${MicrosoftNETCoreApp22PackageVersion} + ${MicrosoftNETCoreApp30PackageVersion} - + 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 fa1a686e36..1f86c6d6d7 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.2", + "identity": "Microsoft.Web.Empty.CSharp.3.0", "shortName": "web", "tags": { "language": "C#", @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -146,4 +146,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 b625c29b16..c81c7d633f 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.2", + "identity": "Microsoft.Web.Empty.FSharp.3.0", "shortName": "web", "tags": { "language": "F#", @@ -95,12 +95,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -142,4 +142,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 5855186742..c7998b848f 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 @@ -12,7 +12,7 @@ "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.2", + "identity": "Microsoft.Web.Razor.Library.CSharp.3.0", "shortName": "razorclasslib", "tags": { "language": "C#", @@ -34,11 +34,11 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "defaultValue": "netcoreapp2.2" + "defaultValue": "netcoreapp3.0" }, "HostIdentifier": { "type": "bind", @@ -84,4 +84,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 91c964a10a..1dc4289cfe 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,7 +11,7 @@ "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.2", + "identity": "Microsoft.Web.RazorPages.CSharp.3.0", "shortName": [ "razor", "webapp" @@ -329,12 +329,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -364,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 c1b8bcda52..674e434cb4 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.2", + "identity": "Microsoft.Web.Mvc.CSharp.3.0", "shortName": "mvc", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { @@ -319,12 +319,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "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 dad23ea741..ad098064db 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.2", + "identity": "Microsoft.Web.Mvc.FSharp.3.0", "shortName": "mvc", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { @@ -106,12 +106,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -153,4 +153,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 00b4b90a85..3024765085 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.2", + "identity": "Microsoft.Web.WebApi.CSharp.3.0", "shortName": "webapi", "tags": { "language": "C#", @@ -222,12 +222,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "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 36a84c89ea..04c08eea10 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.2", + "identity": "Microsoft.Web.WebApi.FSharp.3.0", "shortName": "webapi", "tags": { "language": "F#", @@ -95,12 +95,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "copyrightYear": { "type": "generated", @@ -142,4 +142,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} 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 0b4b8f451c..25092086eb 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.2 + netcoreapp3.0 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 d4ebf83c23..19dbf77299 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.2 + netcoreapp3.0 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 be23dc22f7..12b0a78e94 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.2 + netcoreapp3.0 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 abf4252943..e79cb077f2 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.2 + netcoreapp3.0 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 b38a66ff1e..382358d0e0 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.2", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.Angular.CSharp.3.0", "name": "ASP.NET Core with Angular", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "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/React-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json index fcc131cb9a..841691d10a 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.2", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.3.0", "name": "ASP.NET Core with React.js", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "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 cb404dd503..5f184af257 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.2", + "identity": "Microsoft.DotNet.Web.Spa.ProjectTemplates.ReactRedux.CSharp.3.0", "name": "ASP.NET Core with React.js and Redux", "preferNameDirectory": true, "primaryOutputs": [ @@ -99,12 +99,12 @@ "datatype": "choice", "choices": [ { - "choice": "netcoreapp2.2", - "description": "Target netcoreapp2.2" + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" } ], - "replaces": "netcoreapp2.2", - "defaultValue": "netcoreapp2.2" + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" }, "HostIdentifier": { "type": "bind", @@ -140,4 +140,4 @@ "continueOnError": true } ] -} \ No newline at end of file +} diff --git a/test/DotNetToolsInstaller/DotNetToolsInstaller.csproj b/test/DotNetToolsInstaller/DotNetToolsInstaller.csproj index 3f1d65e2b7..ca9253ccec 100644 --- a/test/DotNetToolsInstaller/DotNetToolsInstaller.csproj +++ b/test/DotNetToolsInstaller/DotNetToolsInstaller.csproj @@ -1,6 +1,6 @@ - netcoreapp2.2 + netcoreapp3.0 DotnetToolReference @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/test/GenerateTestProps.targets b/test/GenerateTestProps.targets index 9e6fcb1b8a..9d513ebb5a 100644 --- a/test/GenerateTestProps.targets +++ b/test/GenerateTestProps.targets @@ -18,12 +18,12 @@ - BundledAspNetCoreAllTargetFrameworkVersion=2.2 + BundledAspNetCoreAllTargetFrameworkVersion=3.0 $(TargetsProperties);BundledAspNetCoreAllPackageVersion=$(MicrosoftAspNetCoreAllPackageVersion) - BundledAspNetCoreAppTargetFrameworkVersion=2.2 + BundledAspNetCoreAppTargetFrameworkVersion=3.0 $(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion) diff --git a/test/TemplateTests.targets.in b/test/TemplateTests.targets.in index 5d7e98d4bb..ca3c57ba6d 100644 --- a/test/TemplateTests.targets.in +++ b/test/TemplateTests.targets.in @@ -57,6 +57,8 @@ Copyright (c) .NET Foundation. All rights reserved. $(DefaultPatchVersionForAspNetCoreApp2_1) + $(DefaultPatchVersionForAspNetCoreApp2_2) + $(DefaultPatchVersionForAspNetCoreApp3_0) @@ -81,6 +83,8 @@ Copyright (c) .NET Foundation. All rights reserved. + + diff --git a/test/Templates.Test/Helpers/AspNetProcess.cs b/test/Templates.Test/Helpers/AspNetProcess.cs index b8e9ab6b3f..b0aa3c4e85 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.2"; + private const string DefaultFramework = "netcoreapp3.0"; 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 de576ce746..5d7f4e0568 100644 --- a/test/Templates.Test/Templates.Test.csproj +++ b/test/Templates.Test/Templates.Test.csproj @@ -1,7 +1,10 @@  - netcoreapp2.2 + netcoreapp3.0 $(DefineConstants);XPLAT + + + $(DefineConstants);NETCOREAPP2_2 @@ -33,7 +36,7 @@ <_Parameter1>DotNetEfFullPath - <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp2.2/any/dotnet-ef.dll + <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.0/any/dotnet-ef.dll From 5273e4e7e843672b3379ce08c4c61e3e7b9b4912 Mon Sep 17 00:00:00 2001 From: "Nate McMaster (automated)" Date: Mon, 2 Jul 2018 12:40:39 -0700 Subject: [PATCH 03/25] [automated] Change default branch to master --- .appveyor.yml | 2 +- .travis.yml | 2 +- .vsts-pipelines/builds/ci-internal.yml | 4 ++-- .vsts-pipelines/builds/ci-public.yml | 6 +++--- korebuild.json | 4 ++-- run.ps1 | 6 +++--- run.sh | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0b53daa069..c01b9049ac 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,7 +4,7 @@ install: - ps: Install-Product node 8 x64 branches: only: - - dev + - master - /^release\/.*$/ - /^(.*\/)?ci-.*$/ build_script: diff --git a/.travis.yml b/.travis.yml index 41d3fd2653..56bed1d149 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ os: osx_image: xcode9.2 branches: only: - - dev + - master - /^release\/.*$/ - /^(.*\/)?ci-.*$/ before_install: diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml index dede2700c7..86145193a5 100644 --- a/.vsts-pipelines/builds/ci-internal.yml +++ b/.vsts-pipelines/builds/ci-internal.yml @@ -1,5 +1,5 @@ trigger: -- dev +- master - release/* resources: @@ -7,7 +7,7 @@ resources: - repository: buildtools type: git name: aspnet-BuildTools - ref: refs/heads/dev + ref: refs/heads/master phases: - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml index d237101cbe..9c160fea17 100644 --- a/.vsts-pipelines/builds/ci-public.yml +++ b/.vsts-pipelines/builds/ci-public.yml @@ -1,5 +1,5 @@ trigger: -- dev +- master - release/* # See https://github.com/aspnet/BuildTools @@ -9,7 +9,7 @@ resources: type: github endpoint: DotNet-Bot GitHub Connection name: aspnet/BuildTools - ref: refs/heads/dev + ref: refs/heads/master phases: - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools @@ -29,7 +29,7 @@ phases: displayName: Use Node 8.x inputs: versionSpec: 8.x - - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https + - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https displayName: install certs - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools diff --git a/korebuild.json b/korebuild.json index 19b76654e1..ce2e15a055 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,6 +1,6 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", + "channel": "master", "toolsets": { "nodejs": { "required": true, diff --git a/run.ps1 b/run.ps1 index 3b27382468..34604c7175 100644 --- a/run.ps1 +++ b/run.ps1 @@ -52,8 +52,8 @@ in the file are overridden by command line parameters. Example config file: ```json { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", + "channel": "master", "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" } ``` @@ -192,7 +192,7 @@ if (!$DotNetHome) { else { Join-Path $PSScriptRoot '.dotnet'} } -if (!$Channel) { $Channel = 'dev' } +if (!$Channel) { $Channel = 'master' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } # Execute diff --git a/run.sh b/run.sh index 02aac15874..61f7a53385 100755 --- a/run.sh +++ b/run.sh @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" fi -[ -z "$channel" ] && channel='dev' +[ -z "$channel" ] && channel='master' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild From 6296f4fdab9433f78fbf17d9bfbf1f836d0754a1 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 2 Jul 2018 16:13:17 -0700 Subject: [PATCH 04/25] Resolve build warnings about missing template properties --- .gitignore | 1 + build/dependencies.props | 62 +++++++++++++++++----------------- korebuild-lock.txt | 4 +-- test/GenerateTestProps.targets | 14 ++++---- test/TemplateTests.props.in | 4 +-- test/TemplateTests.targets.in | 12 +++---- 6 files changed, 49 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 08399cccd7..38c1bc46c0 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ node_modules .vscode global.json .idea/ +*.binlog \ No newline at end of file diff --git a/build/dependencies.props b/build/dependencies.props index 34cea5caf5..64b86af553 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,40 +4,40 @@ 0.9.9 - 2.2.0-preview1-34530 - 2.2.0-preview1-17090 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10000 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 15.6.82 15.6.82 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-26618-02 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 + 3.0.0-preview1-26629-04 + 3.0.0-alpha1-10013 15.6.1 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10013 + 3.0.0-alpha1-10013 2.0.3 0.20.0 3.12.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3e694b2ed8..3f870e51fe 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17090 -commithash:b19e903e946579cd9482089bce7d917e8bacd765 +version:3.0.0-alpha1-10000 +commithash:b7b88d08d55abc8b71de9abf16e26fc713e332cd diff --git a/test/GenerateTestProps.targets b/test/GenerateTestProps.targets index 9d513ebb5a..8e006d2aea 100644 --- a/test/GenerateTestProps.targets +++ b/test/GenerateTestProps.targets @@ -6,13 +6,13 @@ $(PropsProperties);MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion) - 2.1.1 - $(MicrosoftAspNetCoreAllPackageVersion) - $(DefaultPatchVersionForAspNetCoreAll2_1) - $(MicrosoftAspNetCoreAppPackageVersion) + 3.0.0 + $(MicrosoftAspNetCoreAllPackageVersion) + $(DefaultPatchVersionForAspNetCoreAll3_0) + $(MicrosoftAspNetCoreAppPackageVersion) - $(PropsProperties);DefaultPatchVersionForAspNetCoreAll2_1=$(DefaultPatchVersionForAspNetCoreAll2_1) - $(PropsProperties);DefaultPatchVersionForAspNetCoreApp2_1=$(DefaultPatchVersionForAspNetCoreApp2_1) + $(PropsProperties);DefaultPatchVersionForAspNetCoreAll3_0=$(DefaultPatchVersionForAspNetCoreAll3_0) + $(PropsProperties);DefaultPatchVersionForAspNetCoreApp3_0=$(DefaultPatchVersionForAspNetCoreApp3_0) @@ -23,7 +23,7 @@ - BundledAspNetCoreAppTargetFrameworkVersion=3.0 + $(TargetsProperties);BundledAspNetCoreAppTargetFrameworkVersion=3.0 $(TargetsProperties);BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion) diff --git a/test/TemplateTests.props.in b/test/TemplateTests.props.in index cd7240af05..374ffa30c7 100644 --- a/test/TemplateTests.props.in +++ b/test/TemplateTests.props.in @@ -4,7 +4,7 @@ ${RestoreSources} ${RuntimeFrameworkVersion} ${MicrosoftNETSdkRazorPackageVersion} - ${DefaultPatchVersionForAspNetCoreAll2_1} - ${DefaultPatchVersionForAspNetCoreApp2_1} + ${DefaultPatchVersionForAspNetCoreAll3_0} + ${DefaultPatchVersionForAspNetCoreApp3_0} diff --git a/test/TemplateTests.targets.in b/test/TemplateTests.targets.in index ca3c57ba6d..1dfc94d375 100644 --- a/test/TemplateTests.targets.in +++ b/test/TemplateTests.targets.in @@ -39,13 +39,13 @@ Copyright (c) .NET Foundation. All rights reserved. - 2.1.1 - 2.1.1 + 3.0.0 + 3.0.0 - $(DefaultPatchVersionForAspNetCoreAll2_1) + $(DefaultPatchVersionForAspNetCoreAll3_0) @@ -56,7 +56,7 @@ Copyright (c) .NET Foundation. All rights reserved. - $(DefaultPatchVersionForAspNetCoreApp2_1) + $(DefaultPatchVersionForAspNetCoreApp3_0) $(DefaultPatchVersionForAspNetCoreApp2_2) $(DefaultPatchVersionForAspNetCoreApp3_0) @@ -70,7 +70,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + @@ -82,7 +82,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + From ddd01c229cacc240e4c7a6e9bb24f6dfdd8bdb5a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 16:31:37 +0000 Subject: [PATCH 05/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 64b86af553..8994706a8c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,40 +4,40 @@ 0.9.9 - 3.0.0-alpha1-10013 + 3.0.0-alpha1-10016 3.0.0-alpha1-10000 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 15.6.82 15.6.82 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 3.0.0-preview1-26629-04 - 3.0.0-alpha1-10013 + 3.0.0-alpha1-10016 15.6.1 - 3.0.0-alpha1-10013 - 3.0.0-alpha1-10013 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 2.0.3 0.20.0 3.12.1 From e472c17533434285f62affa25a4d544cc463b168 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 8 Jul 2018 20:13:45 +0000 Subject: [PATCH 06/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 64 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index dd5efecb95..c43c7931f2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,51 +1,51 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.9.9 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10000 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10005 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 15.6.82 15.6.82 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 3.0.0-preview1-26629-04 - 3.0.0-alpha1-10016 + 3.0.0-alpha1-10044 15.6.1 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 2.0.3 0.20.0 3.12.1 17.17134.0 3.12.1 4.6.0-preview1-26617-01 - 0.9.0 + 0.8.0 2.3.1 - 2.4.0-beta.1.build3945 + 2.4.0-rc.1.build4038 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index f0b76184fd..f357ac9f7d 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10000 -commithash:b7b88d08d55abc8b71de9abf16e26fc713e332cd +version:3.0.0-alpha1-10005 +commithash:05570853de976a526462ca140a55b1ac59d9a351 From 1c9817a197b6ed1acd437c54bc3ddeadb19f2f7d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 15 Jul 2018 20:16:06 +0000 Subject: [PATCH 07/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 64 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index c43c7931f2..ecb6e1e13e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,46 +4,46 @@ 0.9.9 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10005 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10009 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 15.6.82 15.6.82 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-preview1-26629-04 - 3.0.0-alpha1-10044 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-preview1-26710-03 + 3.0.0-alpha1-10081 15.6.1 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 2.0.3 0.20.0 3.12.1 17.17134.0 3.12.1 - 4.6.0-preview1-26617-01 - 0.8.0 + 4.6.0-preview1-26708-04 + 0.9.0 2.3.1 2.4.0-rc.1.build4038 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index f357ac9f7d..4db537685b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10005 -commithash:05570853de976a526462ca140a55b1ac59d9a351 +version:3.0.0-alpha1-10009 +commithash:86be4707e47d2f1930a982f2b59eacfc4196da33 From 6b0f373ab9b0d952defbf6a2207c619be8a2f4b7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 22 Jul 2018 13:18:25 -0700 Subject: [PATCH 08/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 58 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index ecb6e1e13e..ab118d353a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.9.9 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10009 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10011 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 15.6.82 15.6.82 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 3.0.0-preview1-26710-03 - 3.0.0-alpha1-10081 + 3.0.0-alpha1-10123 15.6.1 - 3.0.0-alpha1-10081 - 3.0.0-alpha1-10081 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 2.0.3 0.20.0 3.12.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 4db537685b..9a67ee9c28 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10009 -commithash:86be4707e47d2f1930a982f2b59eacfc4196da33 +version:3.0.0-alpha1-10011 +commithash:717c2eb1f91dafd2580c1a9b8e5064d12dd8c054 From 45dff1852093eff215b952468608748793e98a59 Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Tue, 24 Jul 2018 10:57:53 -0700 Subject: [PATCH 09/25] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64ff041d5c..eac4268e4c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ Contributing ====== -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo. +Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo. From d5cad264625cc493053cb58f5808ce8d01432930 Mon Sep 17 00:00:00 2001 From: Scott Addie Date: Wed, 1 Aug 2018 15:21:04 -0500 Subject: [PATCH 10/25] Clarify help text for --no-https option --- .../content/EmptyWeb-CSharp/.template.config/template.json | 2 +- .../content/EmptyWeb-FSharp/.template.config/template.json | 2 +- .../content/RazorPagesWeb-CSharp/.template.config/template.json | 2 +- .../content/StarterWeb-CSharp/.template.config/template.json | 2 +- .../content/StarterWeb-FSharp/.template.config/template.json | 2 +- .../content/WebApi-CSharp/.template.config/template.json | 2 +- .../content/WebApi-FSharp/.template.config/template.json | 2 +- .../content/Angular-CSharp/.template.config/template.json | 2 +- .../content/React-CSharp/.template.config/template.json | 2 +- .../content/ReactRedux-CSharp/.template.config/template.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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 1f86c6d6d7..071c77b32c 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 @@ -124,7 +124,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ 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 c81c7d633f..9ea39a49db 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 @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ 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 1dc4289cfe..6f8f280828 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 @@ -308,7 +308,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." }, "UseLocalDB": { "type": "parameter", 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 e4486fe9ce..4093108440 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 @@ -298,7 +298,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." }, "UseLocalDB": { "type": "parameter", 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 12606f5a08..eed0b045e0 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 @@ -131,7 +131,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ 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 3024765085..3e805b4d89 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 @@ -201,7 +201,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." }, "UseLocalDB": { "type": "parameter", 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 04c08eea10..27b83646d1 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 @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ 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 382358d0e0..6445aa79ea 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 @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "tags": { 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 841691d10a..19853a8678 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 @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "tags": { 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 5f184af257..a9e0e788cc 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 @@ -120,7 +120,7 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if IndividualAuth or OrganizationalAuth are not being used." + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "tags": { From d7b897ad751be1932cfd89113ba5972f9e383ba1 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 20:18:24 +0000 Subject: [PATCH 11/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 66 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e72b5633f0..16ba81926e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,48 +1,48 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.9.9 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10011 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-20180810.1 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 15.6.82 15.6.82 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-preview1-26710-03 - 3.0.0-alpha1-10123 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-preview1-26810-02 + 3.0.0-alpha1-10275 15.6.1 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 2.0.3 3.12.1 17.17134.0 3.12.1 - 4.6.0-preview1-26708-04 - 0.9.0 + 4.6.0-preview1-26807-04 + 0.10.0 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 9a67ee9c28..e417a01b52 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10011 -commithash:717c2eb1f91dafd2580c1a9b8e5064d12dd8c054 +version:3.0.0-alpha1-20180810.1 +commithash:45c32b4f020e14a9295be31866051a18d293309d From 7a0967e5c653ffa54e90517a697b32fddcecd8df Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 19 Aug 2018 19:33:01 +0000 Subject: [PATCH 12/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 62 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 16ba81926e..9b003f582d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,44 +4,44 @@ 0.9.9 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-20180810.1 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-20180817.3 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 15.6.82 15.6.82 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-preview1-26810-02 - 3.0.0-alpha1-10275 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-preview1-26817-04 + 3.0.0-alpha1-10321 15.6.1 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 2.0.3 3.12.1 17.17134.0 3.12.1 - 4.6.0-preview1-26807-04 + 4.6.0-preview1-26816-01 0.10.0 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e417a01b52..e5330b3d33 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180810.1 -commithash:45c32b4f020e14a9295be31866051a18d293309d +version:3.0.0-alpha1-20180817.3 +commithash:134cdbee9bee29dd3ccb654c67663b27b9ffa6c8 From 2d3354311722b443cc3f303131682ca28474c113 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 17 Aug 2018 10:44:10 -0700 Subject: [PATCH 13/25] Skip test broken by lack of 30 SDK --- test/Templates.Test/MvcTemplateTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Templates.Test/MvcTemplateTest.cs b/test/Templates.Test/MvcTemplateTest.cs index 51181995ea..a1cb4e8303 100644 --- a/test/Templates.Test/MvcTemplateTest.cs +++ b/test/Templates.Test/MvcTemplateTest.cs @@ -37,7 +37,7 @@ namespace Templates.Test public void MvcTemplate_NoAuth_Works_NetCore_ForDefaultTemplate() => MvcTemplate_NoAuthImpl(null, languageOverride: default); - [Fact] + [Fact(Skip = "https://github.com/aspnet/Templating/issues/673")] public void MvcTemplate_NoAuth_Works_NetCore_ForFSharpTemplate() => MvcTemplate_NoAuthImpl(null, languageOverride: "F#"); From 00faa0ca2eb0e4559f4a805442e82e5e4682bacd Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 26 Aug 2018 19:32:27 +0000 Subject: [PATCH 14/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 62 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b5716dd749..7af397877b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,44 +4,44 @@ 0.9.9 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-20180817.3 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-20180821.3 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 15.6.82 15.6.82 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-preview1-26817-04 - 3.0.0-alpha1-10321 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-preview1-26821-04 + 3.0.0-alpha1-10352 15.6.1 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 2.0.3 3.12.1 17.17134.0 3.12.1 - 4.6.0-preview1-26816-01 + 4.6.0-preview1-26817-04 0.10.0 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e5330b3d33..767a471795 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180817.3 -commithash:134cdbee9bee29dd3ccb654c67663b27b9ffa6c8 +version:3.0.0-alpha1-20180821.3 +commithash:0939a90812deb1c604eb9a4768869687495fc1dd From 47d61ff5b36fdbb87f4190b75dff64b662c0706e Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 30 Aug 2018 10:53:25 -0700 Subject: [PATCH 15/25] Remove references to MvcPrecompilation package --- build/dependencies.props | 1 - .../Microsoft.DotNet.Web.ProjectTemplates.csproj | 1 - .../StarterWeb-FSharp.fsproj.in | 2 -- 3 files changed, 4 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7af397877b..69da2182ed 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -19,7 +19,6 @@ 3.0.0-alpha1-10352 3.0.0-alpha1-10352 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 3.0.0-alpha1-10352 3.0.0-alpha1-10352 3.0.0-alpha1-10352 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 4c22534ae7..e16aabd9b1 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -24,7 +24,6 @@ MicrosoftAspNetCoreHttpsPolicyPackageVersion=$(MicrosoftAspNetCoreHttpsPolicyPackageVersion); MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion=$(MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion); MicrosoftAspNetCoreMvcPackageVersion=$(MicrosoftAspNetCoreMvcPackageVersion); - MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion=$(MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion); MicrosoftAspNetCorePackageVersion=$(MicrosoftAspNetCorePackageVersion); MicrosoftAspNetCoreStaticFilesPackageVersion=$(MicrosoftAspNetCoreStaticFilesPackageVersion); MicrosoftEntityFrameworkCoreDesignPackageVersion=$(MicrosoftEntityFrameworkCoreDesignPackageVersion); diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 089ccc8598..fea71c16c0 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -3,7 +3,6 @@ netcoreapp3.0 TargetFrameworkOverride - true @@ -20,7 +19,6 @@ - From 629502e3ce8945567ab74880b439ef4cd1a8ffdc Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 2 Sep 2018 19:31:49 +0000 Subject: [PATCH 16/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 69da2182ed..32c92c9c0c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,43 +4,43 @@ 0.9.9 - 3.0.0-alpha1-10352 + 3.0.0-alpha1-10393 3.0.0-alpha1-20180821.3 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 15.6.82 15.6.82 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-preview1-26821-04 - 3.0.0-alpha1-10352 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-preview1-26830-01 + 3.0.0-alpha1-10393 15.6.1 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 2.0.3 3.12.1 17.17134.0 3.12.1 - 4.6.0-preview1-26817-04 + 4.6.0-preview1-26829-04 0.10.0 2.3.1 2.4.0 From b8d09f4ceae5e1a1da079504035662df5c71e432 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 6 Sep 2018 00:04:31 +0000 Subject: [PATCH 17/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 32c92c9c0c..5ff7eb8b17 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,43 +4,43 @@ 0.9.9 - 3.0.0-alpha1-10393 + 3.0.0-alpha1-10400 3.0.0-alpha1-20180821.3 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 15.6.82 15.6.82 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-preview1-26830-01 - 3.0.0-alpha1-10393 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-preview1-26905-03 + 3.0.0-alpha1-10400 15.6.1 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 2.0.3 3.12.1 17.17134.0 3.12.1 - 4.6.0-preview1-26829-04 + 4.6.0-preview1-26831-06 0.10.0 2.3.1 2.4.0 From 6d25b826a28dc4ed35a3bfca96ba147a1aed052f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 9 Sep 2018 19:34:06 +0000 Subject: [PATCH 18/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 60 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5ff7eb8b17..18e79ec30b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,43 +4,43 @@ 0.9.9 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-20180821.3 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-20180907.9 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 15.6.82 15.6.82 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-preview1-26905-03 - 3.0.0-alpha1-10400 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-preview1-26907-04 + 3.0.0-alpha1-10419 15.6.1 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 2.0.3 3.12.1 17.17134.0 3.12.1 - 4.6.0-preview1-26831-06 + 4.6.0-preview1-26905-03 0.10.0 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 767a471795..b614cab6e8 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180821.3 -commithash:0939a90812deb1c604eb9a4768869687495fc1dd +version:3.0.0-alpha1-20180907.9 +commithash:f997365a8832ff0a3cbd9a98df45734ac2723fa0 From 6672ff701b4e236ab01e4f0005a7f92a64bd7f0a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 16 Sep 2018 19:33:38 +0000 Subject: [PATCH 19/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 60 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 18e79ec30b..aa86c0471b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,43 +4,43 @@ 0.9.9 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-20180907.9 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-20180911.2 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 15.6.82 15.6.82 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-preview1-26907-04 - 3.0.0-alpha1-10419 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-preview1-26907-05 + 3.0.0-alpha1-10454 15.6.1 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 2.0.3 3.12.1 17.17134.0 3.12.1 - 4.6.0-preview1-26905-03 + 4.6.0-preview1-26907-04 0.10.0 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b614cab6e8..a817c10d28 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180907.9 -commithash:f997365a8832ff0a3cbd9a98df45734ac2723fa0 +version:3.0.0-alpha1-20180911.2 +commithash:2a2b7dbea1b247930c41da497f4ea0b2bb756818 From 80b1132c6470cf7c6f518e2fed8cbb18abbe77c4 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 23 Sep 2018 12:31:33 -0700 Subject: [PATCH 20/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index aa86c0471b..ba7cee5884 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.9.9 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-20180911.2 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-20180919.1 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 15.6.82 15.6.82 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 3.0.0-preview1-26907-05 - 3.0.0-alpha1-10454 + 3.0.0-alpha1-10495 15.6.1 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 2.0.3 3.12.1 17.17134.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a817c10d28..d66a13bdc7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180911.2 -commithash:2a2b7dbea1b247930c41da497f4ea0b2bb756818 +version:3.0.0-alpha1-20180919.1 +commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4 From 7813cf0c71cdeae97a962c1851b82e8fd457c077 Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Thu, 27 Sep 2018 15:25:42 -0700 Subject: [PATCH 21/25] Update LICENSE.txt --- LICENSE.txt | 207 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 197 insertions(+), 10 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 7b2956ecee..b3b180cd51 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,14 +1,201 @@ -Copyright (c) .NET Foundation and Contributors + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -All rights reserved. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at + 1. Definitions. - http://www.apache.org/licenses/LICENSE-2.0 + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) .NET Foundation and Contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 6abfd75b0f5378ec99ad6047fc961efa2da72834 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 30 Sep 2018 12:31:06 -0700 Subject: [PATCH 22/25] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index ba7cee5884..5d89c9f0e2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.9.9 - 3.0.0-alpha1-10495 + 3.0.0-alpha1-10549 3.0.0-alpha1-20180919.1 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 15.6.82 15.6.82 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 3.0.0-preview1-26907-05 - 3.0.0-alpha1-10495 + 3.0.0-alpha1-10549 15.6.1 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 2.0.3 3.12.1 17.17134.0 From 8bffcc8f69bcb99e56ee441808f3981a8f6319c7 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 11 Oct 2018 15:12:40 -0700 Subject: [PATCH 23/25] Include Razor.Design dep that was missing in master --- build/dependencies.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/dependencies.props b/build/dependencies.props index 5d89c9f0e2..4fa6a46724 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -20,6 +20,7 @@ 3.0.0-alpha1-10549 3.0.0-alpha1-10549 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 3.0.0-alpha1-10549 3.0.0-alpha1-10549 3.0.0-alpha1-10549 From ee78882b27274c4d8b9c04a24ebfa61f5bc01911 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 24 Oct 2018 12:07:51 -0700 Subject: [PATCH 24/25] update master --- scripts/Run-Angular-Locally.ps1 | 2 +- scripts/Run-Razor-Locally.ps1 | 2 +- scripts/Run-React-Locally.ps1 | 2 +- scripts/Run-ReactRedux-Locally.ps1 | 2 +- scripts/Run-Starterweb-Locally.ps1 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/Run-Angular-Locally.ps1 b/scripts/Run-Angular-Locally.ps1 index 72bafb3ac8..b677c54da7 100644 --- a/scripts/Run-Angular-Locally.ps1 +++ b/scripts/Run-Angular-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-rtm-t000.nupkg" $true +Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-alpha1.nupkg" $true diff --git a/scripts/Run-Razor-Locally.ps1 b/scripts/Run-Razor-Locally.ps1 index 9a81ab68bd..4fe49367a8 100644 --- a/scripts/Run-Razor-Locally.ps1 +++ b/scripts/Run-Razor-Locally.ps1 @@ -6,4 +6,4 @@ param() . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-rtm-t000.nupkg" $false +Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.0-alpha1.nupkg" $false diff --git a/scripts/Run-React-Locally.ps1 b/scripts/Run-React-Locally.ps1 index 45afbab7f8..9f2ba0c47a 100644 --- a/scripts/Run-React-Locally.ps1 +++ b/scripts/Run-React-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-rtm-t000.nupkg" $true +Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-alpha1.nupkg" $true diff --git a/scripts/Run-ReactRedux-Locally.ps1 b/scripts/Run-ReactRedux-Locally.ps1 index ebfa3de467..05fff105a4 100644 --- a/scripts/Run-ReactRedux-Locally.ps1 +++ b/scripts/Run-ReactRedux-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-rtm-t000.nupkg" $true +Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-alpha1.nupkg" $true diff --git a/scripts/Run-Starterweb-Locally.ps1 b/scripts/Run-Starterweb-Locally.ps1 index 0bc33adc56..4d5b90b5d6 100644 --- a/scripts/Run-Starterweb-Locally.ps1 +++ b/scripts/Run-Starterweb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-rtm-t000.nupkg" $false +Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.0-alpha1.nupkg" $false From 171c2073d1a824965d59c7e528be5645aba20d18 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 24 Oct 2018 16:20:23 -0700 Subject: [PATCH 25/25] update --- scripts/Run-Razor-Locally.ps1 | 2 +- scripts/Run-Starterweb-Locally.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Run-Razor-Locally.ps1 b/scripts/Run-Razor-Locally.ps1 index 4fe49367a8..a1fd1a2b68 100644 --- a/scripts/Run-Razor-Locally.ps1 +++ b/scripts/Run-Razor-Locally.ps1 @@ -6,4 +6,4 @@ param() . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.0-alpha1.nupkg" $false +Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-alpha1.nupkg" $false diff --git a/scripts/Run-Starterweb-Locally.ps1 b/scripts/Run-Starterweb-Locally.ps1 index 4d5b90b5d6..3d80af84ac 100644 --- a/scripts/Run-Starterweb-Locally.ps1 +++ b/scripts/Run-Starterweb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Custom-Hive.ps1 -Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.0-alpha1.nupkg" $false +Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-alpha1.nupkg" $false