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

Merge pull request #10827 from sfoslund/MergePrev5ToMain

Browse source 
Merge 6.0.1xx prev 5 to main
This commit is contained in:
William Li 2021-06-02 10:33:15 -07:00 • committed by GitHub
commit 2b22923a51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/redist/targets/BundledManifests.targets
View file

@ -68,11 +68,11 @@
<ItemGroup> <ItemGroup>
<ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\data\**\*" <ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\data\**\*"
Condition="Exists('%(RestoredNupkgContentPath)\data')" Condition="Exists('%(RestoredNupkgContentPath)\data')"
DestinationPath="%(WorkloadManifestId)/"/> DestinationPath="$([MSBuild]::ValueOrDefault('%(WorkloadManifestId)', '').ToLower())/"/>
<ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\**\*.json;%(BundledManifests.RestoredNupkgContentPath)\**\*.targets" <ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\**\*.json;%(BundledManifests.RestoredNupkgContentPath)\**\*.targets"
Condition="!Exists('%(BundledManifests.RestoredNupkgContentPath)\data')" Condition="!Exists('%(BundledManifests.RestoredNupkgContentPath)\data')"
DestinationPath="%(BundledManifests.WorkloadManifestId)/"/> DestinationPath="$([MSBuild]::ValueOrDefault('%(BundledManifests.WorkloadManifestId)', '').ToLower())/"/>
</ItemGroup> </ItemGroup>
<Error Text="No workload manifest content found." Condition="'@(ManifestContent->Count())' == '0'" /> <Error Text="No workload manifest content found." Condition="'@(ManifestContent->Count())' == '0'" />