mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #239 from dsplaisted/include-runtime-graph

Browse source 
Bundle runtime graph file in SDK
This commit is contained in:
Daniel Plaisted 2019-01-03 16:35:03 -08:00 committed by GitHub
commit e46d7b966e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/redist/redist.csproj
View file

@ -3,8 +3,16 @@
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework> <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory> <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<!-- Explicitlty reference Microsoft.NETCore.App package here, using the version from Version.props, instead
of the version from the stage 0 SDK. -->
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)"
PrivateAssets="All" Publish="true"/>
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="targets\DownloadPackage.csproj" /> <None Include="targets\DownloadPackage.csproj" />
<None Include="targets\LayoutTool.csproj" /> <None Include="targets\LayoutTool.csproj" />

10
src/redist/targets/GenerateBundledVersions.targets
View file

@ -168,6 +168,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<BundledNETStandardTargetFrameworkVersion>$(_NETStandardTargetFrameworkVersion)</BundledNETStandardTargetFrameworkVersion> <BundledNETStandardTargetFrameworkVersion>$(_NETStandardTargetFrameworkVersion)</BundledNETStandardTargetFrameworkVersion>
<BundledNETStandardPackageVersion>$(_NETStandardLibraryPackageVersion)</BundledNETStandardPackageVersion> <BundledNETStandardPackageVersion>$(_NETStandardLibraryPackageVersion)</BundledNETStandardPackageVersion>
<BundledNETCorePlatformsPackageVersion>$(_NETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion> <BundledNETCorePlatformsPackageVersion>$(_NETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
<BundledRuntimeIdentifierGraphFile>%24(MSBuildThisFileDirectory)RuntimeIdentifierGraph.json</BundledRuntimeIdentifierGraphFile>
@(BundledVersionsVariable->'<%(Identity)>%(Value)</%(Identity)>', ' @(BundledVersionsVariable->'<%(Identity)>%(Value)</%(Identity)>', '
') ')
<NETCoreSdkVersion>$(SdkVersion)</NETCoreSdkVersion> <NETCoreSdkVersion>$(SdkVersion)</NETCoreSdkVersion>
@ -269,4 +270,13 @@ Copyright (c) .NET Foundation. All rights reserved.
Lines="$(BundledBundledCliToolsPropsContent)" Lines="$(BundledBundledCliToolsPropsContent)"
Overwrite="true" /> Overwrite="true" />
</Target> </Target>
<Target Name="LayoutRuntimeGraph"
DependsOnTargets="GenerateBundledVersionsProps">
<Copy SourceFiles="$(NuGetPackageRoot)/microsoft.netcore.platforms/$(_NETCorePlatformsPackageVersion)/runtime.json"
DestinationFiles="$(SdkOutputDirectory)RuntimeIdentifierGraph.json"
SkipUnchangedFiles="true"/>
</Target>
</Project> </Project>

1
src/redist/targets/GenerateLayout.targets
View file

@ -288,6 +288,7 @@
ExtractBundledComponents; ExtractBundledComponents;
GenerateVersionFile; GenerateVersionFile;
GenerateBundledVersions; GenerateBundledVersions;
LayoutRuntimeGraph;
LayoutTemplates; LayoutTemplates;
LayoutBundledTools; LayoutBundledTools;
RetargetTools; RetargetTools;