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

Add PlatformManifest to runtime package (#11046)

This commit is contained in:
John Luo 2019-06-11 12:46:01 -07:00 committed by GitHub
parent 40f0c28261
commit 7a8487e2bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Framework/Directory.Build.props
View File

@ -2,6 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup> <PropertyGroup>
<ManifestsPackagePath>data/</ManifestsPackagePath>
<!-- Shared between targeting pack and runtime build. --> <!-- Shared between targeting pack and runtime build. -->
<PlatformManifestFileName>PlatformManifest.txt</PlatformManifestFileName> <PlatformManifestFileName>PlatformManifest.txt</PlatformManifestFileName>
<PlatformManifestOutputPath>$(ArtifactsObjDir)$(PlatformManifestFileName)</PlatformManifestOutputPath> <PlatformManifestOutputPath>$(ArtifactsObjDir)$(PlatformManifestFileName)</PlatformManifestOutputPath>

1
src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
View File

@ -33,7 +33,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<IsProjectReferenceProvider>false</IsProjectReferenceProvider> <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
<PackageConflictManifestFileName>PackageOverrides.txt</PackageConflictManifestFileName> <PackageConflictManifestFileName>PackageOverrides.txt</PackageConflictManifestFileName>
<ManifestsPackagePath>data/</ManifestsPackagePath>
<!-- Reference implementation assemblies in addition to ref assemblies to get xml docs --> <!-- Reference implementation assemblies in addition to ref assemblies to get xml docs -->
<ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies> <ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies>

12
src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
View File

@ -265,11 +265,21 @@ This package is an internal implementation of the .NET Core SDK and is not meant
BeforeTargets="_GetPackageFiles;GenerateNuspec" BeforeTargets="_GetPackageFiles;GenerateNuspec"
DependsOnTargets="ResolveReferences"> DependsOnTargets="ResolveReferences">
<ItemGroup> <ItemGroup>
<!-- Native files are included in _PackageFile instead because they belong in a separate package folder.r --> <!-- Native files are included in _PackageFile instead because they belong in a separate package folder. -->
<Content Include="@(ReferenceCopyLocalPaths)" PackagePath="$(NativeAssetsPackagePath)" Condition=" '%(ReferenceCopyLocalPaths.IsNativeImage)' == 'true' AND '%(ReferenceCopyLocalPaths.Extension)' != '.pdb' " /> <Content Include="@(ReferenceCopyLocalPaths)" PackagePath="$(NativeAssetsPackagePath)" Condition=" '%(ReferenceCopyLocalPaths.IsNativeImage)' == 'true' AND '%(ReferenceCopyLocalPaths.Extension)' != '.pdb' " />
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target Name="_ResolveRuntimePackContent"
BeforeTargets="_GetPackageFiles"
DependsOnTargets="GenerateSharedFxDepsFile">
<ItemGroup>
<RuntimePackContent Include="$(PlatformManifestOutputPath)" PackagePath="$(ManifestsPackagePath)" />
<_PackageFiles Include="@(RuntimePackContent)" />
</ItemGroup>
</Target>
<!-- <!--
############################################## ##############################################
Targets related to crossgen Targets related to crossgen