From 94e1afafa626407c520017a3ef623298ab2d8998 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Wed, 21 Nov 2018 15:26:19 -0800
Subject: [PATCH] Remove submodules for Antiforgery CORS HttpSysServer
 ResponseCaching Routing and Security

---
 .gitmodules             | 24 ------------------------
 build/buildorder.props  | 12 ++++++------
 build/submodules.props  | 12 ++++++------
 modules/Antiforgery     |  1 -
 modules/CORS            |  1 -
 modules/HttpSysServer   |  1 -
 modules/ResponseCaching |  1 -
 modules/Routing         |  1 -
 modules/Security        |  1 -
 9 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 160000 modules/Antiforgery
 delete mode 160000 modules/CORS
 delete mode 160000 modules/HttpSysServer
 delete mode 160000 modules/ResponseCaching
 delete mode 160000 modules/Routing
 delete mode 160000 modules/Security

diff --git a/.gitmodules b/.gitmodules
index 74f3c8ad50..7ed88e70d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,23 +1,11 @@
-[submodule "modules/Antiforgery"]
-	path = modules/Antiforgery
-	url = https://github.com/aspnet/Antiforgery.git
-	branch = release/2.1
 [submodule "modules/BasicMiddleware"]
 	path = modules/BasicMiddleware
 	url = https://github.com/aspnet/BasicMiddleware.git
 	branch = release/2.1
-[submodule "modules/CORS"]
-	path = modules/CORS
-	url = https://github.com/aspnet/CORS.git
-	branch = release/2.1
 [submodule "modules/EntityFrameworkCore"]
 	path = modules/EntityFrameworkCore
 	url = https://github.com/aspnet/EntityFrameworkCore.git
 	branch = release/2.1
-[submodule "modules/HttpSysServer"]
-	path = modules/HttpSysServer
-	url = https://github.com/aspnet/HttpSysServer.git
-	branch = release/2.1
 [submodule "modules/Identity"]
 	path = modules/Identity
 	url = https://github.com/aspnet/Identity.git
@@ -38,22 +26,10 @@
 	path = modules/Razor
 	url = https://github.com/aspnet/Razor.git
 	branch = release/2.1
-[submodule "modules/ResponseCaching"]
-	path = modules/ResponseCaching
-	url = https://github.com/aspnet/ResponseCaching.git
-	branch = release/2.1
-[submodule "modules/Routing"]
-	path = modules/Routing
-	url = https://github.com/aspnet/Routing.git
-	branch = release/2.1
 [submodule "modules/Scaffolding"]
 	path = modules/Scaffolding
 	url = https://github.com/aspnet/Scaffolding.git
 	branch = release/2.1
-[submodule "modules/Security"]
-	path = modules/Security
-	url = https://github.com/aspnet/Security.git
-	branch = release/2.1
 [submodule "modules/SignalR"]
 	path = modules/SignalR
 	url = https://github.com/aspnet/SignalR.git
diff --git a/build/buildorder.props b/build/buildorder.props
index 62a317e218..a72614523e 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -9,18 +9,18 @@
   <ItemGroup>
     <RepositoryBuildOrder Include="Razor" Order="6" />
     <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
-    <RepositoryBuildOrder Include="HttpSysServer" Order="8" />
+    <RepositoryBuildOrder Include="HttpSysServer" Order="8" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
     <RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
-    <RepositoryBuildOrder Include="Antiforgery" Order="9" />
+    <RepositoryBuildOrder Include="Antiforgery" Order="9" RootPath="$(RepositoryRoot)src\Antiforgery\" />
     <RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
-    <RepositoryBuildOrder Include="CORS" Order="11" />
+    <RepositoryBuildOrder Include="CORS" Order="11" RootPath="$(RepositoryRoot)src\CORS\" />
     <RepositoryBuildOrder Include="StaticFiles" Order="11" RootPath="$(RepositoryRoot)src\StaticFiles\" />
-    <RepositoryBuildOrder Include="Routing" Order="11" />
-    <RepositoryBuildOrder Include="ResponseCaching" Order="11" />
+    <RepositoryBuildOrder Include="Routing" Order="11" RootPath="$(RepositoryRoot)src\Routing\" />
+    <RepositoryBuildOrder Include="ResponseCaching" Order="11" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
     <RepositoryBuildOrder Include="Session" Order="11" RootPath="$(RepositoryRoot)src\Session\" />
     <RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
     <RepositoryBuildOrder Include="Localization" Order="12" />
-    <RepositoryBuildOrder Include="Security" Order="13" />
+    <RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
     <RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />
     <RepositoryBuildOrder Include="Mvc" Order="14" />
     <RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
diff --git a/build/submodules.props b/build/submodules.props
index 44bccd4eb6..589d3f65d8 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -49,12 +49,12 @@
 
   <ItemGroup>
     <ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
-    <ShippedRepository Include="Antiforgery" />
+    <ShippedRepository Include="Antiforgery" RootPath="$(RepositoryRoot)src\Antiforgery\" />
     <ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <ShippedRepository Include="BasicMiddleware" />
-    <ShippedRepository Include="CORS" />
+    <ShippedRepository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
     <ShippedRepository Include="EntityFrameworkCore" />
-    <ShippedRepository Include="HttpSysServer" />
+    <ShippedRepository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
     <ShippedRepository Include="Identity" />
     <ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
     <ShippedRepository Include="JsonPatch" />
@@ -62,9 +62,9 @@
     <ShippedRepository Include="Mvc" />
     <ShippedRepository Include="MvcPrecompilation" />
     <ShippedRepository Include="Razor" />
-    <ShippedRepository Include="ResponseCaching" />
-    <ShippedRepository Include="Routing" />
-    <ShippedRepository Include="Security" />
+    <ShippedRepository Include="ResponseCaching" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
+    <ShippedRepository Include="Routing" RootPath="$(RepositoryRoot)src\Routing\" />
+    <ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
     <ShippedRepository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
     <ShippedRepository Include="SignalR" />
     <ShippedRepository Include="StaticFiles" RootPath="$(RepositoryRoot)src\StaticFiles\" />
diff --git a/modules/Antiforgery b/modules/Antiforgery
deleted file mode 160000
index 93b496090e..0000000000
--- a/modules/Antiforgery
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 93b496090e65a66bba27b67b1e22ff6adec8effc
diff --git a/modules/CORS b/modules/CORS
deleted file mode 160000
index ec429447bf..0000000000
--- a/modules/CORS
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ec429447bfd5f419b9f40676b03b85a954b40f74
diff --git a/modules/HttpSysServer b/modules/HttpSysServer
deleted file mode 160000
index d8d1f36f28..0000000000
--- a/modules/HttpSysServer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d8d1f36f28359b76f838a99e425b2af2565538f0
diff --git a/modules/ResponseCaching b/modules/ResponseCaching
deleted file mode 160000
index 777b2fbf7e..0000000000
--- a/modules/ResponseCaching
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 777b2fbf7e768221c528243773037a50423b7b34
diff --git a/modules/Routing b/modules/Routing
deleted file mode 160000
index 58b66f7cbb..0000000000
--- a/modules/Routing
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 58b66f7cbb3858aa1b7b8b2848b8d3cec4df0e40
diff --git a/modules/Security b/modules/Security
deleted file mode 160000
index 930ed239e4..0000000000
--- a/modules/Security
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 930ed239e41d7547edf06f31efa3461d1a2c6bad