From 0cf9019caac47ace85d4232d8ba8d9e266b30ab7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 14 Nov 2018 11:21:15 -0800 Subject: [PATCH] Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages --- .gitmodules | 4 - build/buildorder.props | 1 - build/repo.props | 6 ++ build/submodules.props | 1 - eng/Baseline.props | 94 ++++++++++++++++++++++++ eng/Dependencies.props | 8 ++ eng/ProjectReferences.props | 7 ++ eng/dependencies.temp.props | 15 ++++ eng/tools/BaselineGenerator/baseline.xml | 7 ++ modules/KestrelHttpServer | 1 - 10 files changed, 137 insertions(+), 7 deletions(-) create mode 100644 eng/dependencies.temp.props delete mode 160000 modules/KestrelHttpServer diff --git a/.gitmodules b/.gitmodules index 696da212f5..bedc913388 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,10 +58,6 @@ path = modules/JavaScriptServices url = https://github.com/aspnet/JavaScriptServices.git branch = release/2.1 -[submodule "modules/KestrelHttpServer"] - path = modules/KestrelHttpServer - url = https://github.com/aspnet/KestrelHttpServer.git - branch = release/2.1 [submodule "modules/Localization"] path = modules/Localization url = https://github.com/aspnet/Localization.git diff --git a/build/buildorder.props b/build/buildorder.props index 4f36b48031..caabf76890 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -11,7 +11,6 @@ - diff --git a/build/repo.props b/build/repo.props index cec72fd000..1d5261431b 100644 --- a/build/repo.props +++ b/build/repo.props @@ -42,6 +42,11 @@ + + + + + - diff --git a/eng/Baseline.props b/eng/Baseline.props index 143bb89af7..a8f9316a92 100644 --- a/eng/Baseline.props +++ b/eng/Baseline.props @@ -24,6 +24,14 @@ 2.1.1 + + + 2.1.3 + + + + + 2.1.1 @@ -115,6 +123,92 @@ + + + 2.1.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.1.3 + + + + + + + + + + + + 2.1.3 + + + + + + + 2.1.3 + + + + + + + + + + + 2.1.3 + + + + + + + + + + + + + + 2.1.3 + + + + + + + 2.1.1 diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 95ff7fb38f..c2792fb384 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -5,11 +5,15 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + @@ -25,18 +29,22 @@ + + + + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index ce1657d68b..7d04ed99b8 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -12,6 +12,13 @@ + + + + + + + diff --git a/eng/dependencies.temp.props b/eng/dependencies.temp.props new file mode 100644 index 0000000000..a96067429f --- /dev/null +++ b/eng/dependencies.temp.props @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/eng/tools/BaselineGenerator/baseline.xml b/eng/tools/BaselineGenerator/baseline.xml index 1bb113b638..823c131a30 100644 --- a/eng/tools/BaselineGenerator/baseline.xml +++ b/eng/tools/BaselineGenerator/baseline.xml @@ -3,6 +3,7 @@ + @@ -14,5 +15,11 @@ + + + + + + diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer deleted file mode 160000 index 15ba5065a9..0000000000 --- a/modules/KestrelHttpServer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 15ba5065a9b220f545eb3118d9e552f0b7e824d0