Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set pre-net5 win-arm64 to x64 by default #19052

Merged
merged 1 commit into from
Jul 27, 2021
Merged

Conversation

sfoslund
Copy link
Member

Addresses 3rd bullet of #18832

@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@sfoslund
Copy link
Member Author

@dsplaisted @wli3 is there a simple way to test this kind of change?

@@ -137,6 +137,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<DefaultAppHostRuntimeIdentifier Condition="$(DefaultAppHostRuntimeIdentifier.EndsWith('arm64')) and
$(DefaultAppHostRuntimeIdentifier.StartsWith('osx')) and
$([MSBuild]::VersionLessThan('$(_TargetFrameworkVersionWithoutV)', '6.0'))">$(DefaultAppHostRuntimeIdentifier.Replace("arm64", "x64"))</DefaultAppHostRuntimeIdentifier>
<!-- If we are running on win-arm64 and the TFM is < 5.0, we have to use a x64 apphost since there are no win-arm64 apphosts previous to .NET 5.0. -->
Copy link
Member

Choose a reason for hiding this comment

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

Didn't we back port ARM-64 to 3.1?

Copy link
Member

Choose a reason for hiding this comment

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

Not for public consumption.

@sfoslund
Copy link
Member Author

@wli3 I've tested this manually and confirmed no msbuild typos.

@sfoslund
Copy link
Member Author

@wli3 can I get a quick review here?

@sfoslund sfoslund merged commit 0a0901b into dotnet:main Jul 27, 2021
@sfoslund sfoslund deleted the ImplicitRid branch July 27, 2021 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants