From ade457223859ef78116b2fe1331a431e0e938801 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Mon, 19 Nov 2018 16:28:13 -0800
Subject: [PATCH] Fix submodules for AADIntegration JavaScriptServices and
 MetaPackages

---
 .gitmodules                | 12 ------------
 build/buildorder.props     |  6 +++---
 build/submodules.props     |  6 +++---
 modules/AADIntegration     |  1 -
 modules/JavaScriptServices |  1 -
 modules/MetaPackages       |  1 -
 6 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 160000 modules/AADIntegration
 delete mode 160000 modules/JavaScriptServices
 delete mode 160000 modules/MetaPackages

diff --git a/.gitmodules b/.gitmodules
index 7a76d4a516..be6b9310a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "modules/AADIntegration"]
-	path = modules/AADIntegration
-	url = https://github.com/aspnet/AADIntegration.git
-	branch = release/2.1
 [submodule "modules/Antiforgery"]
 	path = modules/Antiforgery
 	url = https://github.com/aspnet/Antiforgery.git
@@ -42,18 +38,10 @@
 	path = modules/Identity
 	url = https://github.com/aspnet/Identity.git
 	branch = release/2.1
-[submodule "modules/JavaScriptServices"]
-	path = modules/JavaScriptServices
-	url = https://github.com/aspnet/JavaScriptServices.git
-	branch = release/2.1
 [submodule "modules/Localization"]
 	path = modules/Localization
 	url = https://github.com/aspnet/Localization.git
 	branch = release/2.1
-[submodule "modules/MetaPackages"]
-	path = modules/MetaPackages
-	url = https://github.com/aspnet/MetaPackages.git
-	branch = release/2.1
 [submodule "modules/Mvc"]
 	path = modules/Mvc
 	url = https://github.com/aspnet/Mvc.git
diff --git a/build/buildorder.props b/build/buildorder.props
index d98dcd526e..9c998db85b 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -25,11 +25,11 @@
     <RepositoryBuildOrder Include="Diagnostics" Order="12" />
     <RepositoryBuildOrder Include="Localization" Order="12" />
     <RepositoryBuildOrder Include="Security" Order="13" />
-    <RepositoryBuildOrder Include="MetaPackages" Order="13" />
+    <RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\Metapackages\" />
     <RepositoryBuildOrder Include="Mvc" Order="14" />
-    <RepositoryBuildOrder Include="AADIntegration" Order="15" />
+    <RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <RepositoryBuildOrder Include="Identity" Order="15" />
-    <RepositoryBuildOrder Include="JavaScriptServices" Order="15" />
+    <RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavascriptServices\" />
     <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" />
     <RepositoryBuildOrder Include="Scaffolding" Order="15" />
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
diff --git a/build/submodules.props b/build/submodules.props
index c93533b4d0..691f1d9b65 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -37,7 +37,7 @@
 
   <ItemGroup>
     <Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
-    <Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
+    <Repository Include="MetaPackages" PatchPolicy="CascadeVersions" RootPath="$(RepositoryRoot)src\Metapackages\" />
     <Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
     <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
 
@@ -48,7 +48,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ShippedRepository Include="AADIntegration" />
+    <ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
     <ShippedRepository Include="Antiforgery" />
     <ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <ShippedRepository Include="BasicMiddleware" />
@@ -60,7 +60,7 @@
     <ShippedRepository Include="HttpAbstractions" />
     <ShippedRepository Include="HttpSysServer" />
     <ShippedRepository Include="Identity" />
-    <ShippedRepository Include="JavaScriptServices" />
+    <ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavascriptServices\" />
     <ShippedRepository Include="JsonPatch" />
     <ShippedRepository Include="Localization" />
     <ShippedRepository Include="Mvc" />
diff --git a/modules/AADIntegration b/modules/AADIntegration
deleted file mode 160000
index 6f02048c3c..0000000000
--- a/modules/AADIntegration
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6f02048c3c5c0ee6684c241721422c2b8eebddbc
diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices
deleted file mode 160000
index ea3a7bc897..0000000000
--- a/modules/JavaScriptServices
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ea3a7bc8974271d6e9eeb9e890f23f953b8b40e2
diff --git a/modules/MetaPackages b/modules/MetaPackages
deleted file mode 160000
index 975011071b..0000000000
--- a/modules/MetaPackages
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 975011071b02f6937261c604fcde48d7e43030ce