From 7089f1685932613fc9598f933a2ecf2d380f9288 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 17 Apr 2018 15:47:38 -0700 Subject: [PATCH 1/5] Update to include Kestrel patch changes --- .gitmodules | 4 ++-- modules/KestrelHttpServer | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 295fc54ba8..667b6fc933 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,8 +56,8 @@ branch = release/2.0 [submodule "modules/KestrelHttpServer"] path = modules/KestrelHttpServer - url = https://github.com/aspnet/KestrelHttpServer.git - branch = release/2.0 + url = https://github.com/aspnet/KestrelHttpServer-Private.git + branch = release/2.0-msrc [submodule "modules/Localization"] path = modules/Localization url = https://github.com/aspnet/Localization.git diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 8392ecdb81..1cfe5f1e0b 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 8392ecdb81698aec199a44ab8c1e937d1c68a688 +Subproject commit 1cfe5f1e0bf23da6c1679e2a26423c78e2f3f1e2 From 2f91599af9423a404549ca641e7a7e799dbf9127 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 17 Apr 2018 15:54:56 -0700 Subject: [PATCH 2/5] Upgrade to System.Security.Cryptography.Xml 4.4.2 --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index ba9793863f..bed36de804 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -75,7 +75,7 @@ 1.5.0 4.4.0 4.3.0 - 4.4.0 + 4.4.2 4.4.0 4.4.0 4.8.0 From 90f35168fcecb695f3ca2987cb9b53650acdae60 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 20 Apr 2018 13:15:39 -0700 Subject: [PATCH 3/5] Update KestrelHttpServer submodules --- modules/KestrelHttpServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 1cfe5f1e0b..5532528f1d 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 1cfe5f1e0bf23da6c1679e2a26423c78e2f3f1e2 +Subproject commit 5532528f1d4633c4b26b105d8a4d716ba5d349a6 From 75295b1289a5f43219318fdca1d50ebadf12a3df Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 19 Apr 2018 18:32:25 -0700 Subject: [PATCH 4/5] Rename delta zips to *.patch.zip/*.patch.tar.gz --- build/RuntimeStore.targets | 2 +- build/RuntimeStoreInstaller.targets | 44 ++++++++++++++--------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build/RuntimeStore.targets b/build/RuntimeStore.targets index f966bce6ee..480bc07a7e 100644 --- a/build/RuntimeStore.targets +++ b/build/RuntimeStore.targets @@ -206,7 +206,7 @@ - $(ArtifactsDir)aspnetcore-store-$(PackageVersion)-$(RuntimeStoreRID).zip + $(ArtifactsDir)aspnetcore-store-$(PackageVersion)-$(RuntimeStoreRID).patch.zip $(ArtifactsDir)aspnetcore-symbols-$(PackageVersion)-$(RuntimeStoreRID).zip diff --git a/build/RuntimeStoreInstaller.targets b/build/RuntimeStoreInstaller.targets index 109e5cccc4..eaece814e9 100644 --- a/build/RuntimeStoreInstaller.targets +++ b/build/RuntimeStoreInstaller.targets @@ -26,9 +26,9 @@ $(PublicCoreFeedPrefix)/aspnetcore/store/$(PreviousRuntimeStoreArchiveVersion)/Build.RS. $(CoreFeedPrefix)/Runtime/$(MicrosoftNETCoreApp20PackageVersion)/dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz $(_TimestampRSSource)aspnetcore-store-$(PackageVersion)- - $(TimestampRSArchivePrefix)linux-x64.tar.gz + $(TimestampRSArchivePrefix)linux-x64.patch.tar.gz $(_TimestampFreeRSSource)aspnetcore-store-$(PackageVersionNoTimestamp)- - $(TimestampFreeRSArchivePrefix)linux-x64.tar.gz + $(TimestampFreeRSArchivePrefix)linux-x64.patch.tar.gz @@ -47,26 +47,26 @@ Text="Timestamp linux archive not found. Expected it to exist in $(TimestampLinuxRSArchive)." Condition="!Exists('$(TimestampLinuxRSArchive)')" /> + Text="Timestamp osx archive not found. Expected it to exist in $(TimestampRSArchivePrefix)osx-x64.patch.tar.gz." + Condition="!Exists('$(TimestampRSArchivePrefix)osx-x64.patch.tar.gz')" /> + Text="Timestamp winx64 archive not found. Expected it to exist in $(TimestampRSArchivePrefix)win7-x64.patch.zip." + Condition="!Exists('$(TimestampRSArchivePrefix)win7-x64.patch.zip')" /> + Text="Timestamp winx86 archive not found. Expected it to exist in $(TimestampRSArchivePrefix)win7-x86.patch.zip." + Condition="!Exists('$(TimestampRSArchivePrefix)win7-x86.patch.zip')" /> + Text="Non-timestamp osx archive not found. Expected it to exist in $(TimestampFreeRSArchivePrefix)osx-x64.patch.tar.gz." + Condition="!Exists('$(TimestampFreeRSArchivePrefix)osx-x64.patch.tar.gz')" /> + Text="Non-timestamp winx64 archive not found. Expected it to exist in $(TimestampFreeRSArchivePrefix)win7-x64.patch.zip." + Condition="!Exists('$(TimestampFreeRSArchivePrefix)win7-x64.patch.zip')" /> + Text="Non-timestamp winx86 archive not found. Expected it to exist in $(TimestampFreeRSArchivePrefix)win7-x86.patch.zip." + Condition="!Exists('$(TimestampFreeRSArchivePrefix)win7-x86.patch.zip')" /> @@ -162,35 +162,35 @@ Build.RS.linux.tar.gz - $(TimestampFreeRSArchivePrefix)linux-x64.tar.gz + $(TimestampFreeRSArchivePrefix)linux-x64.patch.tar.gz Build.RS.osx.tar.gz - $(TimestampFreeRSArchivePrefix)osx-x64.tar.gz + $(TimestampFreeRSArchivePrefix)osx-x64.patch.tar.gz Build.RS.winx64.zip - $(TimestampFreeRSArchivePrefix)win7-x64.zip + $(TimestampFreeRSArchivePrefix)win7-x64.patch.zip Build.RS.winx86.zip - $(TimestampFreeRSArchivePrefix)win7-x86.zip + $(TimestampFreeRSArchivePrefix)win7-x86.patch.zip Build.RS.linux.tar.gz - $(TimestampRSArchivePrefix)linux-x64.tar.gz + $(TimestampRSArchivePrefix)linux-x64.patch.tar.gz Build.RS.osx.tar.gz - $(TimestampRSArchivePrefix)osx-x64.tar.gz + $(TimestampRSArchivePrefix)osx-x64.patch.tar.gz Build.RS.winx64.zip - $(TimestampRSArchivePrefix)win7-x64.zip + $(TimestampRSArchivePrefix)win7-x64.patch.zip Build.RS.winx86.zip - $(TimestampRSArchivePrefix)win7-x86.zip + $(TimestampRSArchivePrefix)win7-x86.patch.zip From 7ac5eb14b18d2f2367f81593862e4e1bb477d571 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 23 Apr 2018 16:52:31 -0700 Subject: [PATCH 5/5] Update KestrelHttpServer submodule --- modules/KestrelHttpServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 5532528f1d..b080a943c1 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 5532528f1d4633c4b26b105d8a4d716ba5d349a6 +Subproject commit b080a943c138f611c9463a2856e11db16a599778