Expose the platform directly for apple products #55381
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <RuntimePackInWorkloadVersion>${PackageVersion}</RuntimePackInWorkloadVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' AND '$(UsingBrowserRuntimeWorkload)' == ''"> | ||
| <UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true</UsingBrowserRuntimeWorkload> | ||
| <UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload)</UsingBrowserRuntimeWorkload> | ||
|
|
@@ -21,31 +24,47 @@ | |
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64" /> | ||
| </ImportGroup> | ||
|
|
||
| <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'macOS'"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| </ImportGroup> | ||
| <!-- | ||
| <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'macOS' and $([MSBuild]::IsOSPlatform('osx'))"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.osx-arm64" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.osx-x64" /> | ||
| </ImportGroup> | ||
| --> | ||
|
|
||
| <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'ios'"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| </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" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86" /> | ||
| </ImportGroup> | ||
|
|
||
| <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst' and $([MSBuild]::IsOSPlatform('osx'))"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64" /> | ||
| </ImportGroup> | ||
|
|
||
| <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'tvos'"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'tvos' and $([MSBuild]::IsOSPlatform('osx'))"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64" /> | ||
| </ImportGroup> | ||
|
|
||
| <ImportGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
|
|
@@ -54,4 +73,43 @@ | |
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" /> | ||
| </ImportGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(TargetPlatformIdentifier)' == 'android' or '$(TargetPlatformIdentifier)' == 'macOS' or '$(TargetPlatformIdentifier)' == 'ios' or '$(TargetPlatformIdentifier)' == 'maccatalyst' or '$(TargetPlatformIdentifier)' == 'tvos' or ('$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true')"> | ||
| <_MonoWorkloadTargetsMobile>true</_MonoWorkloadTargetsMobile> | ||
| <_MonoWorkloadRuntimePackPackageVersion>$(RuntimePackInWorkloadVersion)</_MonoWorkloadRuntimePackPackageVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition="'$(_MonoWorkloadTargetsMobile)' == 'true'"> | ||
| <MonoRuntimePackRids Include=" | ||
| linux-x64; | ||
| win-x64; | ||
| osx-x64; | ||
| osx-arm64; | ||
| maccatalyst-x64; | ||
| maccatalyst-arm64; | ||
| browser-wasm; | ||
| ios-arm64; | ||
| ios-arm; | ||
| iossimulator-arm64; | ||
| iossimulator-x64; | ||
| iossimulator-x86; | ||
| tvos-arm64; | ||
| tvossimulator-arm64; | ||
| tvossimulator-x64; | ||
| android-arm64; | ||
| android-arm; | ||
| android-x64; | ||
| android-x86; | ||
| " /> | ||
|
|
||
| <KnownRuntimePack Remove="Microsoft.NETCore.App" /> | ||
| <KnownRuntimePack Include="Microsoft.NETCore.App" | ||
| TargetFramework="net6.0" | ||
|
There was a problem hiding this comment. @lewing @steveisok while this works for now, it'll break once we move to <KnownRuntimePack Update="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(_MonoWorkloadRuntimePackPackageVersion)"
Condition="'%(RuntimePackLabels)' == 'Mono' and '%(TargetFramework)' == 'net$(TargetFrameworkVersion)'" |
||
| RuntimeFrameworkName="Microsoft.NETCore.App" | ||
| LatestRuntimeFrameworkVersion="$(_MonoWorkloadRuntimePackPackageVersion)" | ||
| RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**" | ||
| RuntimePackRuntimeIdentifiers="@(MonoRuntimePackRids, '%3B')" | ||
| RuntimePackLabels="Mono" | ||
| /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this a strict enough check on macOS?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought it wasn't at first, but I believe macOS is the TFM for xam.mac. So, we wouldn't be interfering w/ anything else.