From c8139504397b0e834e8e464867e7808b8799bb59 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 19 Nov 2018 09:29:33 -0800 Subject: [PATCH 1/5] 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 c38d6e662ad7d9aa204c525a3f9906b8e3dcc94b Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 19 Nov 2018 10:50:39 -0800 Subject: [PATCH 2/5] 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 3/5] 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 4/5] 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 4173f23e3e5ddf7f2f24f69fdc313b0ffa7929a9 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 19 Nov 2018 12:05:39 -0800 Subject: [PATCH 5/5] 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