From 00783b8a04b6aa093bb99bb1d3cfab185a432eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 12 Sep 2023 13:54:22 -0400 Subject: [PATCH 1/3] feat: Install maui workload for maui embedding --- manifests/uno.ui-preview-major.manifest.json | 10 +++++++++- manifests/uno.ui-preview.manifest.json | 10 +++++++++- manifests/uno.ui.manifest.json | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/manifests/uno.ui-preview-major.manifest.json b/manifests/uno.ui-preview-major.manifest.json index dc6e04e8..45454a63 100644 --- a/manifests/uno.ui-preview-major.manifest.json +++ b/manifests/uno.ui-preview-major.manifest.json @@ -7,7 +7,8 @@ "MACCATALYST_SDK_VERSION": "16.4.8694-net8-p7/8.0.100-preview.7", "IOS_SDK_VERSION": "16.4.8694-net8-p7/8.0.100-preview.7", "MACOS_SDK_VERSION": "13.3.8694-net8-p7/8.0.100-preview.7", - "ANDROID_SDK_VERSION": "34.0.0-preview.7.383/8.0.100-preview.7" + "ANDROID_SDK_VERSION": "34.0.0-preview.7.383/8.0.100-preview.7", + "MAUI_VERSION": "8.0.0-preview.7.8842/7.0.100" }, "variableMappers": [ ], @@ -124,6 +125,13 @@ "packageId": "Microsoft.NET.Sdk.macOS.Manifest-8.0.100", "version": "$(MACOS_SDK_VERSION)", "supportedPlatforms": [ "Windows", "OSX" ] + }, + { + "workloadId": "maui", + "workloadManifestId": "microsoft.net.sdk.maui", + "packageId": "Microsoft.NET.Sdk.Maui.Manifest-8.0.100", + "version": "$(MAUI_VERSION)", + "supportedPlatforms": [ "Windows", "OSX" ] } ], "packs": [] diff --git a/manifests/uno.ui-preview.manifest.json b/manifests/uno.ui-preview.manifest.json index 4ec0c722..d29c2058 100644 --- a/manifests/uno.ui-preview.manifest.json +++ b/manifests/uno.ui-preview.manifest.json @@ -7,7 +7,8 @@ "MACCATALYST_SDK_VERSION": "16.4.7054/7.0.100", "IOS_SDK_VERSION": "16.4.7054/7.0.100", "MACOS_SDK_VERSION": "13.3.7054/7.0.100", - "ANDROID_SDK_VERSION": "33.0.46/7.0.100" + "ANDROID_SDK_VERSION": "33.0.46/7.0.100", + "MAUI_VERSION": "7.0.86/7.0.100" }, "variableMappers": [ ], @@ -124,6 +125,13 @@ "packageId": "Microsoft.NET.Sdk.macOS.Manifest-7.0.100", "version": "$(MACOS_SDK_VERSION)", "supportedPlatforms": [ "Windows", "OSX" ] + }, + { + "workloadId": "maui", + "workloadManifestId": "microsoft.net.sdk.maui", + "packageId": "Microsoft.NET.Sdk.Maui.Manifest-7.0.100", + "version": "$(MAUI_VERSION)", + "supportedPlatforms": [ "Windows", "OSX" ] } ], "packs": [] diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json index 4ec0c722..d29c2058 100644 --- a/manifests/uno.ui.manifest.json +++ b/manifests/uno.ui.manifest.json @@ -7,7 +7,8 @@ "MACCATALYST_SDK_VERSION": "16.4.7054/7.0.100", "IOS_SDK_VERSION": "16.4.7054/7.0.100", "MACOS_SDK_VERSION": "13.3.7054/7.0.100", - "ANDROID_SDK_VERSION": "33.0.46/7.0.100" + "ANDROID_SDK_VERSION": "33.0.46/7.0.100", + "MAUI_VERSION": "7.0.86/7.0.100" }, "variableMappers": [ ], @@ -124,6 +125,13 @@ "packageId": "Microsoft.NET.Sdk.macOS.Manifest-7.0.100", "version": "$(MACOS_SDK_VERSION)", "supportedPlatforms": [ "Windows", "OSX" ] + }, + { + "workloadId": "maui", + "workloadManifestId": "microsoft.net.sdk.maui", + "packageId": "Microsoft.NET.Sdk.Maui.Manifest-7.0.100", + "version": "$(MAUI_VERSION)", + "supportedPlatforms": [ "Windows", "OSX" ] } ], "packs": [] From 9b20cf688c11f456c6cabbf788ce98fbd666995e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 12 Sep 2023 14:08:19 -0400 Subject: [PATCH 2/3] ci: Adjust net8 maui version --- manifests/uno.ui-preview-major.manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/uno.ui-preview-major.manifest.json b/manifests/uno.ui-preview-major.manifest.json index 45454a63..f22fee51 100644 --- a/manifests/uno.ui-preview-major.manifest.json +++ b/manifests/uno.ui-preview-major.manifest.json @@ -8,7 +8,7 @@ "IOS_SDK_VERSION": "16.4.8694-net8-p7/8.0.100-preview.7", "MACOS_SDK_VERSION": "13.3.8694-net8-p7/8.0.100-preview.7", "ANDROID_SDK_VERSION": "34.0.0-preview.7.383/8.0.100-preview.7", - "MAUI_VERSION": "8.0.0-preview.7.8842/7.0.100" + "MAUI_VERSION": "8.0.0-preview.7.8922/8.0.100-preview.7" }, "variableMappers": [ ], From f98538cbda536be2ab914cf4fc9eb0f39d320a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 12 Sep 2023 14:57:51 -0400 Subject: [PATCH 3/3] chore: Bump default manifest --- 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 5f2ef437..326697ea 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/35c63c2c44c937586f7d03952d53a7464a62fa69/manifests/uno.ui.manifest.json"; - public const string PreviewManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/35c63c2c44c937586f7d03952d53a7464a62fa69/manifests/uno.ui-preview.manifest.json"; - public const string PreviewMajorManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/35c63c2c44c937586f7d03952d53a7464a62fa69/manifests/uno.ui-preview-major.manifest.json"; + public const string DefaultManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/9b20cf688c11f456c6cabbf788ce98fbd666995e/manifests/uno.ui.manifest.json"; + public const string PreviewManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/9b20cf688c11f456c6cabbf788ce98fbd666995e/manifests/uno.ui-preview.manifest.json"; + public const string PreviewMajorManifestUrl = "https://raw.githubusercontent.com/unoplatform/uno.check/9b20cf688c11f456c6cabbf788ce98fbd666995e/manifests/uno.ui-preview-major.manifest.json"; public static Task FromFileOrUrl(string fileOrUrl) {