diff --git a/.gitmodules b/.gitmodules index 219a68ff6f..a9651ed372 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,10 +26,6 @@ path = modules/Caching url = https://github.com/aspnet/Caching.git branch = release/2.2 -[submodule "modules/Common"] - path = modules/Common - url = https://github.com/aspnet/Common.git - branch = release/2.2 [submodule "modules/Configuration"] path = modules/Configuration url = https://github.com/aspnet/Configuration.git diff --git a/build/artifacts.props b/build/artifacts.props index 8d364a1c24..79e1a2579b 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -25,12 +25,10 @@ - - @@ -55,9 +53,7 @@ - - @@ -173,7 +169,6 @@ - @@ -212,8 +207,6 @@ - - @@ -226,7 +219,6 @@ - @@ -239,7 +231,6 @@ - @@ -259,23 +250,10 @@ - - - - - - - - - - - - - diff --git a/build/buildorder.props b/build/buildorder.props index f40a356312..05aba60937 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,7 +7,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index f2b4376caf..8bd8ba4adb 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,6 +5,29 @@ 2.2.0-rtm-27023-02 2.2.0-rtm-27023-02 4.6.0-rtm-27023-03 + + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index f5e24cf2a1..532e2c37a0 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -10,9 +10,49 @@ false + + + + + + + false + + false + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/submodules.props b/build/submodules.props index a772043618..b1d54c7c93 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,7 +42,6 @@ - diff --git a/modules/Common b/modules/Common deleted file mode 160000 index 143250eedb..0000000000 --- a/modules/Common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 143250eedb219d4ea93fcfd4d66474e5a04ae9c4