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

Revise and consolidate osx-arm64 commits #732

Merged
merged 2 commits into from
Jun 13, 2022
Merged

Revise and consolidate osx-arm64 commits #732

merged 2 commits into from
Jun 13, 2022

Conversation

ldennington
Copy link
Contributor

This change revises the commits from #636 by:

  1. Applying existing fixups.
  2. Consolidating the series of commits to add osx-arm64 support into two commits. The first commit lays the ground work for the changes by updating certain dependencies. The second commit implements osx-arm64 support.

The upcoming specification of a macOS runtime led to the need to update the
Microsoft.NET.Test.Sdk package. The old version, when combined with this
specification, caused dependent packages to be downgraded, which resulted
in NuGet errors. Upgrading to the latest version resolved this issue.
Additionally, Avalonia has been upgraded to the latest version, which was
necessitated by the upcoming changes to support osx-arm64.
@ldennington ldennington requested a review from mjcheetham June 10, 2022 06:46
@ldennington ldennington self-assigned this Jun 10, 2022
@@ -2,7 +2,7 @@
<installer-gui-script minSpecVersion="1">
<title>Git Credential Manager</title>
<background file="background.png" mime-type="image/png" alignment="bottomleft" scaling="tofit" />
<options customize="never" />
<options customize="never" hostArchitectures="x86_64,arm64" />
Copy link
Collaborator

Choose a reason for hiding this comment

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

I realise this was also in the first PR, but is correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mmmm no. Looks like the separate distribution files may have been dropped in the midst of a rebase. I will bring them back.

This comment was marked as off-topic.

@ldennington ldennington marked this pull request as ready for review June 10, 2022 21:53
Add support for building osx-arm64 in addition to osx-x64 to produce
native M1 binaries.
Copy link
Collaborator

@mjcheetham mjcheetham left a comment

Choose a reason for hiding this comment

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

🎉

@ldennington ldennington merged commit 4f2608a into main Jun 13, 2022
@ldennington ldennington mentioned this pull request Jun 15, 2022
@ldennington ldennington deleted the feature/m1 branch October 12, 2022 16:43
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