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

Merge pull request #10302 from sfoslund/NewManifestFormat

Browse source 
Update manifest installer authoring to allow for data dir
This commit is contained in:
Sarah Oslund 2021-04-26 16:02:56 -07:00 committed by GitHub
commit 2420952a67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eng/Versions.props
View file

@ -146,11 +146,11 @@
</PropertyGroup>
<!-- Workload manifest package versions -->
<PropertyGroup>
<XamarinAndroidWorkloadManifestVersion>11.0.200-preview.3.196</XamarinAndroidWorkloadManifestVersion>
<XamarinIOSWorkloadManifestVersion>14.4.100-preview.3.1326</XamarinIOSWorkloadManifestVersion>
<XamarinMacCatalystWorkloadManifestVersion>14.3.100-preview.3.471</XamarinMacCatalystWorkloadManifestVersion>
<XamarinMacOSWorkloadManifestVersion>11.1.100-preview.3.1379</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>14.3.100-preview.3.1379</XamarinTvOSWorkloadManifestVersion>
<XamarinAndroidWorkloadManifestVersion>11.0.200-preview.4.232</XamarinAndroidWorkloadManifestVersion>
<XamarinIOSWorkloadManifestVersion>14.5.100-preview.4.623</XamarinIOSWorkloadManifestVersion>
<XamarinMacCatalystWorkloadManifestVersion>14.5.100-preview.4.623</XamarinMacCatalystWorkloadManifestVersion>
<XamarinMacOSWorkloadManifestVersion>11.3.100-preview.4.623</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>14.5.100-preview.4.623</XamarinTvOSWorkloadManifestVersion>
<BlazorWorkloadManifestVersion>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</BlazorWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup>

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

@ -66,8 +66,13 @@
</GenerateGuidFromName>
<ItemGroup>
<ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\**\*.json;%(BundledManifests.RestoredNupkgContentPath)\**\*.targets"
<ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\data\**\*"
Condition="Exists('%(RestoredNupkgContentPath)\data')"
DestinationPath="%(WorkloadManifestId)/"/>
<ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\**\*.json;%(BundledManifests.RestoredNupkgContentPath)\**\*.targets"
Condition="!Exists('%(BundledManifests.RestoredNupkgContentPath)\data')"
DestinationPath="%(BundledManifests.WorkloadManifestId)/"/>
</ItemGroup>
<Error Text="No workload manifest content found." Condition="'@(ManifestContent->Count())' == '0'" />