From 2711049cf412d5db826fb96a8502e833735b953e Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Wed, 21 Nov 2018 10:08:51 -0800
Subject: [PATCH] Fix submodules for ServerTests StaticFiles and Session

---
 .gitmodules            | 12 ------------
 build/buildorder.props |  6 +++---
 build/submodules.props |  8 ++++----
 modules/ServerTests    |  1 -
 modules/Session        |  1 -
 modules/StaticFiles    |  1 -
 6 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 160000 modules/ServerTests
 delete mode 160000 modules/Session
 delete mode 160000 modules/StaticFiles

diff --git a/.gitmodules b/.gitmodules
index ef502e2e7e..bf06acf4e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,19 +58,7 @@
 	path = modules/Security
 	url = https://github.com/aspnet/Security.git
 	branch = release/2.1
-[submodule "modules/ServerTests"]
-	path = modules/ServerTests
-	url = https://github.com/aspnet/ServerTests.git
-	branch = release/2.1
-[submodule "modules/Session"]
-	path = modules/Session
-	url = https://github.com/aspnet/Session.git
-	branch = release/2.1
 [submodule "modules/SignalR"]
 	path = modules/SignalR
 	url = https://github.com/aspnet/SignalR.git
 	branch = release/2.1
-[submodule "modules/StaticFiles"]
-	path = modules/StaticFiles
-	url = https://github.com/aspnet/StaticFiles.git
-	branch = release/2.1
diff --git a/build/buildorder.props b/build/buildorder.props
index 395ee9b702..006cf89b43 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -14,11 +14,11 @@
     <RepositoryBuildOrder Include="Antiforgery" Order="9" />
     <RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
     <RepositoryBuildOrder Include="CORS" Order="11" />
-    <RepositoryBuildOrder Include="StaticFiles" Order="11" />
+    <RepositoryBuildOrder Include="StaticFiles" Order="11" RootPath="$(RepositoryRoot)src\StaticFiles\" />
     <RepositoryBuildOrder Include="Routing" Order="11" />
     <RepositoryBuildOrder Include="ResponseCaching" Order="11" />
-    <RepositoryBuildOrder Include="Session" Order="11" />
-    <RepositoryBuildOrder Include="ServerTests" Order="11" />
+    <RepositoryBuildOrder Include="Session" Order="11" RootPath="$(RepositoryRoot)src\Session\" />
+    <RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
     <RepositoryBuildOrder Include="Diagnostics" Order="12" />
     <RepositoryBuildOrder Include="Localization" Order="12" />
     <RepositoryBuildOrder Include="Security" Order="13" />
diff --git a/build/submodules.props b/build/submodules.props
index 2fed4cecfe..288581d631 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -43,8 +43,8 @@
 
     <!-- Test-only repos -->
     <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\AuthSamples\" />
-    <Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\MusicStore\" />
+    <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\ServerTests\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -66,8 +66,8 @@
     <ShippedRepository Include="ResponseCaching" />
     <ShippedRepository Include="Routing" />
     <ShippedRepository Include="Security" />
-    <ShippedRepository Include="Session" />
+    <ShippedRepository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
     <ShippedRepository Include="SignalR" />
-    <ShippedRepository Include="StaticFiles" />
+    <ShippedRepository Include="StaticFiles" RootPath="$(RepositoryRoot)src\StaticFiles\" />
   </ItemGroup>
 </Project>
diff --git a/modules/ServerTests b/modules/ServerTests
deleted file mode 160000
index 019ba1722e..0000000000
--- a/modules/ServerTests
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 019ba1722e9d100fc54f8ab60f12ac4f1b795f0b
diff --git a/modules/Session b/modules/Session
deleted file mode 160000
index d20c2c8f04..0000000000
--- a/modules/Session
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d20c2c8f04e6779239abd65c033fa66eb6c2002f
diff --git a/modules/StaticFiles b/modules/StaticFiles
deleted file mode 160000
index 2b285667a8..0000000000
--- a/modules/StaticFiles
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2b285667a8b387b5b6f754029f152db21df489f1