Remove DataProtection submodule and update path to DP source code to local folder

This commit is contained in:
Nate McMaster 2018-10-15 09:46:20 -07:00
parent c355f10074
commit 4dfd351c84
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
6 changed files with 18 additions and 9 deletions

4
.gitmodules vendored
View File

@ -38,10 +38,6 @@
path = modules/CORS
url = https://github.com/aspnet/CORS.git
branch = release/2.1
[submodule "modules/DataProtection"]
path = modules/DataProtection
url = https://github.com/aspnet/DataProtection.git
branch = release/2.1
[submodule "modules/DependencyInjection"]
path = modules/DependencyInjection
url = https://github.com/aspnet/DependencyInjection.git

View File

@ -11,6 +11,9 @@
<Target Name="GetRepoBatches" DependsOnTargets="GeneratePropsFiles;ComputeGraph">
<ItemGroup>
<RepositoryBuildOrder Condition="'%(RootPath)' == ''">
<RootPath>$(SubmoduleRoot)%(Identity)\</RootPath>
</RepositoryBuildOrder>
<BatchedRepository Include="$(MSBuildProjectFullPath)">
<BuildGroup>%(RepositoryBuildOrder.Order)</BuildGroup>
<Repository>%(RepositoryBuildOrder.Identity)</Repository>

View File

@ -1,4 +1,11 @@
<Project>
<ItemDefinitionGroup>
<RepositoryBuildOrder>
<Order></Order>
<RootPath></RootPath>
</RepositoryBuildOrder>
</ItemDefinitionGroup>
<ItemGroup>
<RepositoryBuildOrder Include="Common" Order="1" />
<RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" />
@ -17,7 +24,7 @@
<RepositoryBuildOrder Include="HttpAbstractions" Order="6" />
<RepositoryBuildOrder Include="HttpClientFactory" Order="6" />
<RepositoryBuildOrder Include="Hosting" Order="7" />
<RepositoryBuildOrder Include="DataProtection" Order="8" />
<RepositoryBuildOrder Include="DataProtection" Order="8" RootPath="$(RepositoryRoot)src\DataProtection\" />
<RepositoryBuildOrder Include="KestrelHttpServer" Order="8" />
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
<RepositoryBuildOrder Include="HttpSysServer" Order="8" />
@ -47,7 +54,5 @@
<RepositoryBuildOrder Include="SignalR" Order="16" />
<RepositoryBuildOrder Include="AuthSamples" Order="16" />
<RepositoryBuildOrder Include="Templating" Order="17" />
<RepositoryBuildOrder Update="@(RepositoryBuildOrder)" RootPath="$(SubmoduleRoot)%(Identity)" />
</ItemGroup>
</Project>

View File

@ -57,7 +57,7 @@
<ShippedRepository Include="Caching" />
<ShippedRepository Include="Configuration" />
<ShippedRepository Include="CORS" />
<ShippedRepository Include="DataProtection" />
<ShippedRepository Include="DataProtection" RootPath="$(RepositoryRoot)src\DataProtection\" />
<ShippedRepository Include="DependencyInjection" />
<ShippedRepository Include="Diagnostics" />
<ShippedRepository Include="DotNetTools" />

@ -1 +0,0 @@
Subproject commit b62bb5778be59cbde9b2e6bbdef20f40eef42355

View File

@ -0,0 +1,6 @@
<Project>
<PropertyGroup>
<!-- TODO: temporary while we reorganize source code and refactor dependency management -->
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
</PropertyGroup>
</Project>