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

Merge branch 'release/7.0.4xx'

Browse source
This commit is contained in:
Jason Zhai 2023-05-11 23:44:52 -07:00
commit 8d2cf17b1c
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -484,7 +484,7 @@
Overwrite="true" /> Overwrite="true" />
</Target> </Target>
<Target Name="CopyIncludedWorkloadManifestFile" > <Target Name="CopyKnownWorkloadManifestFile" >
<ItemGroup> <ItemGroup>
<WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.Identity)', '').ToLower())" /> <WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.Identity)', '').ToLower())" />
@ -492,7 +492,11 @@
<Error Text="No workload manifest content found." Condition="'@(WorkloadManifestFilesContent->Count())' == '0'" /> <Error Text="No workload manifest content found." Condition="'@(WorkloadManifestFilesContent->Count())' == '0'" />
<WriteLinesToFile File="$(SdkOutputDirectory)IncludedWorkloadManifests.txt" <ItemGroup>
<WorkloadManifestFilesContent Include="samsung.net.sdk.tizen" />
</ItemGroup>
<WriteLinesToFile File="$(SdkOutputDirectory)KnownWorkloadManifests.txt"
Lines="@(WorkloadManifestFilesContent)" Lines="@(WorkloadManifestFilesContent)"
Overwrite="true" /> Overwrite="true" />
</Target> </Target>
@ -568,7 +572,7 @@
LayoutBundledComponents; LayoutBundledComponents;
GenerateFullNuGetVersion; GenerateFullNuGetVersion;
GenerateVersionFile; GenerateVersionFile;
CopyIncludedWorkloadManifestFile; CopyKnownWorkloadManifestFile;
GenerateBundledVersions; GenerateBundledVersions;
LayoutRuntimeGraph; LayoutRuntimeGraph;
LayoutTemplates; LayoutTemplates;