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

[automated] Merge branch 'release/7.0.4xx' => 'main' (#16374)

Browse source
This commit is contained in:
Marc Paine 2023-05-12 12:57:01 -07:00 • committed by GitHub
commit 7a6028679a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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" />
</Target>
<Target Name="CopyIncludedWorkloadManifestFile" >
<Target Name="CopyKnownWorkloadManifestFile" >
<ItemGroup>
<WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.Identity)', '').ToLower())" />
@ -492,7 +492,11 @@
<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)"
Overwrite="true" />
</Target>
@ -568,7 +572,7 @@
LayoutBundledComponents;
GenerateFullNuGetVersion;
GenerateVersionFile;
CopyIncludedWorkloadManifestFile;
CopyKnownWorkloadManifestFile;
GenerateBundledVersions;
LayoutRuntimeGraph;
LayoutTemplates;