Skip to content
代码片段 群组 项目
未验证 提交 4dfd351c 编辑于 作者: Nate McMaster's avatar Nate McMaster
浏览文件

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

上级 c355f100
No related branches found
No related tags found
无相关合并请求
...@@ -38,10 +38,6 @@ ...@@ -38,10 +38,6 @@
path = modules/CORS path = modules/CORS
url = https://github.com/aspnet/CORS.git url = https://github.com/aspnet/CORS.git
branch = release/2.1 branch = release/2.1
[submodule "modules/DataProtection"]
path = modules/DataProtection
url = https://github.com/aspnet/DataProtection.git
branch = release/2.1
[submodule "modules/DependencyInjection"] [submodule "modules/DependencyInjection"]
path = modules/DependencyInjection path = modules/DependencyInjection
url = https://github.com/aspnet/DependencyInjection.git url = https://github.com/aspnet/DependencyInjection.git
......
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
<Target Name="GetRepoBatches" DependsOnTargets="GeneratePropsFiles;ComputeGraph"> <Target Name="GetRepoBatches" DependsOnTargets="GeneratePropsFiles;ComputeGraph">
<ItemGroup> <ItemGroup>
<RepositoryBuildOrder Condition="'%(RootPath)' == ''">
<RootPath>$(SubmoduleRoot)%(Identity)\</RootPath>
</RepositoryBuildOrder>
<BatchedRepository Include="$(MSBuildProjectFullPath)"> <BatchedRepository Include="$(MSBuildProjectFullPath)">
<BuildGroup>%(RepositoryBuildOrder.Order)</BuildGroup> <BuildGroup>%(RepositoryBuildOrder.Order)</BuildGroup>
<Repository>%(RepositoryBuildOrder.Identity)</Repository> <Repository>%(RepositoryBuildOrder.Identity)</Repository>
......
<Project> <Project>
<ItemDefinitionGroup>
<RepositoryBuildOrder>
<Order></Order>
<RootPath></RootPath>
</RepositoryBuildOrder>
</ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<RepositoryBuildOrder Include="Common" Order="1" /> <RepositoryBuildOrder Include="Common" Order="1" />
<RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" /> <RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" />
...@@ -17,7 +24,7 @@ ...@@ -17,7 +24,7 @@
<RepositoryBuildOrder Include="HttpAbstractions" Order="6" /> <RepositoryBuildOrder Include="HttpAbstractions" Order="6" />
<RepositoryBuildOrder Include="HttpClientFactory" Order="6" /> <RepositoryBuildOrder Include="HttpClientFactory" Order="6" />
<RepositoryBuildOrder Include="Hosting" Order="7" /> <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="KestrelHttpServer" Order="8" />
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" /> <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
<RepositoryBuildOrder Include="HttpSysServer" Order="8" /> <RepositoryBuildOrder Include="HttpSysServer" Order="8" />
...@@ -47,7 +54,5 @@ ...@@ -47,7 +54,5 @@
<RepositoryBuildOrder Include="SignalR" Order="16" /> <RepositoryBuildOrder Include="SignalR" Order="16" />
<RepositoryBuildOrder Include="AuthSamples" Order="16" /> <RepositoryBuildOrder Include="AuthSamples" Order="16" />
<RepositoryBuildOrder Include="Templating" Order="17" /> <RepositoryBuildOrder Include="Templating" Order="17" />
<RepositoryBuildOrder Update="@(RepositoryBuildOrder)" RootPath="$(SubmoduleRoot)%(Identity)" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<ShippedRepository Include="Caching" /> <ShippedRepository Include="Caching" />
<ShippedRepository Include="Configuration" /> <ShippedRepository Include="Configuration" />
<ShippedRepository Include="CORS" /> <ShippedRepository Include="CORS" />
<ShippedRepository Include="DataProtection" /> <ShippedRepository Include="DataProtection" RootPath="$(RepositoryRoot)src\DataProtection\" />
<ShippedRepository Include="DependencyInjection" /> <ShippedRepository Include="DependencyInjection" />
<ShippedRepository Include="Diagnostics" /> <ShippedRepository Include="Diagnostics" />
<ShippedRepository Include="DotNetTools" /> <ShippedRepository Include="DotNetTools" />
......
Subproject commit b62bb5778be59cbde9b2e6bbdef20f40eef42355
<Project>
<PropertyGroup>
<!-- TODO: temporary while we reorganize source code and refactor dependency management -->
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
</PropertyGroup>
</Project>
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册