From e5c3cc860659c974346d4cf006ed22675d75ffba Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 28 Jun 2018 16:49:02 -0700 Subject: [PATCH 1/7] 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 2/7] 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 3/7] [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 4/7] 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 5/7] 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 6/7] 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 7/7] 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