From c07f5ee8f9b40a46fec3865829f7cdd7d836539c Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 27 Jan 2025 13:46:32 -0800 Subject: [PATCH 1/9] Update sln --- lab.sln | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/lab.sln b/lab.sln index 6ef92d55..cfe40288 100644 --- a/lab.sln +++ b/lab.sln @@ -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 @@ -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 From fd423ab8ada09de204ebd20a816b0def395bc525 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 27 Jan 2025 13:48:53 -0800 Subject: [PATCH 2/9] .csproj add osx-arm64 rid --- src/dotnet-core-uninstall/dotnet-core-uninstall.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj index eeec6461..d93568d9 100644 --- a/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj +++ b/src/dotnet-core-uninstall/dotnet-core-uninstall.csproj @@ -2,7 +2,7 @@ dotnet-core-uninstall Exe - win-x86;osx-x64 + win-x86;osx-x64;osx-arm64 true net8.0 LatestMajor From 8391d2d84e58c99ca8e2ef8ee0cccb562d1f2b44 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 27 Jan 2025 14:08:21 -0800 Subject: [PATCH 3/9] Update ci/cd yaml to support mac arm64 --- .vsts-ci.yml | 2 +- .vsts-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b9a06ff9..949bf751 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -127,7 +127,7 @@ extends: os: macOS variables: - name: _RID - value: osx-x64 + value: osx-arm64 - name: _BuildConfig value: Release - name: _SignType diff --git a/.vsts-pr.yml b/.vsts-pr.yml index dfabd98d..3867f79f 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -116,7 +116,7 @@ stages: _DotNetPublishToBlobFeed : false variables: - name: _RID - value: osx-x64 + value: arm64 steps: - checkout: self clean: true From 4b42d570fcfa881f93f29c3e91f40dbd0a0e0890 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 27 Jan 2025 14:22:01 -0800 Subject: [PATCH 4/9] Sign for osx-arm64 too --- eng/Signing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index 60562050..6816c261 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -7,7 +7,7 @@ true - + From 6d323e0f79ff146890c011105a20f8d085e0b348 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 27 Jan 2025 14:42:48 -0800 Subject: [PATCH 5/9] Fix typo --- eng/Signing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index 6816c261..8c58f1f0 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -7,7 +7,7 @@ true - + From 265112abe66ec401313b397094079e1e150e5e02 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 27 Jan 2025 14:59:58 -0800 Subject: [PATCH 6/9] Revert ci/cd to test current behavior --- .vsts-ci.yml | 2 +- .vsts-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 949bf751..b9a06ff9 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -127,7 +127,7 @@ extends: os: macOS variables: - name: _RID - value: osx-arm64 + value: osx-x64 - name: _BuildConfig value: Release - name: _SignType diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 3867f79f..dfabd98d 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -116,7 +116,7 @@ stages: _DotNetPublishToBlobFeed : false variables: - name: _RID - value: arm64 + value: osx-x64 steps: - checkout: self clean: true From 19c28a75bd62fed75243188b33c7b38a3049d5c2 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 28 Jan 2025 09:12:06 -0800 Subject: [PATCH 7/9] Test ci/cd --- .vsts-ci.yml | 4 ++-- .vsts-pr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b9a06ff9..42321e27 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -123,11 +123,11 @@ extends: displayName: 'Mac OS' pool: name: Azure Pipelines - image: 'macOS-latest' + image: 'macOS-14-arm64' os: macOS variables: - name: _RID - value: osx-x64 + value: osx-arm64 - name: _BuildConfig value: Release - name: _SignType diff --git a/.vsts-pr.yml b/.vsts-pr.yml index dfabd98d..da954d3b 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -102,7 +102,7 @@ stages: - job: OSX_latest displayName: 'Mac OS' pool: - vmImage: 'macOS-latest' + vmImage: 'macOS-14-arm64' strategy: matrix: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: @@ -116,7 +116,7 @@ stages: _DotNetPublishToBlobFeed : false variables: - name: _RID - value: osx-x64 + value: osx-arm64 steps: - checkout: self clean: true From 73d13f0b686b796855831103ed711f184d0fccd7 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 28 Jan 2025 09:35:30 -0800 Subject: [PATCH 8/9] Revert to macos-latest --- .vsts-ci.yml | 2 +- .vsts-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 42321e27..949bf751 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -123,7 +123,7 @@ extends: displayName: 'Mac OS' pool: name: Azure Pipelines - image: 'macOS-14-arm64' + image: 'macOS-latest' os: macOS variables: - name: _RID diff --git a/.vsts-pr.yml b/.vsts-pr.yml index da954d3b..204acfff 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -102,7 +102,7 @@ stages: - job: OSX_latest displayName: 'Mac OS' pool: - vmImage: 'macOS-14-arm64' + vmImage: 'macOS-latest' strategy: matrix: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: From 5c84ce335724e45708fe7d7f3912215ba4c7bda8 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Fri, 31 Jan 2025 09:29:31 -0800 Subject: [PATCH 9/9] Add mac x64 jobs too --- .vsts-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++-- .vsts-pr.yml | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 949bf751..b3dc815d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -119,8 +119,47 @@ 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' + os: macOS + variables: + - name: _RID + value: osx-x64 + - 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 + - job: OSX_latest_arm64 + displayName: 'Mac OS (arm64)' pool: name: Azure Pipelines image: 'macOS-latest' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 204acfff..a5429558 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -98,9 +98,50 @@ 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: + 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-x64 + 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 + - job: OSX_latest_arm64 + displayName: 'Mac OS (arm64)' pool: vmImage: 'macOS-latest' strategy: