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

Update manifest installer authoring to allow for data dir

Browse source
This commit is contained in:
Sarah Oslund 2021-04-22 14:36:56 -07:00
parent c1eb61ac81
commit 4c69c5cf5d
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> </PropertyGroup>
<!-- Workload manifest package versions --> <!-- Workload manifest package versions -->
<PropertyGroup> <PropertyGroup>
<XamarinAndroidWorkloadManifestVersion>11.0.200-preview.3.196</XamarinAndroidWorkloadManifestVersion> <XamarinAndroidWorkloadManifestVersion>11.0.200-ci.main.226</XamarinAndroidWorkloadManifestVersion>
<XamarinIOSWorkloadManifestVersion>14.4.100-preview.3.1326</XamarinIOSWorkloadManifestVersion> <XamarinIOSWorkloadManifestVersion>14.5.100-ci.main.618</XamarinIOSWorkloadManifestVersion>
<XamarinMacCatalystWorkloadManifestVersion>14.3.100-preview.3.471</XamarinMacCatalystWorkloadManifestVersion> <XamarinMacCatalystWorkloadManifestVersion>14.5.100-ci.main.618</XamarinMacCatalystWorkloadManifestVersion>
<XamarinMacOSWorkloadManifestVersion>11.1.100-preview.3.1379</XamarinMacOSWorkloadManifestVersion> <XamarinMacOSWorkloadManifestVersion>11.3.100-ci.main.618</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>14.3.100-preview.3.1379</XamarinTvOSWorkloadManifestVersion> <XamarinTvOSWorkloadManifestVersion>14.5.100-ci.main.618</XamarinTvOSWorkloadManifestVersion>
<BlazorWorkloadManifestVersion>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</BlazorWorkloadManifestVersion> <BlazorWorkloadManifestVersion>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</BlazorWorkloadManifestVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

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

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