Merge remote-tracking branch 'upstream/release/6.0.1xx' into Merge6

This commit is contained in:
Sarah Oslund 2021-08-23 11:07:33 -07:00
commit f70ede1413

View file

@ -446,6 +446,15 @@
Overwrite="true" />
</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">
<PropertyGroup>
@ -510,6 +519,7 @@
LayoutBundledComponents;
GenerateFullNuGetVersion;
GenerateVersionFile;
CopyIncludedWorkloadManifestFile;
GenerateBundledVersions;
LayoutRuntimeGraph;
LayoutTemplates;