From cafb1c3c90578fce3442bed663ca7bc6bb4244dd Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 12 Jun 2018 17:30:38 -0700 Subject: [PATCH 01/12] Update Identity and Kestrel submodules --- .gitmodules | 8 ++++---- modules/Identity | 2 +- modules/KestrelHttpServer | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index ed8ae26eba..e37eca3bf8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -88,8 +88,8 @@ branch = release/2.1 [submodule "modules/Identity"] path = modules/Identity - url = https://github.com/aspnet/Identity.git - branch = release/2.1 + url = https://github.com/aspnet/Identity-Private.git + branch = release/2.1-msrc [submodule "modules/IISIntegration"] path = modules/IISIntegration url = https://github.com/aspnet/IISIntegration.git @@ -104,8 +104,8 @@ branch = release/2.1 [submodule "modules/KestrelHttpServer"] path = modules/KestrelHttpServer - url = https://github.com/aspnet/KestrelHttpServer.git - branch = release/2.1 + url = https://github.com/aspnet/KestrelHttpServer-Private.git + branch = release/2.1-msrc [submodule "modules/Localization"] path = modules/Localization url = https://github.com/aspnet/Localization.git diff --git a/modules/Identity b/modules/Identity index 788e324115..2627ea572c 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 788e324115196d9fb1e15693266943a607644f87 +Subproject commit 2627ea572cca2932284b3577158ad4b4f247794f diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 11ddd9174c..ff3f0e905d 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 11ddd9174c7c2af231ad70cf3efad85012e2fd73 +Subproject commit ff3f0e905d7af6ad1152257611567befe1417cc9 From 5931c7fb9a8884adaf3087fb831caa103e0cfb86 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 18 Jun 2018 13:08:43 -0700 Subject: [PATCH 02/12] Remove trailing slashes when creating LZMAs --- build/tasks/CreateLzma.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/tasks/CreateLzma.cs b/build/tasks/CreateLzma.cs index 88366fa886..91a7e2045c 100644 --- a/build/tasks/CreateLzma.cs +++ b/build/tasks/CreateLzma.cs @@ -25,8 +25,9 @@ namespace RepoTasks { if (Directory.Exists(source)) { - Log.LogMessage(MessageImportance.High, $"Adding directory: {source}"); - archive.AddDirectory(source, progress); + var trimmedSource = source.TrimEnd(new []{ '\\', '/' }); + Log.LogMessage(MessageImportance.High, $"Adding directory: {trimmedSource}"); + archive.AddDirectory(trimmedSource, progress); } else { From a296fe4cdf029c8a7571cc25c7d01a8fdf90c48d Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 21 Jun 2018 15:52:34 -0700 Subject: [PATCH 03/12] Add retries for restores during LZMA generation --- build/PackageArchive.targets | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index 2d283d2e01..ecf9c09784 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -44,6 +44,54 @@ + + + + $(MSBuildLastTaskResult) + + + + + + + $(MSBuildLastTaskResult) + + + + + + + $(MSBuildLastTaskResult) + + + + + + + $(MSBuildLastTaskResult) + + + From 2cd777f06183bf5639578ff3a4162cd3f576e989 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 22 Jun 2018 10:26:49 -0700 Subject: [PATCH 04/12] Bust MSBuild cache on retries --- build/PackageArchive.targets | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index ecf9c09784..80b3e2dd15 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -31,6 +31,8 @@ <_FallbackArchiveRestoreSources Include="$(RestoreSources)" /> + + <_FallbackArchiveRestoreSources Include="https://api.nuget.org/v3/index.json" /> <_FallbackArchiveRestoreSources Include="$(BuildDir)" Condition="Exists($(BuildDir))" /> <_FallbackArchiveRestoreSources Include="$(MetapackageRestoreSource)" Condition="Exists($(MetapackageRestoreSource))" /> @@ -59,7 +61,7 @@ Condition="'$(RestorePassed)' == 'false'" Projects="$(_WorkRoot)Archive.csproj" Targets="Restore" - Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" /> + Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore2" /> @@ -71,7 +73,7 @@ Condition="'$(RestorePassed)' == 'false'" Projects="$(_WorkRoot)Archive.csproj" Targets="Restore" - Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" /> + Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore3" /> @@ -83,7 +85,7 @@ Condition="'$(RestorePassed)' == 'false'" Projects="$(_WorkRoot)Archive.csproj" Targets="Restore" - Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" /> + Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore4" /> @@ -94,7 +96,7 @@ Condition="'$(RestorePassed)' == 'false'" Projects="$(_WorkRoot)Archive.csproj" Targets="Restore" - Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" /> + Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore5" /> From b656aca9b12b2283a5a4848bd4e3bc2bf4216155 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 9 Jul 2018 13:04:00 -0700 Subject: [PATCH 05/12] Updating submodule(s) Mvc => bd995d4cb1d5a64b607f5de316f08acc9ff0f7d9 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 82f7f2aab8..bd995d4cb1 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 82f7f2aab88f1b9af15f60df3830ed327b2d5a89 +Subproject commit bd995d4cb1d5a64b607f5de316f08acc9ff0f7d9 From c970ae654c9a0b15b64ad68410483ee9f4e9736f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 9 Jul 2018 13:31:56 -0700 Subject: [PATCH 06/12] Updating submodule(s) Routing => 9c23ffb2159a3f3ce30511e9e7cbca6603c835bc [auto-updated: submodules] --- modules/Routing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Routing b/modules/Routing index ebab62c766..9c23ffb215 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit ebab62c7666b26fe0f98546cbb210352a7fa1d1d +Subproject commit 9c23ffb2159a3f3ce30511e9e7cbca6603c835bc From c8a8e5029d63ccaaca9c563f7a27ab1aff4437ad Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 10 Jul 2018 01:01:49 +0000 Subject: [PATCH 07/12] Updating BuildTools from 2.1.3-rtm-15799 to 2.1.3-rtm-15800 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index ccb5adf875..f4010edac5 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15799 -commithash:48ea43fbffa6c3d0fc8b51dbbaf69ce52b26da7c +version:2.1.3-rtm-15800 +commithash:30d771e1fce75791a860c1cdc91120ac9aba7c99 From 50f164dc3bd0cf526dc3fd3010332eca428cebda Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 10 Jul 2018 01:32:19 +0000 Subject: [PATCH 08/12] Updating BuildTools from 2.1.3-rtm-15800 to 2.1.3-rtm-15802 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index f4010edac5..251c227c83 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15800 -commithash:30d771e1fce75791a860c1cdc91120ac9aba7c99 +version:2.1.3-rtm-15802 +commithash:a7c08b45b440a7d2058a0aa1eaa3eb6ba811976a From f484fb1f016bcb6b11d478404e321a0a34e8c7d2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 10 Jul 2018 17:35:10 +0000 Subject: [PATCH 09/12] Updating submodule(s) Identity => 3eae93082f379a07d8a6f6cea5fda5781296a2da [auto-updated: submodules] --- modules/Identity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Identity b/modules/Identity index 7fbb5588fc..3eae93082f 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 7fbb5588fc9ebb976b24f97264b51962a8f0087b +Subproject commit 3eae93082f379a07d8a6f6cea5fda5781296a2da From 4f81f757775a0868891aa1360f3519382ea782f3 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 10 Jul 2018 12:45:53 -0700 Subject: [PATCH 10/12] Updating external dependencies (#1249) --- build/dependencies.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 264caf73ba..65a4297141 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,9 +1,9 @@ - + - 2.1.1 - 2.1.1 + 2.1.3-servicing-26708-02 + 2.1.3-servicing-26708-02 From a82b47ce81a0280b2265703bea214ac8ea5bdcf7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 10 Jul 2018 13:20:30 -0700 Subject: [PATCH 11/12] Updating submodule(s) EntityFrameworkCore => 06c6a0aee28596c5d293d143c7d5a60105745841 KestrelHttpServer => 181e521b4003d4adb61f749d58ffeb6c2f42ff27 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/KestrelHttpServer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index fac2ede689..06c6a0aee2 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit fac2ede689ff55b0337161d81a0e61dc794d84d5 +Subproject commit 06c6a0aee28596c5d293d143c7d5a60105745841 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index ac31e5ab30..181e521b40 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit ac31e5ab30e6f6023ddb12b24f76fa72e764a94a +Subproject commit 181e521b4003d4adb61f749d58ffeb6c2f42ff27 From b2e9baa55fa1a96fca3e223f8a0032a053b13be5 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 10 Jul 2018 13:52:59 -0700 Subject: [PATCH 12/12] Updating submodule(s) Identity => 0ab8e15f0592c0529a2f9fe37edd5aab2d8c474f [auto-updated: submodules] --- modules/Identity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Identity b/modules/Identity index 3eae93082f..0ab8e15f05 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 3eae93082f379a07d8a6f6cea5fda5781296a2da +Subproject commit 0ab8e15f0592c0529a2f9fe37edd5aab2d8c474f