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

Merge pull request #11645 from sfoslund/Merge6

Browse source 
Merge release/6.0.1xx into main
This commit is contained in:
Marc Paine 2021-08-24 10:34:40 -07:00 • committed by GitHub
commit d8fbbf4740
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -446,6 +446,15 @@
Overwrite="true" /> Overwrite="true" />
</Target> </Target>
<Target Name="CopyIncludedWorkloadManifestFile" >
<ItemGroup>
<WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.WorkloadManifestId)', '').ToLower())" />
</ItemGroup>
<WriteLinesToFile File="$(SdkOutputDirectory)IncludedWorkloadManifests.txt"
Lines="@(WorkloadManifestFilesContent)"
Overwrite="true" />
</Target>
<Target Name="LayoutAppHostTemplate" DependsOnTargets="RunResolvePackageDependencies"> <Target Name="LayoutAppHostTemplate" DependsOnTargets="RunResolvePackageDependencies">
<PropertyGroup> <PropertyGroup>
@ -510,6 +519,7 @@
LayoutBundledComponents; LayoutBundledComponents;
GenerateFullNuGetVersion; GenerateFullNuGetVersion;
GenerateVersionFile; GenerateVersionFile;
CopyIncludedWorkloadManifestFile;
GenerateBundledVersions; GenerateBundledVersions;
LayoutRuntimeGraph; LayoutRuntimeGraph;
LayoutTemplates; LayoutTemplates;