From 69534b5687c6e7ad763b0717d60e68137bddac2f Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Mon, 19 Nov 2018 11:18:31 -0800
Subject: [PATCH] Fix AzureIntegration submodule
---
.gitmodules | 4 ----
build/buildorder.props | 2 +-
build/submodules.props | 2 +-
modules/AzureIntegration | 1 -
4 files changed, 2 insertions(+), 7 deletions(-)
delete mode 160000 modules/AzureIntegration
diff --git a/.gitmodules b/.gitmodules
index afd606d0124..c0b6f213340 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
path = modules/Antiforgery
url = https://github.com/aspnet/Antiforgery.git
branch = release/2.1
-[submodule "modules/AzureIntegration"]
- path = modules/AzureIntegration
- url = https://github.com/aspnet/AzureIntegration.git
- branch = release/2.1
[submodule "modules/BasicMiddleware"]
path = modules/BasicMiddleware
url = https://github.com/aspnet/BasicMiddleware.git
diff --git a/build/buildorder.props b/build/buildorder.props
index 1bacc3f869f..d6349662b5e 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -33,7 +33,7 @@
<RepositoryBuildOrder Include="JavaScriptServices" Order="15" />
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" />
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
- <RepositoryBuildOrder Include="AzureIntegration" Order="15" />
+ <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
<RepositoryBuildOrder Include="SignalR" Order="16" />
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
diff --git a/build/submodules.props b/build/submodules.props
index cd47e1b33aa..187738b4e0a 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -50,7 +50,7 @@
<ItemGroup>
<ShippedRepository Include="AADIntegration" />
<ShippedRepository Include="Antiforgery" />
- <ShippedRepository Include="AzureIntegration" />
+ <ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<ShippedRepository Include="BasicMiddleware" />
<ShippedRepository Include="BrowserLink" />
<ShippedRepository Include="CORS" />
diff --git a/modules/AzureIntegration b/modules/AzureIntegration
deleted file mode 160000
index 47e2ba37554..00000000000
--- a/modules/AzureIntegration
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 47e2ba3755450c584990480c23331d286ffa78cf
--
GitLab