huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove cyclic dependency on self

This commit is contained in:
John Luo 2017-04-24 17:11:43 -07:00
parent c77f7b7c77
commit 8d1ac47d9f
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/common.props
View File

@ -46,8 +46,6 @@
<ItemGroup> <ItemGroup>
<FullMetaPackagePackageReference Include="@(MetaPackagePackageReference)" /> <FullMetaPackagePackageReference Include="@(MetaPackagePackageReference)" />
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
@ -174,6 +172,10 @@
<FullMetaPackagePackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<FullMetaPackageProjectReference Include="../Microsoft.AspNetCore/Microsoft.AspNetCore.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<RuntimeStorePackageReference Include="@(FullMetaPackagePackageReference)" /> <RuntimeStorePackageReference Include="@(FullMetaPackagePackageReference)" />
<RuntimeStorePackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <RuntimeStorePackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
@ -181,4 +183,8 @@
<RuntimeStorePackageReference Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <RuntimeStorePackageReference Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<RuntimeStorePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <RuntimeStorePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<RuntimeStoreProjectReference Include="@(FullMetaPackageProjectReference)" />
</ItemGroup>
</Project> </Project>

2
src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
View File

@ -12,7 +12,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="@(FullMetaPackagePackageReference)" /> <PackageReference Include="@(FullMetaPackagePackageReference)" />
<ProjectReference Include="@(FullMetaPackageProjectReference)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="build\**\*.xml" PackagePath="%(Identity)" /> <Content Include="build\**\*.xml" PackagePath="%(Identity)" />
<Content Include="build\**\*.targets" PackagePath="%(Identity)" /> <Content Include="build\**\*.targets" PackagePath="%(Identity)" />

1
src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj
View File

@ -8,6 +8,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="@(RuntimeStorePackageReference)" /> <PackageReference Include="@(RuntimeStorePackageReference)" />
<ProjectReference Include="@(RuntimeStoreProjectReference)" />
</ItemGroup> </ItemGroup>
<Target Name="CollectDeps" DependsOnTargets="Restore;RunResolvePackageDependencies"> <Target Name="CollectDeps" DependsOnTargets="Restore;RunResolvePackageDependencies">