From 8fb36604e4b05fa75f3880ebfb05243713ca10d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 19 Oct 2023 08:07:39 -0400 Subject: [PATCH 1/2] chore: Update net7.0 to latest (cherry picked from commit 2f4420ad69132752bb21f739b6b674a3223879a3) --- .github/workflows/ci.yml | 14 +++++++------- manifests/uno.ui-preview.manifest.json | 6 +++--- manifests/uno.ui.manifest.json | 9 ++++----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34a6dea0..e3133240 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,7 +155,7 @@ jobs: previous_tool_version: '' previous_tool_params: '' os: macos-11 - dotnet_version: 7.0.200-preview.22628.1 + dotnet_version: 7.0.402 - manifest: 'manifests/uno.ui-preview-major.manifest.json' manifest_name: Preview net8 @@ -169,14 +169,14 @@ jobs: previous_tool_version: 1.4.2 previous_tool_params: '' os: macos-11 - dotnet_version: 7.0.401 + dotnet_version: 7.0.402 - manifest: 'manifests/uno.ui-preview.manifest.json' manifest_name: Preview Upgrade previous_tool_version: 1.4.2 previous_tool_params: '--pre' os: macos-11 - dotnet_version: 7.0.200-preview.22628.1 + dotnet_version: 7.0.402 - manifest: 'manifests/uno.ui-preview-major.manifest.json' manifest_name: Preview Upgrade net8 @@ -188,14 +188,14 @@ jobs: - manifest: 'manifests/uno.ui.manifest.json' manifest_name: Stable os: macos-12 - dotnet_version: 7.0.401 + dotnet_version: 7.0.402 - manifest: 'manifests/uno.ui-preview.manifest.json' manifest_name: Preview previous_tool_version: '' previous_tool_params: '' os: macos-12 - dotnet_version: 7.0.200-preview.22628.1 + dotnet_version: 7.0.402 - manifest: 'manifests/uno.ui-preview-major.manifest.json' manifest_name: Preview net8 @@ -209,14 +209,14 @@ jobs: previous_tool_version: 1.4.2 previous_tool_params: '' os: macos-12 - dotnet_version: 7.0.401 + dotnet_version: 7.0.402 - manifest: 'manifests/uno.ui-preview.manifest.json' manifest_name: Preview Upgrade previous_tool_version: 1.4.2 previous_tool_params: '--pre' os: macos-12 - dotnet_version: 7.0.200-preview.22628.1 + dotnet_version: 7.0.402 - manifest: 'manifests/uno.ui-preview-major.manifest.json' manifest_name: Preview Upgrade net8 diff --git a/manifests/uno.ui-preview.manifest.json b/manifests/uno.ui-preview.manifest.json index ee8d674c..fdf225ca 100644 --- a/manifests/uno.ui-preview.manifest.json +++ b/manifests/uno.ui-preview.manifest.json @@ -3,12 +3,12 @@ "toolVersion": "1.5.0", "variables": { "OPENJDK_VERSION": "11.0.20.1", - "DOTNET_SDK_VERSION": "7.0.401", + "DOTNET_SDK_VERSION": "7.0.402", "MACCATALYST_SDK_VERSION": "16.4.7099/7.0.100", "IOS_SDK_VERSION": "16.4.7099/7.0.100", "MACOS_SDK_VERSION": "13.3.7099/7.0.100", - "ANDROID_SDK_VERSION": "33.0.46/7.0.100", - "MAUI_VERSION": "7.0.86/7.0.100" + "ANDROID_SDK_VERSION": "33.0.68/7.0.100", + "MAUI_VERSION": "7.0.92/7.0.100" }, "variableMappers": [ ], diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json index ee8d674c..cedb5c71 100644 --- a/manifests/uno.ui.manifest.json +++ b/manifests/uno.ui.manifest.json @@ -3,12 +3,12 @@ "toolVersion": "1.5.0", "variables": { "OPENJDK_VERSION": "11.0.20.1", - "DOTNET_SDK_VERSION": "7.0.401", + "DOTNET_SDK_VERSION": "7.0.402", "MACCATALYST_SDK_VERSION": "16.4.7099/7.0.100", "IOS_SDK_VERSION": "16.4.7099/7.0.100", "MACOS_SDK_VERSION": "13.3.7099/7.0.100", - "ANDROID_SDK_VERSION": "33.0.46/7.0.100", - "MAUI_VERSION": "7.0.86/7.0.100" + "ANDROID_SDK_VERSION": "33.0.68/7.0.100", + "MAUI_VERSION": "7.0.92/7.0.100" }, "variableMappers": [ ], @@ -96,8 +96,7 @@ "osxArm64": "https://dotnetcli.azureedge.net/dotnet/Sdk/$(DOTNET_SDK_VERSION)/dotnet-sdk-$(DOTNET_SDK_VERSION)-osx-arm64.pkg" }, "packageSources": [ - "https://api.nuget.org/v3/index.json", - "https://aka.ms/dotnet6/nuget/index.json" + "https://api.nuget.org/v3/index.json" ], "workloads": [ { From 7e0d3eeea4371fca103e896ca59f033ecbc41564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 19 Oct 2023 11:11:00 -0400 Subject: [PATCH 2/2] chore: Bump default manifest (cherry picked from commit 48dec690eae41d21f43f11dd4a6b43eaec652d74) --- UnoCheck/Manifest/Manifest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UnoCheck/Manifest/Manifest.cs b/UnoCheck/Manifest/Manifest.cs index 4529b559..fe1b7ddb 100644 --- a/UnoCheck/Manifest/Manifest.cs +++ b/UnoCheck/Manifest/Manifest.cs @@ -8,9 +8,9 @@ namespace DotNetCheck.Manifest { public partial class Manifest { - public const string DefaultManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/519b147a80d92e35cac4b8f97855d9302c91b340/manifests/uno.ui.manifest.json"; - public const string PreviewManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/519b147a80d92e35cac4b8f97855d9302c91b340/manifests/uno.ui-preview.manifest.json"; - public const string PreviewMajorManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/519b147a80d92e35cac4b8f97855d9302c91b340/manifests/uno.ui-preview-major.manifest.json"; + public const string DefaultManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/2f4420ad69132752bb21f739b6b674a3223879a3/manifests/uno.ui.manifest.json"; + public const string PreviewManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/2f4420ad69132752bb21f739b6b674a3223879a3/manifests/uno.ui-preview.manifest.json"; + public const string PreviewMajorManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/2f4420ad69132752bb21f739b6b674a3223879a3/manifests/uno.ui-preview-major.manifest.json"; public static Task FromFileOrUrl(string fileOrUrl) {