From c92536a21ab59f80872728429f96637a062c26d3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 2 Nov 2018 09:48:56 -0700 Subject: [PATCH] Remove the DependencyInjection submodule --- .gitmodules | 4 - build/artifacts.props | 5 - build/buildorder.props | 1 - build/dependencies.props | 51 ++-- build/external-dependencies.props | 5 + build/sources.props | 1 + build/submodules.props | 1 - modules/DependencyInjection | 1 - modules/SubmoduleGraph.dgml | 394 ------------------------------ 9 files changed, 34 insertions(+), 429 deletions(-) delete mode 160000 modules/DependencyInjection delete mode 100644 modules/SubmoduleGraph.dgml diff --git a/.gitmodules b/.gitmodules index b9aec8459c..aefa39701e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,10 +34,6 @@ path = modules/CORS url = https://github.com/aspnet/CORS.git branch = release/2.2 -[submodule "modules/DependencyInjection"] - path = modules/DependencyInjection - url = https://github.com/aspnet/DependencyInjection.git - branch = release/2.2 [submodule "modules/Diagnostics"] path = modules/Diagnostics url = https://github.com/aspnet/Diagnostics.git diff --git a/build/artifacts.props b/build/artifacts.props index f3b205a5cb..9b1e3558d3 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -184,7 +184,6 @@ - @@ -206,9 +205,6 @@ - - - @@ -239,7 +235,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index bfc184a375..b21d07e2e8 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,7 +7,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index e0f5d607bb..1a71d9db87 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,29 +6,34 @@ 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 - 2.2.0-rtm-35542 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 + 2.2.0-rtm-181102-04 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 0afff9cdfd..1469795b04 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -15,15 +15,20 @@ + + + + + diff --git a/build/sources.props b/build/sources.props index 039b4f37fd..8b99dd7c11 100644 --- a/build/sources.props +++ b/build/sources.props @@ -15,6 +15,7 @@ $(RestoreSources); https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; + https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json; https://dotnet.myget.org/F/roslyn/api/v3/index.json; diff --git a/build/submodules.props b/build/submodules.props index c9e2390486..90488d1c61 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -45,7 +45,6 @@ - diff --git a/modules/DependencyInjection b/modules/DependencyInjection deleted file mode 160000 index 12eef5e86e..0000000000 --- a/modules/DependencyInjection +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 12eef5e86e965b9611221c72c169002e6f3038ee diff --git a/modules/SubmoduleGraph.dgml b/modules/SubmoduleGraph.dgml deleted file mode 100644 index 58a8289412..0000000000 --- a/modules/SubmoduleGraph.dgml +++ /dev/null @@ -1,394 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -