Expose the platform directly for apple products #55381
Merged
Conversation
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
steveisok
reviewed
Jul 9, 2021
src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets
Outdated
Show resolved
Hide resolved
|
all infrastructure failures |
…acos runtime packs & cleaned up a few errors
|
@rolfbjarne With this change, you'll need to remove the RuntimeConfig imports that are in your |
rolfbjarne
approved these changes
Jul 12, 2021
jonathanpeppers
approved these changes
Jul 12, 2021
lewing
commented
Jul 12, 2021
| @@ -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')"> | |||
There was a problem hiding this comment.
Is this a strict enough check on macOS?
There was a problem hiding this comment.
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.
|
Failure is helix instance not having openssl installed and is unrelated. |
akoeplinger
reviewed
Jul 13, 2021
|
|
||
| <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 net7.0. Can you try whether doing this instead of the Remove works:
<KnownRuntimePack Update="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(_MonoWorkloadRuntimePackPackageVersion)"
Condition="'%(RuntimePackLabels)' == 'Mono' and '%(TargetFramework)' == 'net$(TargetFrameworkVersion)'"
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #54996
Fixes #53579