Skip to content

Commit 55fa5ff

Browse files
Update ConfigureLocalWorkload.targets
1 parent 2ba11d6 commit 55fa5ff

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

build-tools/create-packs/ConfigureLocalWorkload.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,13 @@
9090
Targets="_GenerateXAWorkloadContent"
9191
/>
9292

93-
<GetAndroidWorkloadExtends JsonFilePath="$(_LocalAndroidManifestFolder)WorkloadManifest.json">
93+
<GetAndroidWorkloadExtends Condition="!$([MSBuild]::IsOSPlatform('linux'))" JsonFilePath="$(_LocalAndroidManifestFolder)WorkloadManifest.json">
9494
<Output TaskParameter="ExtendsElement" PropertyName="AndroidWorkloadExtendsElement" />
9595
</GetAndroidWorkloadExtends>
9696

9797
<PropertyGroup>
98+
<!-- Linux can fail to install "microsoft-net-runtime-android-aot" and Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86 -->
99+
<AndroidWorkloadExtendsElement Condition="$([MSBuild]::IsOSPlatform('linux'))">&quot;microsoft-net-runtime-android&quot;</AndroidWorkloadExtendsElement>
98100
<_EmptyWorkloadJsonContent>
99101
<![CDATA[
100102
{"version": "0.0.1", "workloads": { "android-deps": { "extends" : [ $(AndroidWorkloadExtendsElement) ] } } }

0 commit comments

Comments
 (0)