Skip to content

Expose the platform directly for apple products - #55381

Merged
radical merged 3 commits into
dotnet:mainfrom
lewing:simulate-work
Jul 12, 2021
Merged

Expose the platform directly for apple products#55381
radical merged 3 commits into
dotnet:mainfrom
lewing:simulate-work

Conversation

@lewing

@lewinglewing commented Jul 9, 2021

Copy link
Copy Markdown
Member

Fixes#54996

Fixes#53579

@lewing

Copy link
Copy Markdown
MemberAuthor

all infrastructure failures

@steveisok
steveisok marked this pull request as ready for review July 12, 2021 02:22
@steveisok

Copy link
Copy Markdown
Member

@rolfbjarne With this change, you'll need to remove the RuntimeConfig imports that are in your WorkloadManifest.targets files. Also, what runtime are we defaulting Xam.Mac to? Same question I asked in #53579 (comment)

@lewing
lewing requested a review from radicalJuly 12, 2021 13:30
<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')">

Copy link
Copy Markdown
MemberAuthor

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?

Copy link
Copy Markdown
Member

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.

@steveisok

Copy link
Copy Markdown
Member

Failure is helix instance not having openssl installed and is unrelated.

@radical
radical merged commit f280419 into dotnet:mainJul 12, 2021

<KnownRuntimePack Remove="Microsoft.NETCore.App" />
<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net6.0"

@akoeplingerakoeplingerJul 13, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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:

<KnownRuntimePackUpdate="Microsoft.NETCore.App"LatestRuntimeFrameworkVersion="$(_MonoWorkloadRuntimePackPackageVersion)"Condition="'%(RuntimePackLabels)' == 'Mono' and '%(TargetFramework)' == 'net$(TargetFrameworkVersion)'"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing

@ghostghost locked as resolved and limited conversation to collaborators Aug 12, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

6 participants

@lewing@steveisok@rolfbjarne@jonathanpeppers@akoeplinger@radical