diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b9a06ff9..b3dc815d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -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' @@ -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 diff --git a/.vsts-pr.yml b/.vsts-pr.yml index dfabd98d..a5429558 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -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: @@ -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 diff --git a/eng/Signing.props b/eng/Signing.props index 60562050..8c58f1f0 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -7,7 +7,7 @@ true - + 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 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