From 55d5d7ab47df83c23dfad3dcf5b276b99e1b1d55 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Wed, 4 Oct 2023 10:15:46 -0400 Subject: [PATCH 1/2] fix(openjdk): Use manifest, not code, to download arm64 installer --- UnoCheck/Checkups/OpenJdkCheckup.cs | 3 --- manifests/uno.ui-preview-major.manifest.json | 3 ++- manifests/uno.ui-preview.manifest.json | 3 ++- manifests/uno.ui.manifest.json | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UnoCheck/Checkups/OpenJdkCheckup.cs b/UnoCheck/Checkups/OpenJdkCheckup.cs index a24ccd02..fa80c1fa 100644 --- a/UnoCheck/Checkups/OpenJdkCheckup.cs +++ b/UnoCheck/Checkups/OpenJdkCheckup.cs @@ -98,9 +98,6 @@ public override Task Examine(SharedState history) return Task.FromResult(DiagnosticResult.Ok(this)); var url = Manifest?.Check?.OpenJdk?.Url; - if (url is not null && RuntimeInformation.OSArchitecture == Architecture.Arm64) { - url = new (url.ToString().Replace("-x64.", "-aarch64.")); - } return Task.FromResult(new DiagnosticResult(Status.Error, this, new Suggestion("Install OpenJDK11", new BootsSolution(url, "Download and Install Microsoft OpenJDK 11")))); diff --git a/manifests/uno.ui-preview-major.manifest.json b/manifests/uno.ui-preview-major.manifest.json index 4ca74dc0..dba87793 100644 --- a/manifests/uno.ui-preview-major.manifest.json +++ b/manifests/uno.ui-preview-major.manifest.json @@ -16,7 +16,8 @@ "version": "11.0", "urls": { "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi", - "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg" + "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg", + "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg" } }, "xcode": { diff --git a/manifests/uno.ui-preview.manifest.json b/manifests/uno.ui-preview.manifest.json index 990fd204..bf327ec3 100644 --- a/manifests/uno.ui-preview.manifest.json +++ b/manifests/uno.ui-preview.manifest.json @@ -16,7 +16,8 @@ "version": "11.0", "urls": { "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi", - "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg" + "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg", + "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg" } }, "xcode": { diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json index 990fd204..bf327ec3 100644 --- a/manifests/uno.ui.manifest.json +++ b/manifests/uno.ui.manifest.json @@ -16,7 +16,8 @@ "version": "11.0", "urls": { "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi", - "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg" + "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg", + "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg" } }, "xcode": { From 90894f1931f9ac931877b4f4704bf7019a3e5fad Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Wed, 4 Oct 2023 11:17:03 -0400 Subject: [PATCH 2/2] chore: bump OpenJDK and add win/arm64 URLs --- manifests/uno.ui-preview-major.manifest.json | 3 ++- manifests/uno.ui-preview.manifest.json | 3 ++- manifests/uno.ui.manifest.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/manifests/uno.ui-preview-major.manifest.json b/manifests/uno.ui-preview-major.manifest.json index dba87793..f945ed08 100644 --- a/manifests/uno.ui-preview-major.manifest.json +++ b/manifests/uno.ui-preview-major.manifest.json @@ -2,7 +2,7 @@ "check": { "toolVersion": "1.14.0", "variables": { - "OPENJDK_VERSION": "11.0.16", + "OPENJDK_VERSION": "11.0.20.1", "DOTNET_SDK_VERSION": "8.0.100-rc.1.23455.8", "MACCATALYST_SDK_VERSION": "16.4.8825-net8-rc1/8.0.100-rc.1", "IOS_SDK_VERSION": "16.4.8825-net8-rc1/8.0.100-rc.1", @@ -16,6 +16,7 @@ "version": "11.0", "urls": { "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi", + "winArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-aarch64.msi", "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg", "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg" } diff --git a/manifests/uno.ui-preview.manifest.json b/manifests/uno.ui-preview.manifest.json index bf327ec3..fc2bf2d0 100644 --- a/manifests/uno.ui-preview.manifest.json +++ b/manifests/uno.ui-preview.manifest.json @@ -2,7 +2,7 @@ "check": { "toolVersion": "1.5.0", "variables": { - "OPENJDK_VERSION": "11.0.16", + "OPENJDK_VERSION": "11.0.20.1", "DOTNET_SDK_VERSION": "7.0.401", "MACCATALYST_SDK_VERSION": "16.4.7054/7.0.100", "IOS_SDK_VERSION": "16.4.7054/7.0.100", @@ -16,6 +16,7 @@ "version": "11.0", "urls": { "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi", + "winArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-aarch64.msi", "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg", "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg" } diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json index bf327ec3..fc2bf2d0 100644 --- a/manifests/uno.ui.manifest.json +++ b/manifests/uno.ui.manifest.json @@ -2,7 +2,7 @@ "check": { "toolVersion": "1.5.0", "variables": { - "OPENJDK_VERSION": "11.0.16", + "OPENJDK_VERSION": "11.0.20.1", "DOTNET_SDK_VERSION": "7.0.401", "MACCATALYST_SDK_VERSION": "16.4.7054/7.0.100", "IOS_SDK_VERSION": "16.4.7054/7.0.100", @@ -16,6 +16,7 @@ "version": "11.0", "urls": { "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi", + "winArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-aarch64.msi", "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg", "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg" }