Skip to content

macOS: Support building on Apple Silicon #322

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.

Sign up for GitHub

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

Merged
edvilme merged 9 commits into from
Jan 31, 2025
Merged

macOS: Support building on Apple Silicon #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c07f5ee
Update sln
edvilme Jan 27, 2025
fd423ab
.csproj add osx-arm64 rid
edvilme Jan 27, 2025
8391d2d
Update ci/cd yaml to support mac arm64
edvilme Jan 27, 2025
4b42d57
Sign for osx-arm64 too
edvilme Jan 27, 2025
6d323e0
Fix typo
edvilme Jan 27, 2025
265112a
Revert ci/cd to test current behavior
edvilme Jan 27, 2025
19c28a7
Test ci/cd
edvilme Jan 28, 2025
73d13f0
Revert to macos-latest
edvilme Jan 28, 2025
5c84ce3
Add mac x64 jobs too
edvilme Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ extends:
artifactName: 'drop-windows'
publishLocation: 'Container'
parallel: true
- job: OSX_latest
displayName: 'Mac OS'
- job: OSX_latest_x64
displayName: 'Mac OS (x64)'
pool:
name: Azure Pipelines
image: 'macOS-latest'
Expand Down Expand Up @@ -158,4 +158,43 @@ extends:
artifactName: 'drop-osx'
publishLocation: 'Container'
parallel: true
- job: OSX_latest_arm64
displayName: 'Mac OS (arm64)'
pool:
name: Azure Pipelines
image: 'macOS-latest'
os: macOS
variables:
- name: _RID
value: osx-arm64
- name: _BuildConfig
value: Release
- name: _SignType
value: none
- name: _DotNetPublishToBlobFeed
value: false
steps:
- checkout: self
clean: true
- script: eng/common/cibuild.sh
--configuration $(_BuildConfig)
--prepareMachine
/p:RID=$(_RID)
displayName: Build
- task: ArchiveFiles@2
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
inputs:
rootFolderOrFile: 'artifacts/layout/dotnet-core-uninstall/'
includeRootFolder: false
archiveType: 'tar'
tarCompression: 'gz'
archiveFile: '$(Build.ArtifactStagingDirectory)/dotnet-core-uninstall.tar.gz'
replaceExistingArchive: true
- task: 1ES.PublishBuildArtifacts@1
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
artifactName: 'drop-osx'
publishLocation: 'Container'
parallel: true

47 changes: 44 additions & 3 deletions .vsts-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,8 @@ stages:
artifactName: 'drop-windows'
publishLocation: 'Container'
parallel: true

- job: OSX_latest
displayName: 'Mac OS'
- job: OSX_latest_x64
displayName: 'Mac OS (x64)'
pool:
vmImage: 'macOS-latest'
strategy:
Expand Down Expand Up @@ -141,6 +140,48 @@ stages:
artifactName: 'drop-osx'
publishLocation: 'Container'
parallel: true
- job: OSX_latest_arm64
displayName: 'Mac OS (arm64)'
pool:
vmImage: 'macOS-latest'
strategy:
matrix:
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
Debug:
_BuildConfig: Debug
_SignType: none
_DotNetPublishToBlobFeed : false
Release:
_BuildConfig: Release
_SignType: none
_DotNetPublishToBlobFeed : false
variables:
- name: _RID
value: osx-arm64
steps:
- checkout: self
clean: true
- script: eng/common/cibuild.sh
--configuration $(_BuildConfig)
--prepareMachine
/p:RID=$(_RID)
displayName: Build
- task: ArchiveFiles@2
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
inputs:
rootFolderOrFile: 'artifacts/layout/dotnet-core-uninstall/'
includeRootFolder: false
archiveType: 'tar'
tarCompression: 'gz'
archiveFile: '$(Build.ArtifactStagingDirectory)/dotnet-core-uninstall.tar.gz'
replaceExistingArchive: true
- task: PublishBuildArtifacts@1
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
inputs:
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
artifactName: 'drop-osx'
publishLocation: 'Container'
parallel: true

- ${{ if eq(variables._RunAsInternal, True) }}:
- template: eng\common\templates\post-build\post-build.yml
Expand Down
2 changes: 1 addition & 1 deletion eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AllowEmptySignList>true</AllowEmptySignList>
</PropertyGroup>

<ItemGroup Condition="'$(RID)' == 'osx-x64'">
<ItemGroup Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'">
<ItemsToSign Include="$(ArtifactsBinDir)/layout/dotnet-core-uninstall/dotnet-core-uninstall" />
</ItemGroup>
</Project>
26 changes: 24 additions & 2 deletions lab.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28621.142
# Visual Studio Version 17
VisualStudioVersion = 17.12.35707.178
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-core-uninstall", "src\dotnet-core-uninstall\dotnet-core-uninstall.csproj", "{0DED2870-9E4C-416F-B83A-01B0D89B25CA}"
EndProject
Expand All @@ -16,69 +16,91 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Debug|ARM64.Build.0 = Debug|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Debug|x64.ActiveCfg = Debug|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Debug|x64.Build.0 = Debug|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Debug|x86.ActiveCfg = Debug|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Debug|x86.Build.0 = Debug|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Release|Any CPU.Build.0 = Release|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Release|ARM64.ActiveCfg = Release|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Release|ARM64.Build.0 = Release|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Release|x64.ActiveCfg = Release|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Release|x64.Build.0 = Release|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Release|x86.ActiveCfg = Release|Any CPU
{0DED2870-9E4C-416F-B83A-01B0D89B25CA}.Release|x86.Build.0 = Release|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Debug|ARM64.Build.0 = Debug|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Debug|x64.ActiveCfg = Debug|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Debug|x64.Build.0 = Debug|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Debug|x86.ActiveCfg = Debug|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Debug|x86.Build.0 = Debug|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Release|Any CPU.Build.0 = Release|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Release|ARM64.ActiveCfg = Release|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Release|ARM64.Build.0 = Release|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Release|x64.ActiveCfg = Release|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Release|x64.Build.0 = Release|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Release|x86.ActiveCfg = Release|Any CPU
{5F533EB4-7C04-4243-914F-7C9092F6FB8F}.Release|x86.Build.0 = Release|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Debug|ARM64.Build.0 = Debug|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Debug|x64.ActiveCfg = Debug|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Debug|x64.Build.0 = Debug|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Debug|x86.ActiveCfg = Debug|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Debug|x86.Build.0 = Debug|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Release|Any CPU.Build.0 = Release|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Release|ARM64.ActiveCfg = Release|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Release|ARM64.Build.0 = Release|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Release|x64.ActiveCfg = Release|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Release|x64.Build.0 = Release|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Release|x86.ActiveCfg = Release|Any CPU
{A7FF737E-4ADE-4B5A-BA1C-3F4B7129590F}.Release|x86.Build.0 = Release|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Debug|ARM64.Build.0 = Debug|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Debug|x64.ActiveCfg = Debug|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Debug|x64.Build.0 = Debug|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Debug|x86.ActiveCfg = Debug|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Debug|x86.Build.0 = Debug|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Release|Any CPU.Build.0 = Release|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Release|ARM64.ActiveCfg = Release|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Release|ARM64.Build.0 = Release|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Release|x64.ActiveCfg = Release|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Release|x64.Build.0 = Release|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Release|x86.ActiveCfg = Release|Any CPU
{9664B2B1-3B5D-4F99-A0D5-B38BF3E96672}.Release|x86.Build.0 = Release|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Debug|ARM64.Build.0 = Debug|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Debug|x64.ActiveCfg = Debug|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Debug|x64.Build.0 = Debug|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Debug|x86.ActiveCfg = Debug|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Debug|x86.Build.0 = Debug|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Release|Any CPU.Build.0 = Release|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Release|ARM64.ActiveCfg = Release|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Release|ARM64.Build.0 = Release|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Release|x64.ActiveCfg = Release|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Release|x64.Build.0 = Release|Any CPU
{9D9C4522-1992-4820-9248-9630C38FC25E}.Release|x86.ActiveCfg = Release|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-core-uninstall/dotnet-core-uninstall.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>dotnet-core-uninstall</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win-x86;osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x86;osx-x64;osx-arm64</RuntimeIdentifiers>
<SignAssembly>true</SignAssembly>
<TargetFramework>net8.0</TargetFramework>
<RollForward>LatestMajor</RollForward>
Expand Down