From c2685813ab5c1ff04ab53930797a1813d1adedf0 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 15 Nov 2018 12:20:37 -0800 Subject: [PATCH 01/17] 2.1: Update corefx dependencies (#4037) --- build/dependencies.props | 12 ++++++------ build/tasks/CheckVersionOverrides.cs | 2 +- scripts/GenerateTags.ps1 | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index dcf23d85d4..ee542668be 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,6 +4,12 @@ 2.1.6 2.1.6 + 4.5.2-servicing-27114-05 + 4.5.3-servicing-27114-05 + 4.5.2-servicing-27114-05 + 4.5.1-servicing-27114-05 + 4.5.2-servicing-27114-05 + 4.5.2-servicing-27114-05 @@ -170,15 +176,11 @@ 4.5.0 1.5.0 4.5.0 - 4.5.1 4.5.1 4.5.0 5.2.0 3.1.1 - 4.5.2 - 4.5.1 4.3.2 - 4.5.1 4.5.2 4.5.0 3.1.1 @@ -186,7 +188,6 @@ 1.6.0 4.5.2 4.3.0 - 4.5.0 4.5.0 4.5.0 4.5.1 @@ -194,7 +195,6 @@ 4.5.0 4.5.0 4.9.0 - 4.5.1 4.5.0 1.3.7 9.0.1 diff --git a/build/tasks/CheckVersionOverrides.cs b/build/tasks/CheckVersionOverrides.cs index ad75aa8b2b..a510a8b800 100644 --- a/build/tasks/CheckVersionOverrides.cs +++ b/build/tasks/CheckVersionOverrides.cs @@ -24,7 +24,7 @@ namespace RepoTasks var versionOverrides = ProjectRootElement.Open(DotNetPackageVersionPropsPath); var dependencies = ProjectRootElement.Open(DependenciesFile); var pinnedVersions = dependencies.PropertyGroups - .Where(p => !string.Equals("Package Versions: Auto", p.Label)) + .Where(p => string.Equals("Package Versions: Pinned", p.Label)) .SelectMany(p => p.Properties) .ToDictionary(p => p.Name, p => p.Value, StringComparer.OrdinalIgnoreCase); diff --git a/scripts/GenerateTags.ps1 b/scripts/GenerateTags.ps1 index 0cd9c331ca..f0866ffcab 100755 --- a/scripts/GenerateTags.ps1 +++ b/scripts/GenerateTags.ps1 @@ -43,10 +43,10 @@ function New-GitTag { Invoke-Block { & git tag -m "v$Tag" $Tag HEAD } Write-Host -f Magenta "${Repo}: added tag '$Tag'" } - } - if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) { - Invoke-Block { & git push origin refs/tags/$Tag } + if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) { + Invoke-Block { & git push origin refs/tags/$Tag } + } } } finally { From 681d743170042f9fca48d43febb4c6138cd1da6e Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Nov 2018 09:36:17 -0800 Subject: [PATCH 02/17] Update MusicStore source --- .gitmodules | 4 ---- build/buildorder.props | 2 +- build/submodules.props | 2 +- modules/MusicStore | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 160000 modules/MusicStore diff --git a/.gitmodules b/.gitmodules index bedc913388..3a7a14987d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,10 +66,6 @@ path = modules/MetaPackages url = https://github.com/aspnet/MetaPackages.git branch = release/2.1 -[submodule "modules/MusicStore"] - path = modules/MusicStore - url = https://github.com/aspnet/MusicStore.git - branch = release/2.1 [submodule "modules/Mvc"] path = modules/Mvc url = https://github.com/aspnet/Mvc.git diff --git a/build/buildorder.props b/build/buildorder.props index caabf76890..b11fe0d221 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -34,7 +34,7 @@ - + diff --git a/build/submodules.props b/build/submodules.props index 52d15e9be0..840ee9b359 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -43,7 +43,7 @@ - + diff --git a/modules/MusicStore b/modules/MusicStore deleted file mode 160000 index c14416f26f..0000000000 --- a/modules/MusicStore +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c14416f26f3f575665d5142a4b9f677487cfcef4 From 9adb829eb53b44ea5e2626bdd274680ea95b2315 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Nov 2018 10:18:09 -0800 Subject: [PATCH 03/17] Fix MusicStore RootPath --- build/submodules.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/submodules.props b/build/submodules.props index 840ee9b359..59942bc7dd 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -43,7 +43,7 @@ - + From 8227f9f81997b9371e7c4677bbe91b98139e56a7 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Nov 2018 13:14:45 -0800 Subject: [PATCH 04/17] Fix merge problem --- build/dependencies.props | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 90f8cfef91..24ac88c05e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -207,7 +207,6 @@ 4.5.0 1.5.0 4.5.0 -<<<<<<< HEAD 4.6.0 4.5.0 4.5.0 @@ -218,14 +217,6 @@ 4.3.2 4.5.0 4.5.1 -======= - 4.5.1 - 4.5.0 - 5.2.0 - 3.1.1 - 4.3.2 - 4.5.2 ->>>>>>> origin/release/2.1 4.5.0 3.1.1 4.3.0 From 6da92b9d6d2c372c9c61e1cceb657c9b63895b33 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Nov 2018 15:30:22 -0800 Subject: [PATCH 05/17] Fix dependencies --- build/dependencies.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/dependencies.props b/build/dependencies.props index 24ac88c05e..d55f189615 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -223,6 +223,7 @@ 4.5.1 1.6.0 4.3.0 + 4.5.0 4.5.0 4.5.0 4.5.0 @@ -230,6 +231,7 @@ 4.5.0 4.5.0 4.9.0 + 4.5.1 4.5.0 1.3.7 9.0.1 From 5e961e27ea083f640daa8c46b3bd72b076932e28 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 16 Nov 2018 17:17:44 -0800 Subject: [PATCH 06/17] Ignore apphost.exe in runtime store (#4073) --- src/SiteExtensions/build/repo.props | 2 ++ src/SiteExtensions/eng/signcheck.exclusions.txt | 1 + 2 files changed, 3 insertions(+) create mode 100644 src/SiteExtensions/eng/signcheck.exclusions.txt diff --git a/src/SiteExtensions/build/repo.props b/src/SiteExtensions/build/repo.props index 25129c9001..eca3003474 100644 --- a/src/SiteExtensions/build/repo.props +++ b/src/SiteExtensions/build/repo.props @@ -3,6 +3,8 @@ + + $(RepositoryRoot)eng\signcheck.exclusions.txt diff --git a/src/SiteExtensions/eng/signcheck.exclusions.txt b/src/SiteExtensions/eng/signcheck.exclusions.txt new file mode 100644 index 0000000000..4f16d97025 --- /dev/null +++ b/src/SiteExtensions/eng/signcheck.exclusions.txt @@ -0,0 +1 @@ +content/sdk/*/AppHostTemplate/apphost.exe;AspNetCoreRuntime.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it. From ca42d0295e4673759e3a8e49ed07d7655dc9e4d0 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 19 Nov 2018 08:26:28 -0800 Subject: [PATCH 07/17] Use property group for sign exclussions --- src/SiteExtensions/build/repo.props | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SiteExtensions/build/repo.props b/src/SiteExtensions/build/repo.props index eca3003474..419564007a 100644 --- a/src/SiteExtensions/build/repo.props +++ b/src/SiteExtensions/build/repo.props @@ -3,8 +3,10 @@ - - $(RepositoryRoot)eng\signcheck.exclusions.txt + + $(RepositoryRoot)eng\signcheck.exclusions.txt + + From e4249dade09f5c9772d3665d6af09de9997888fd Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 19 Nov 2018 08:42:21 -0800 Subject: [PATCH 08/17] Fix the SiteExtension signing exclusion --- src/SiteExtensions/eng/signcheck.exclusions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SiteExtensions/eng/signcheck.exclusions.txt b/src/SiteExtensions/eng/signcheck.exclusions.txt index 4f16d97025..77d94eceda 100644 --- a/src/SiteExtensions/eng/signcheck.exclusions.txt +++ b/src/SiteExtensions/eng/signcheck.exclusions.txt @@ -1 +1 @@ -content/sdk/*/AppHostTemplate/apphost.exe;AspNetCoreRuntime.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it. +content/store/*/apphost.exe;Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it. From c8139504397b0e834e8e464867e7808b8799bb59 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 19 Nov 2018 09:29:33 -0800 Subject: [PATCH 09/17] React to changes in produced corefx packages (#4077) --- build/dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index ee542668be..5f57abaae1 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,10 +4,8 @@ 2.1.6 2.1.6 - 4.5.2-servicing-27114-05 4.5.3-servicing-27114-05 4.5.2-servicing-27114-05 - 4.5.1-servicing-27114-05 4.5.2-servicing-27114-05 4.5.2-servicing-27114-05 @@ -176,6 +174,7 @@ 4.5.0 1.5.0 4.5.0 + 4.5.1 4.5.1 4.5.0 5.2.0 @@ -188,6 +187,7 @@ 1.6.0 4.5.2 4.3.0 + 4.5.0 4.5.0 4.5.0 4.5.1 From 2bba41ed345095176ab3882cf00f71d8742777e4 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 19 Nov 2018 09:50:44 -0800 Subject: [PATCH 10/17] Remove unneeded file --- .deployment | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .deployment diff --git a/.deployment b/.deployment deleted file mode 100644 index 38d6c4630b..0000000000 --- a/.deployment +++ /dev/null @@ -1,2 +0,0 @@ -+[config] -+project = src/MusicStore/MusicStore.csproj From c38d6e662ad7d9aa204c525a3f9906b8e3dcc94b Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 19 Nov 2018 10:50:39 -0800 Subject: [PATCH 11/17] Remove templating module --- .gitmodules | 4 ---- build/buildorder.props | 2 +- build/submodules.props | 2 +- modules/Templating | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 160000 modules/Templating diff --git a/.gitmodules b/.gitmodules index 3a7a14987d..28556811ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -110,7 +110,3 @@ path = modules/StaticFiles url = https://github.com/aspnet/StaticFiles.git branch = release/2.1 -[submodule "modules/Templating"] - path = modules/Templating - url = https://github.com/aspnet/Templating.git - branch = release/2.1 diff --git a/build/buildorder.props b/build/buildorder.props index b11fe0d221..b450d1ecd6 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -37,6 +37,6 @@ - + diff --git a/build/submodules.props b/build/submodules.props index 59942bc7dd..32d9787d6e 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -39,7 +39,7 @@ - + diff --git a/modules/Templating b/modules/Templating deleted file mode 160000 index 3f26b56fef..0000000000 --- a/modules/Templating +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3f26b56fefaa559d1ca9ba9181a249c0af26b9c3 From 33a92fecd77586b6a221bbf43d10d09564974432 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 19 Nov 2018 11:11:59 -0800 Subject: [PATCH 12/17] Fix AuthSamples submodule --- .gitmodules | 4 ---- build/buildorder.props | 2 +- build/submodules.props | 2 +- modules/AuthSamples | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 160000 modules/AuthSamples diff --git a/.gitmodules b/.gitmodules index 28556811ab..afd606d012 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,6 @@ path = modules/Antiforgery url = https://github.com/aspnet/Antiforgery.git branch = release/2.1 -[submodule "modules/AuthSamples"] - path = modules/AuthSamples - url = https://github.com/aspnet/AuthSamples.git - branch = release/2.1 [submodule "modules/AzureIntegration"] path = modules/AzureIntegration url = https://github.com/aspnet/AzureIntegration.git diff --git a/build/buildorder.props b/build/buildorder.props index b450d1ecd6..1bacc3f869 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -36,7 +36,7 @@ - + diff --git a/build/submodules.props b/build/submodules.props index 32d9787d6e..cd47e1b33a 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,7 +42,7 @@ - + diff --git a/modules/AuthSamples b/modules/AuthSamples deleted file mode 160000 index d861b70515..0000000000 --- a/modules/AuthSamples +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d861b7051505fe3f86d1498fd065e98cdd602313 From 69534b5687c6e7ad763b0717d60e68137bddac2f Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 19 Nov 2018 11:18:31 -0800 Subject: [PATCH 13/17] Fix AzureIntegration submodule --- .gitmodules | 4 ---- build/buildorder.props | 2 +- build/submodules.props | 2 +- modules/AzureIntegration | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 160000 modules/AzureIntegration diff --git a/.gitmodules b/.gitmodules index afd606d012..c0b6f21334 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,6 @@ path = modules/Antiforgery url = https://github.com/aspnet/Antiforgery.git branch = release/2.1 -[submodule "modules/AzureIntegration"] - path = modules/AzureIntegration - url = https://github.com/aspnet/AzureIntegration.git - branch = release/2.1 [submodule "modules/BasicMiddleware"] path = modules/BasicMiddleware url = https://github.com/aspnet/BasicMiddleware.git diff --git a/build/buildorder.props b/build/buildorder.props index 1bacc3f869..d6349662b5 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -33,7 +33,7 @@ - + diff --git a/build/submodules.props b/build/submodules.props index cd47e1b33a..187738b4e0 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -50,7 +50,7 @@ - + diff --git a/modules/AzureIntegration b/modules/AzureIntegration deleted file mode 160000 index 47e2ba3755..0000000000 --- a/modules/AzureIntegration +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 47e2ba3755450c584990480c23331d286ffa78cf From 2cda14658da963db9ae8ab1f57bc885b82db3812 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 19 Nov 2018 11:55:24 -0800 Subject: [PATCH 14/17] Fix submodules for AuthSamples AzureIntegration and Templating --- .gitmodules | 12 ------------ build/buildorder.props | 6 +++--- build/submodules.props | 6 +++--- modules/AuthSamples | 1 - modules/AzureIntegration | 1 - modules/Templating | 1 - 6 files changed, 6 insertions(+), 21 deletions(-) delete mode 160000 modules/AuthSamples delete mode 160000 modules/AzureIntegration delete mode 160000 modules/Templating diff --git a/.gitmodules b/.gitmodules index 85fb6bd2be..721adca927 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,14 +6,6 @@ path = modules/Antiforgery url = https://github.com/aspnet/Antiforgery.git branch = release/2.2 -[submodule "modules/AuthSamples"] - path = modules/AuthSamples - url = https://github.com/aspnet/AuthSamples.git - branch = release/2.2 -[submodule "modules/AzureIntegration"] - path = modules/AzureIntegration - url = https://github.com/aspnet/AzureIntegration.git - branch = release/2.2 [submodule "modules/BasicMiddleware"] path = modules/BasicMiddleware url = https://github.com/aspnet/BasicMiddleware.git @@ -110,10 +102,6 @@ path = modules/StaticFiles url = https://github.com/aspnet/StaticFiles.git branch = release/2.2 -[submodule "modules/Templating"] - path = modules/Templating - url = https://github.com/aspnet/Templating.git - branch = release/2.2 [submodule "src/IISIntegration/test/gtest/googletest"] path = src/IISIntegration/test/gtest/googletest url = https://github.com/google/googletest diff --git a/build/buildorder.props b/build/buildorder.props index 9e7b14d3fa..09076924ee 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -33,10 +33,10 @@ - + - - + + diff --git a/build/submodules.props b/build/submodules.props index 260d83e385..d1b26d95b0 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -38,10 +38,10 @@ - + - + @@ -49,7 +49,7 @@ - + diff --git a/modules/AuthSamples b/modules/AuthSamples deleted file mode 160000 index 7383e532c9..0000000000 --- a/modules/AuthSamples +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7383e532c9bbfaf843a137d627ba824694529507 diff --git a/modules/AzureIntegration b/modules/AzureIntegration deleted file mode 160000 index 031a2ed214..0000000000 --- a/modules/AzureIntegration +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 031a2ed214529194d95d8deed50287760163ffae diff --git a/modules/Templating b/modules/Templating deleted file mode 160000 index d26f89a6bc..0000000000 --- a/modules/Templating +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d26f89a6bcb649438cee1b851a682caac4363204 From 4173f23e3e5ddf7f2f24f69fdc313b0ffa7929a9 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 19 Nov 2018 12:05:39 -0800 Subject: [PATCH 15/17] Remove the HttpClientFactory submodule (#4085) --- .gitmodules | 4 ---- build/artifacts.props | 2 -- build/buildorder.props | 1 - build/dependencies.props | 3 +-- build/external-dependencies.props | 3 +-- build/submodules.props | 1 - modules/HttpClientFactory | 1 - 7 files changed, 2 insertions(+), 13 deletions(-) delete mode 160000 modules/HttpClientFactory diff --git a/.gitmodules b/.gitmodules index c0b6f21334..7a76d4a516 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,10 +34,6 @@ path = modules/HttpAbstractions url = https://github.com/aspnet/HttpAbstractions.git branch = release/2.1 -[submodule "modules/HttpClientFactory"] - path = modules/HttpClientFactory - url = https://github.com/aspnet/HttpClientFactory.git - branch = release/2.1 [submodule "modules/HttpSysServer"] path = modules/HttpSysServer url = https://github.com/aspnet/HttpSysServer.git diff --git a/build/artifacts.props b/build/artifacts.props index 00db72258b..717198331b 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -185,8 +185,6 @@ - - diff --git a/build/buildorder.props b/build/buildorder.props index d6349662b5..d98dcd526e 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -9,7 +9,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 5f57abaae1..b46e6e7a6c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -58,6 +58,7 @@ 2.1.1 2.1.1 2.1.1 + 2.1.1 2.1.1 2.1.1 2.1.1 @@ -156,8 +157,6 @@ 11.0.2 4.7.0 12.2.1100 - 2.0.1 - 6.0.1 2.2.0 0.20.0 3.12.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index f982ef87be..32846302dd 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -58,6 +58,7 @@ + @@ -184,8 +185,6 @@ - - diff --git a/build/submodules.props b/build/submodules.props index 187738b4e0..c93533b4d0 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -58,7 +58,6 @@ - diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory deleted file mode 160000 index cf7cf83ee8..0000000000 --- a/modules/HttpClientFactory +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf7cf83ee869ed50a41852f5e880d073386b7fe7 From ea1ba001cc9e1ea71c552768d1dab7f5e246fff5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 19 Nov 2018 17:20:02 -0800 Subject: [PATCH 16/17] Fix casing issue in the path the templating code submodule --- build/buildorder.props | 2 +- build/submodules.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/buildorder.props b/build/buildorder.props index d98dcd526e..cafcf40a50 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -36,6 +36,6 @@ - + diff --git a/build/submodules.props b/build/submodules.props index c93533b4d0..a195f5897d 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -39,7 +39,7 @@ - + From ae619e6b7f70aa0186c0db50dd1019f1f58e51c2 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 19 Nov 2018 18:38:09 -0800 Subject: [PATCH 17/17] Include Microsoft.Extensions.Http.dll in signing --- build/CodeSign.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/CodeSign.props b/build/CodeSign.props index 19e4726024..415c54d527 100644 --- a/build/CodeSign.props +++ b/build/CodeSign.props @@ -44,6 +44,7 @@ +