diff options
| author | Larry Ewing <lewing@microsoft.com> | 2021-07-03 00:28:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 00:28:19 +0300 |
| commit | 770d630b283ec1be4a8ed41ac78e13ec1fd957b1 (patch) | |
| tree | 91c81298539d87fc84799d272d06c61e6ee737a0 | |
| parent | d4baa2bd2b009cdd0886bba925ce32517041bfa0 (diff) | |
Backport #55040 to preview6 (#55091)v6.0.0-preview.6.21352.12
If we don't, then the aot packs will be imported on Windows when running an iOS offline build
Fixes #54944
| -rw-r--r-- | src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets index ca7309a6612..ef66921fc56 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets @@ -20,17 +20,23 @@ <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'ios'"> <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.RuntimeConfigParser.Task" /> + </ImportGroup> + <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'ios' and $([MSBuild]::IsOSPlatform('osx'))"> <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm" /> <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64" /> </ImportGroup> <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'"> <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.RuntimeConfigParser.Task" /> + </ImportGroup> + <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst' and $([MSBuild]::IsOSPlatform('osx'))"> <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst" /> </ImportGroup> <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'tvos'"> <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.RuntimeConfigParser.Task" /> + </ImportGroup> + <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'tvos' and $([MSBuild]::IsOSPlatform('osx'))"> <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64" /> </ImportGroup> |