From a09fce96f79005f48542a132c5576c21e06c08a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 30 Jan 2025 22:01:48 -0500 Subject: [PATCH 1/2] chore: Update to .NET 8.0.405 --- manifests/uno.ui.manifest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json index 46a7aa6e..c622f191 100644 --- a/manifests/uno.ui.manifest.json +++ b/manifests/uno.ui.manifest.json @@ -3,12 +3,12 @@ "toolVersion": "1.14.0", "variables": { "OPENJDK_VERSION": "11.0.20.1", - "DOTNET_SDK_VERSION": "8.0.401", - "MACCATALYST_SDK_VERSION": "17.5.8020/8.0.100", - "IOS_SDK_VERSION": "17.5.8020/8.0.100", - "MACOS_SDK_VERSION": "14.5.8020/8.0.100", - "ANDROID_SDK_VERSION": "34.0.113/8.0.100", - "MAUI_VERSION": "8.0.72/8.0.100" + "DOTNET_SDK_VERSION": "8.0.405", + "MACCATALYST_SDK_VERSION": "18.0.8319/8.0.100", + "IOS_SDK_VERSION": "18.0.8319/8.0.100", + "MACOS_SDK_VERSION": "18.0.8319/8.0.100", + "ANDROID_SDK_VERSION": "34.0.147/8.0.100", + "MAUI_VERSION": "8.0.100/8.0.100" }, "variableMappers": [ ], From f138b6e2e30d8c9511341ee948042154e7896ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 30 Jan 2025 22:12:04 -0500 Subject: [PATCH 2/2] chore: Adjust android linux, macos version --- .github/workflows/ci.yml | 4 ++-- manifests/uno.ui.manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75175321..08619d2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -396,7 +396,7 @@ jobs: $ProgressPreference = 'SilentlyContinue' & dotnet --list-sdks & dotnet tool install --global --version ${{ matrix.previous_tool_version }} uno.check - & uno-check --ci --fix --non-interactive --verbose --skip xcode --skip vswin --skip vsmac --skip wsl --skip edgewebview2 ${{ matrix.previous_tool_params }} + & uno-check --ci --fix --non-interactive --verbose --skip xcode --skip vswin --skip vsmac --skip wsl --skip androidemulator --skip edgewebview2 ${{ matrix.previous_tool_params }} & dotnet tool uninstall --global uno.check - name: Install and Run Tool @@ -405,7 +405,7 @@ jobs: Write-Output "PACKAGE VERSION: ${{ steps.gitversion.outputs.semVer }}" $ProgressPreference = 'SilentlyContinue' & dotnet tool install --global --version ${{ steps.gitversion.outputs.semVer }} --add-source NuGet/ uno.check - & uno-check --ci --fix --verbose --non-interactive --verbose --manifest ${{ matrix.manifest }} --skip xcode --skip vswin --skip vsmac --skip wsl --skip edgewebview2 ${{ matrix.tool_params }} + & uno-check --ci --fix --verbose --non-interactive --verbose --manifest ${{ matrix.manifest }} --skip xcode --skip androidemulator --skip vswin --skip vsmac --skip wsl --skip edgewebview2 ${{ matrix.tool_params }} sign: name: Sign Package diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json index c622f191..998948b6 100644 --- a/manifests/uno.ui.manifest.json +++ b/manifests/uno.ui.manifest.json @@ -6,7 +6,7 @@ "DOTNET_SDK_VERSION": "8.0.405", "MACCATALYST_SDK_VERSION": "18.0.8319/8.0.100", "IOS_SDK_VERSION": "18.0.8319/8.0.100", - "MACOS_SDK_VERSION": "18.0.8319/8.0.100", + "MACOS_SDK_VERSION": "15.0.8319/8.0.100", "ANDROID_SDK_VERSION": "34.0.147/8.0.100", "MAUI_VERSION": "8.0.100/8.0.100" },