From f0b4ac75c479f207b16331316034910632761e4e Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 5 Dec 2018 11:11:14 -0800
Subject: [PATCH] Set the default submodule path to src/ and fixup bad merge
 from release/2.2

---
 build/AzureIntegration.targets |  2 +-
 build/artifacts.props          |  1 -
 build/buildorder.props         | 44 ++++++++++++++++-----------------
 build/repo.props               |  2 +-
 build/submodules.props         | 45 ++++++++++++++++------------------
 5 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets
index e58bcce854..76ab436c8f 100644
--- a/build/AzureIntegration.targets
+++ b/build/AzureIntegration.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <AzureIntegrationProjectRoot>$(MSBuildThisFileDirectory)..\modules\AzureIntegration\</AzureIntegrationProjectRoot>
+    <AzureIntegrationProjectRoot>$(MSBuildThisFileDirectory)..\src\AzureIntegration\</AzureIntegrationProjectRoot>
   </PropertyGroup>
 
   <Target Name="BuildAzureIntegration" DependsOnTargets="PrepareOutputPaths;GeneratePropsFiles">
diff --git a/build/artifacts.props b/build/artifacts.props
index 2ea322218c..8d95f985c2 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -99,7 +99,6 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authorization.Policy" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authorization" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" Category="noship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 4916b3564f..0788b3bc30 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -7,27 +7,27 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
-    <RepositoryBuildOrder Include="HttpSysServer" Order="8" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
-    <RepositoryBuildOrder Include="Antiforgery" Order="10" RootPath="$(RepositoryRoot)src\Antiforgery\" />
-    <RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
-    <RepositoryBuildOrder Include="StaticFiles" Order="11" RootPath="$(RepositoryRoot)src\StaticFiles\" />
-    <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="CORS" Order="12"  RootPath="$(RepositoryRoot)src\CORS\" />
-    <RepositoryBuildOrder Include="Routing" Order="12" RootPath="$(RepositoryRoot)src\Routing\" />
-    <RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
-    <RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />
-    <RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
-    <RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
-    <RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\"  />
-    <RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
-    <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
-    <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
-    <RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
-    <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
-    <RepositoryBuildOrder Include="Components" Order="17" RootPath="$(RepositoryRoot)src\Components\" />
-    <RepositoryBuildOrder Include="Templating" Order="18" RootPath="$(RepositoryRoot)src\Templating\" />
+    <RepositoryBuildOrder Include="Razor" Order="6" />
+    <RepositoryBuildOrder Include="HttpSysServer" Order="8" />
+    <RepositoryBuildOrder Include="Antiforgery" Order="10" />
+    <RepositoryBuildOrder Include="IISIntegration" Order="10" />
+    <RepositoryBuildOrder Include="StaticFiles" Order="11" />
+    <RepositoryBuildOrder Include="ResponseCaching" Order="11" />
+    <RepositoryBuildOrder Include="Session" Order="11" />
+    <RepositoryBuildOrder Include="ServerTests" Order="11" />
+    <RepositoryBuildOrder Include="CORS" Order="12"  />
+    <RepositoryBuildOrder Include="Routing" Order="12" />
+    <RepositoryBuildOrder Include="Security" Order="13" />
+    <RepositoryBuildOrder Include="MetaPackages" Order="13" />
+    <RepositoryBuildOrder Include="Mvc" Order="14" />
+    <RepositoryBuildOrder Include="AADIntegration" Order="15" />
+    <RepositoryBuildOrder Include="Identity" Order="15" />
+    <RepositoryBuildOrder Include="JavaScriptServices" Order="15" />
+    <RepositoryBuildOrder Include="AzureIntegration" Order="15" />
+    <RepositoryBuildOrder Include="MusicStore" Order="16" />
+    <RepositoryBuildOrder Include="SignalR" Order="16" />
+    <RepositoryBuildOrder Include="AuthSamples" Order="16" />
+    <RepositoryBuildOrder Include="Components" Order="17" />
+    <RepositoryBuildOrder Include="Templating" Order="18" />
   </ItemGroup>
 </Project>
diff --git a/build/repo.props b/build/repo.props
index fa9b0fc87b..a2ae65522d 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -12,7 +12,7 @@
     <SkipTests Condition="'$(CompileOnly)' == 'true'">true</SkipTests>
     <IsFinalBuild Condition="'$(IsFinalBuild)' == ''">false</IsFinalBuild>
 
-    <SubmoduleRoot>$(RepositoryRoot)modules\</SubmoduleRoot>
+    <SubmoduleRoot>$(RepositoryRoot)src\</SubmoduleRoot>
 
     <DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
     <SignedDependencyPackageDir>$(RepositoryRoot).deps\Signed\Packages\</SignedDependencyPackageDir>
diff --git a/build/submodules.props b/build/submodules.props
index 141ee95e5a..e99d2a76da 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -36,32 +36,29 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Repository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
-    <Repository Include="Antiforgery" RootPath="$(RepositoryRoot)src\Antiforgery\" />
-    <Repository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
-    <Repository Include="BasicMiddleware" />
-    <Repository Include="Components" RootPath="$(RepositoryRoot)src\Components\" />
-    <Repository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
-    <Repository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
+    <Repository Include="AADIntegration" />
+    <Repository Include="Antiforgery" />
+    <Repository Include="AzureIntegration" />
+    <Repository Include="Components" />
+    <Repository Include="CORS" />
+    <Repository Include="HttpSysServer" />
     <Repository Include="Identity" />
-    <Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
-    <Repository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
-    <Repository Include="Localization" />
-    <Repository Include="MetaPackages" RootPath="$(RepositoryRoot)src\MetaPackages\" PatchPolicy="CascadeVersions" />
-    <Repository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
-    <Repository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
-    <Repository Include="ResponseCaching" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
-    <Repository Include="Routing" RootPath="$(RepositoryRoot)src\Routing\" />
-    <Repository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
-    <Repository Include="Session" RootPath="$(RepositoryRoot)src\Session\" />
-    <Repository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
-    <Repository Include="StaticFiles" RootPath="$(RepositoryRoot)src\StaticFiles\" />
-    <Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="EntityFrameworkCore" />
+    <Repository Include="IISIntegration" />
+    <Repository Include="JavaScriptServices" />
+    <Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
+    <Repository Include="Mvc" />
+    <Repository Include="Razor" />
+    <Repository Include="ResponseCaching" />
+    <Repository Include="Routing" />
+    <Repository Include="Security" />
+    <Repository Include="Session" />
+    <Repository Include="SignalR" />
+    <Repository Include="StaticFiles" />
+    <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
 
     <!-- Test-only repos -->
-    <Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="MusicStore"  RootPath="$(RepositoryRoot)src\MusicStore\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="ServerTests" RootPath="$(RepositoryRoot)src\ServerTests\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="MusicStore"  PatchPolicy="AlwaysUpdateAndCascadeVersions" />
+    <Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>
 </Project>