From 3a604b5624fff77c92134dcf40921c7b0699db36 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Thu, 26 Dec 2024 08:58:11 -0800 Subject: [PATCH 1/3] Move to dotnet CDN --- CHANGELOG.md | 2 +- README.md | 2 +- README_cn-si.md | 2 +- README_de-de.md | 2 +- README_it-it.md | 2 +- README_ru-ru.md | 2 +- README_tr-tr.md | 2 +- README_uk-ua.md | 2 +- src/SophiApp/Customisations/CustomisationOs.cs | 4 ++-- src/SophiApp/Customisations/CustomisationStatus.cs | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd71b167..dff08bb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,7 @@ All efforts are directed towards the SophiApp 2.0 development. Read more: * * - * + * * * * diff --git a/README_cn-si.md b/README_cn-si.md index b9c26c98..42507ce5 100644 --- a/README_cn-si.md +++ b/README_cn-si.md @@ -235,7 +235,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_de-de.md b/README_de-de.md index e4ba3ced..172c5cd4 100644 --- a/README_de-de.md +++ b/README_de-de.md @@ -238,7 +238,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_it-it.md b/README_it-it.md index 33feaacb..314142b0 100644 --- a/README_it-it.md +++ b/README_it-it.md @@ -237,7 +237,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_ru-ru.md b/README_ru-ru.md index 100dd1bb..d98f8e52 100644 --- a/README_ru-ru.md +++ b/README_ru-ru.md @@ -237,7 +237,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_tr-tr.md b/README_tr-tr.md index 4b7ecd37..2c079f5a 100644 --- a/README_tr-tr.md +++ b/README_tr-tr.md @@ -236,7 +236,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_uk-ua.md b/README_uk-ua.md index 7a6fa030..fbaaf34d 100644 --- a/README_uk-ua.md +++ b/README_uk-ua.md @@ -239,7 +239,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/src/SophiApp/Customisations/CustomisationOs.cs b/src/SophiApp/Customisations/CustomisationOs.cs index 25e618e6..e261585d 100644 --- a/src/SophiApp/Customisations/CustomisationOs.cs +++ b/src/SophiApp/Customisations/CustomisationOs.cs @@ -960,7 +960,7 @@ public static void _352(bool _) public static void _354(bool _) { var temp = Environment.GetEnvironmentVariable(TEMP); - var cloudNet6 = WebHelper.GetJsonResponse(@"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); + var cloudNet6 = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); var latestRelease = cloudNet6.Releases.Where(release => release.ReleaseVersion == $"{cloudNet6.LatestRelease}").First(); var latestRuntime = latestRelease.WindowsDesktop.Files.Where(file => file.Name == "windowsdesktop-runtime-win-x86.exe").First(); var installer = $@"{temp}\{latestRuntime.Url.Substring(latestRuntime.Url.LastIndexOf('/') + 1)}"; @@ -984,7 +984,7 @@ public static void _355(bool _) public static void _357(bool _) { var temp = Environment.GetEnvironmentVariable(TEMP); - var cloudNet6 = WebHelper.GetJsonResponse(@"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); + var cloudNet6 = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); var latestRelease = cloudNet6.Releases.Where(release => release.ReleaseVersion == $"{cloudNet6.LatestRelease}").First(); var latestRuntime = latestRelease.WindowsDesktop.Files.Where(file => file.Name == "windowsdesktop-runtime-win-x64.exe").First(); var installer = $@"{temp}\{latestRuntime.Url.Substring(latestRuntime.Url.LastIndexOf('/') + 1)}"; diff --git a/src/SophiApp/Customisations/CustomisationStatus.cs b/src/SophiApp/Customisations/CustomisationStatus.cs index f9f902da..b1beeb84 100644 --- a/src/SophiApp/Customisations/CustomisationStatus.cs +++ b/src/SophiApp/Customisations/CustomisationStatus.cs @@ -455,7 +455,7 @@ public static bool _354() { if (HttpHelper.IsOnline) { - var cloudNetVersion = WebHelper.GetJsonResponse(@"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); + var cloudNetVersion = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); return DotNetHelper.IsInstalled(cloudNetVersion.LatestRelease, DotNetRid.Win_x86) ? throw new DotNetInstalledException(cloudNetVersion.LatestRelease) : false; @@ -472,7 +472,7 @@ public static bool _357() { if (HttpHelper.IsOnline) { - var cloudNetVersion = WebHelper.GetJsonResponse(@"https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); + var cloudNetVersion = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); return DotNetHelper.IsInstalled(cloudNetVersion.LatestRelease, DotNetRid.Win_x64) ? throw new DotNetInstalledException(cloudNetVersion.LatestRelease) : false; From 5dcef4de7d2844d89efa2bbc7ce318aa3ed14b3f Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Thu, 26 Dec 2024 14:13:46 -0800 Subject: [PATCH 2/3] Update src/SophiApp/Customisations/CustomisationOs.cs Co-authored-by: Kalle Olavi Niemitalo --- src/SophiApp/Customisations/CustomisationOs.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SophiApp/Customisations/CustomisationOs.cs b/src/SophiApp/Customisations/CustomisationOs.cs index e261585d..2d60a4df 100644 --- a/src/SophiApp/Customisations/CustomisationOs.cs +++ b/src/SophiApp/Customisations/CustomisationOs.cs @@ -960,7 +960,7 @@ public static void _352(bool _) public static void _354(bool _) { var temp = Environment.GetEnvironmentVariable(TEMP); - var cloudNet6 = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); + var cloudNet6 = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com/dotnet/release-metadata/6.0/releases.json"); var latestRelease = cloudNet6.Releases.Where(release => release.ReleaseVersion == $"{cloudNet6.LatestRelease}").First(); var latestRuntime = latestRelease.WindowsDesktop.Files.Where(file => file.Name == "windowsdesktop-runtime-win-x86.exe").First(); var installer = $@"{temp}\{latestRuntime.Url.Substring(latestRuntime.Url.LastIndexOf('/') + 1)}"; From 0c4f1b5a97d187a261b76d65c6835a27dbedb76f Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Thu, 26 Dec 2024 14:14:48 -0800 Subject: [PATCH 3/3] Fix domain typo --- CHANGELOG.md | 2 +- README.md | 2 +- README_cn-si.md | 2 +- README_de-de.md | 2 +- README_it-it.md | 2 +- README_ru-ru.md | 2 +- README_tr-tr.md | 2 +- README_uk-ua.md | 2 +- src/SophiApp/Customisations/CustomisationOs.cs | 2 +- src/SophiApp/Customisations/CustomisationStatus.cs | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dff08bb2..c8323e79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,7 @@ All efforts are directed towards the SophiApp 2.0 development. Read more: * * - * + * * * * diff --git a/README_cn-si.md b/README_cn-si.md index 42507ce5..4492be06 100644 --- a/README_cn-si.md +++ b/README_cn-si.md @@ -235,7 +235,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_de-de.md b/README_de-de.md index 172c5cd4..d7026869 100644 --- a/README_de-de.md +++ b/README_de-de.md @@ -238,7 +238,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_it-it.md b/README_it-it.md index 314142b0..c4942638 100644 --- a/README_it-it.md +++ b/README_it-it.md @@ -237,7 +237,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_ru-ru.md b/README_ru-ru.md index d98f8e52..f36ac52e 100644 --- a/README_ru-ru.md +++ b/README_ru-ru.md @@ -237,7 +237,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_tr-tr.md b/README_tr-tr.md index 2c079f5a..c6a47787 100644 --- a/README_tr-tr.md +++ b/README_tr-tr.md @@ -236,7 +236,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/README_uk-ua.md b/README_uk-ua.md index fbaaf34d..4704f834 100644 --- a/README_uk-ua.md +++ b/README_uk-ua.md @@ -239,7 +239,7 @@ scoop install sophiapp * * * - * + * * * * diff --git a/src/SophiApp/Customisations/CustomisationOs.cs b/src/SophiApp/Customisations/CustomisationOs.cs index 2d60a4df..8c50c4ff 100644 --- a/src/SophiApp/Customisations/CustomisationOs.cs +++ b/src/SophiApp/Customisations/CustomisationOs.cs @@ -984,7 +984,7 @@ public static void _355(bool _) public static void _357(bool _) { var temp = Environment.GetEnvironmentVariable(TEMP); - var cloudNet6 = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); + var cloudNet6 = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com/dotnet/release-metadata/6.0/releases.json"); var latestRelease = cloudNet6.Releases.Where(release => release.ReleaseVersion == $"{cloudNet6.LatestRelease}").First(); var latestRuntime = latestRelease.WindowsDesktop.Files.Where(file => file.Name == "windowsdesktop-runtime-win-x64.exe").First(); var installer = $@"{temp}\{latestRuntime.Url.Substring(latestRuntime.Url.LastIndexOf('/') + 1)}"; diff --git a/src/SophiApp/Customisations/CustomisationStatus.cs b/src/SophiApp/Customisations/CustomisationStatus.cs index b1beeb84..a01f96f5 100644 --- a/src/SophiApp/Customisations/CustomisationStatus.cs +++ b/src/SophiApp/Customisations/CustomisationStatus.cs @@ -455,7 +455,7 @@ public static bool _354() { if (HttpHelper.IsOnline) { - var cloudNetVersion = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); + var cloudNetVersion = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com/dotnet/release-metadata/6.0/releases.json"); return DotNetHelper.IsInstalled(cloudNetVersion.LatestRelease, DotNetRid.Win_x86) ? throw new DotNetInstalledException(cloudNetVersion.LatestRelease) : false; @@ -472,7 +472,7 @@ public static bool _357() { if (HttpHelper.IsOnline) { - var cloudNetVersion = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json"); + var cloudNetVersion = WebHelper.GetJsonResponse(@"https://builds.dotnet.microsoft.com/dotnet/release-metadata/6.0/releases.json"); return DotNetHelper.IsInstalled(cloudNetVersion.LatestRelease, DotNetRid.Win_x64) ? throw new DotNetInstalledException(cloudNetVersion.LatestRelease) : false;