diff options
| -rw-r--r-- | .gitmodules | 12 | ||||
| -rw-r--r-- | build/buildorder.props | 6 | ||||
| -rw-r--r-- | build/submodules.props | 6 | ||||
| m--------- | modules/AADIntegration | 26 | ||||
| m--------- | modules/JavaScriptServices | 26 | ||||
| m--------- | modules/MetaPackages | 22 |
6 files changed, 6 insertions, 92 deletions
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 -Subproject 6f02048c3c5c0ee6684c241721422c2b8eebddb diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices deleted file mode 160000 -Subproject ea3a7bc8974271d6e9eeb9e890f23f953b8b40e diff --git a/modules/MetaPackages b/modules/MetaPackages deleted file mode 160000 -Subproject 975011071b02f6937261c604fcde48d7e43030c |