From cafb1c3c90578fce3442bed663ca7bc6bb4244dd Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 12 Jun 2018 17:30:38 -0700 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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" />