From 75ab47b7302e91451d9fbe398abff419d05120f0 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 21 Sep 2024 08:41:27 -0400 Subject: [PATCH] chore: Adjust apple --- .vsts-ci.catalyst.yml | 10 +++++----- build/uno-ci/dotnet-install-windows.yml | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.vsts-ci.catalyst.yml b/.vsts-ci.catalyst.yml index 937fc17..b3b0187 100644 --- a/.vsts-ci.catalyst.yml +++ b/.vsts-ci.catalyst.yml @@ -2,7 +2,7 @@ jobs: - job: Catalyst pool: - vmImage: 'macos-14' + vmImage: macOS-14 variables: - name: XCODE_ROOT @@ -22,10 +22,6 @@ jobs: - template: build/uno-ci/canary-updater.yml - template: build/uno-ci/gitversion.yml - template: build/uno-ci/jdk-setup.yml - - - template: build/uno-ci/xcode-select.yml - parameters: - xCodeRoot: $(XCODE_ROOT) - task: InstallAppleCertificate@2 displayName: Install Certificate @@ -52,6 +48,10 @@ jobs: inputs: provisioningProfileLocation: 'secureFiles' provProfileSecureFile: Uno_Calculator_catalyst.provisionprofile # Located in the Library's secure files + + - template: build/uno-ci/xcode-select.yml + parameters: + xCodeRoot: $(XCODE_ROOT) - bash: | cd $(build.sourcesdirectory)/src/CalcManager diff --git a/build/uno-ci/dotnet-install-windows.yml b/build/uno-ci/dotnet-install-windows.yml index dcf8e0a..ffd9273 100644 --- a/build/uno-ci/dotnet-install-windows.yml +++ b/build/uno-ci/dotnet-install-windows.yml @@ -1,7 +1,6 @@ parameters: - DotNetVersion: '8.0.200' - UnoCheck_Version: '1.20.0-dev.7' - UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/cb74c45d871e416469bac56f228f0d514e0db3c3/manifests/uno.ui.manifest.json' + DotNetVersion: '9.0.100-rc.1.24452.12' + UnoCheck_Version: '1.26.0-dev.42' steps: @@ -25,7 +24,7 @@ steps: - powershell: | & dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json - & uno-check -v --ci --pre-major --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }} + & uno-check -v --ci --pre-major --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac displayName: Install .NET Workloads errorActionPreference: continue ignoreLASTEXITCODE: true