Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

fix(ui): show the raw Windows EditionID on the dashboard

fatDuck63c6a6566d28
diff --git a/optimizerDuck.Test/Domain/Conditions/ConditionTests.cs b/optimizerDuck.Test/Domain/Conditions/ConditionTests.cs
index fb34ff4..e53bb9d 100644
--- a/optimizerDuck.Test/Domain/Conditions/ConditionTests.cs
+++ b/optimizerDuck.Test/Domain/Conditions/ConditionTests.cs
@@ -41,7 +41,6 @@ public class ConditionTests
Windows = new WindowsInfo
{
BuildNumber = build,
- Edition = WindowsEdition.Pro,
Architecture = Architecture.X64,
DeviceKind = DeviceKind.Desktop,
InstallDate = new DateTime(2024, 1, 1),
diff --git a/optimizerDuck.Test/Services/SystemInfoTests.cs b/optimizerDuck.Test/Services/SystemInfoTests.cs
index f5b85c9..860fff4 100644
--- a/optimizerDuck.Test/Services/SystemInfoTests.cs
+++ b/optimizerDuck.Test/Services/SystemInfoTests.cs
@@ -1,5 +1,6 @@
using System.Globalization;
using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Win32;
using optimizerDuck.Common.Converters;
using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.System;
@@ -35,19 +36,17 @@ public class SystemInfoTests
Assert.False(info.IsWindows10);
}
- [Theory]
- [InlineData("Professional", WindowsEdition.Pro)]
- [InlineData("Core", WindowsEdition.Home)]
- [InlineData("CoreSingleLanguage", WindowsEdition.Home)]
- [InlineData("Education", WindowsEdition.Education)]
- [InlineData("Enterprise", WindowsEdition.Enterprise)]
- [InlineData("ServerDatacenter", WindowsEdition.Server)]
- [InlineData(null, WindowsEdition.Unknown)]
- [InlineData("", WindowsEdition.Unknown)]
- [InlineData("Quantum", WindowsEdition.Unknown)]
- public void MapEdition_MapsKnownIds(string? editionId, WindowsEdition expected)
+ [Fact]
+ public void LiveEditionId_MatchesRegistryUnchanged()
{
- Assert.Equal(expected, WindowsProvider.MapEdition(editionId));
+ using var key = Registry.LocalMachine.OpenSubKey(
+ @"SOFTWARE\Microsoft\Windows NT\CurrentVersion"
+ );
+ var raw = key?.GetValue("EditionID")?.ToString();
+ var expected = string.IsNullOrWhiteSpace(raw) ? null : raw.Trim();
+
+ // The SKU must survive to the UI verbatim: no family mapping, no guessing.
+ Assert.Equal(expected, WindowsProvider.Get().EditionId);
}
[Fact]
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.cs
index 945f832..7bd6423 100644
--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs
+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs
@@ -3094,51 +3094,6 @@ namespace optimizerDuck.Resources.Languages {
}
}
- /// <summary>
- /// Looks up a localized string similar to Education.
- /// </summary>
- internal static string Enum_WindowsEdition_Education {
- get {
- return ResourceManager.GetString("Enum.WindowsEdition.Education", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Enterprise.
- /// </summary>
- internal static string Enum_WindowsEdition_Enterprise {
- get {
- return ResourceManager.GetString("Enum.WindowsEdition.Enterprise", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Home.
- /// </summary>
- internal static string Enum_WindowsEdition_Home {
- get {
- return ResourceManager.GetString("Enum.WindowsEdition.Home", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Pro.
- /// </summary>
- internal static string Enum_WindowsEdition_Pro {
- get {
- return ResourceManager.GetString("Enum.WindowsEdition.Pro", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Server.
- /// </summary>
- internal static string Enum_WindowsEdition_Server {
- get {
- return ResourceManager.GetString("Enum.WindowsEdition.Server", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Third-party notices.
/// </summary>
diff --git a/optimizerDuck/Resources/Languages/Translations.ar-SA.resx b/optimizerDuck/Resources/Languages/Translations.ar-SA.resx
index 631aed9..42f46a3 100644
--- a/optimizerDuck/Resources/Languages/Translations.ar-SA.resx
+++ b/optimizerDuck/Resources/Languages/Translations.ar-SA.resx
@@ -2135,21 +2135,6 @@
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>عند وقوع حدث</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.de-DE.resx b/optimizerDuck/Resources/Languages/Translations.de-DE.resx
index b501c96..a9ce25b 100644
--- a/optimizerDuck/Resources/Languages/Translations.de-DE.resx
+++ b/optimizerDuck/Resources/Languages/Translations.de-DE.resx
@@ -2145,21 +2145,6 @@ Aktualisiere jetzt, um die neuesten Funktionen, Verbesserungen und Fehlerbehebun
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>Bei Ereignis</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.es-ES.resx b/optimizerDuck/Resources/Languages/Translations.es-ES.resx
index 664b49a..85a9933 100644
--- a/optimizerDuck/Resources/Languages/Translations.es-ES.resx
+++ b/optimizerDuck/Resources/Languages/Translations.es-ES.resx
@@ -3898,21 +3898,6 @@ Actualiza ahora para disfrutar de las nuevas funciones y mejoras.</value>
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>En un evento</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.fr-FR.resx b/optimizerDuck/Resources/Languages/Translations.fr-FR.resx
index 3bc7301..f3de537 100644
--- a/optimizerDuck/Resources/Languages/Translations.fr-FR.resx
+++ b/optimizerDuck/Resources/Languages/Translations.fr-FR.resx
@@ -2093,21 +2093,6 @@ Mettez à jour maintenant pour profiter des dernières fonctionnalités, amélio
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>Sur un événement</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.he-IL.resx b/optimizerDuck/Resources/Languages/Translations.he-IL.resx
index 1e2bdb4..b2ac447 100644
--- a/optimizerDuck/Resources/Languages/Translations.he-IL.resx
+++ b/optimizerDuck/Resources/Languages/Translations.he-IL.resx
@@ -2150,21 +2150,6 @@
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>בעת אירוע</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.id-ID.resx b/optimizerDuck/Resources/Languages/Translations.id-ID.resx
index c60d7b2..29358a2 100644
--- a/optimizerDuck/Resources/Languages/Translations.id-ID.resx
+++ b/optimizerDuck/Resources/Languages/Translations.id-ID.resx
@@ -2150,21 +2150,6 @@ Perbarui sekarang untuk menikmati fitur terbaru, peningkatan, dan perbaikan bug.
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>Saat peristiwa</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.it-IT.resx b/optimizerDuck/Resources/Languages/Translations.it-IT.resx
index bc5a145..4e1be1f 100644
--- a/optimizerDuck/Resources/Languages/Translations.it-IT.resx
+++ b/optimizerDuck/Resources/Languages/Translations.it-IT.resx
@@ -2101,21 +2101,6 @@ Aggiorna ora per godere delle ultime funzionalità, miglioramenti e correzioni.<
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>Su evento</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.ja-JP.resx b/optimizerDuck/Resources/Languages/Translations.ja-JP.resx
index 51f2616..8ae9d98 100644
--- a/optimizerDuck/Resources/Languages/Translations.ja-JP.resx
+++ b/optimizerDuck/Resources/Languages/Translations.ja-JP.resx
@@ -2085,21 +2085,6 @@
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>イベント時</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.ko-KR.resx b/optimizerDuck/Resources/Languages/Translations.ko-KR.resx
index 3dac3ea..48a9627 100644
--- a/optimizerDuck/Resources/Languages/Translations.ko-KR.resx
+++ b/optimizerDuck/Resources/Languages/Translations.ko-KR.resx
@@ -2084,21 +2084,6 @@
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>이벤트 발생 시</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.pl-PL.resx b/optimizerDuck/Resources/Languages/Translations.pl-PL.resx
index 6325977..575e89f 100644
--- a/optimizerDuck/Resources/Languages/Translations.pl-PL.resx
+++ b/optimizerDuck/Resources/Languages/Translations.pl-PL.resx
@@ -2093,21 +2093,6 @@ Zaktualizuj teraz, aby korzystać z najnowszych funkcji, ulepszeń i poprawek b
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>Po zdarzeniu</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.pt-BR.resx b/optimizerDuck/Resources/Languages/Translations.pt-BR.resx
index 2cc92d5..8da312c 100644
--- a/optimizerDuck/Resources/Languages/Translations.pt-BR.resx
+++ b/optimizerDuck/Resources/Languages/Translations.pt-BR.resx
@@ -2093,21 +2093,6 @@ Atualize agora para desfrutar das últimas funcionalidades, melhorias e correç
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>Em um evento</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index bd16fd7..b36441d 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -1400,21 +1400,6 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="Bloatware.Header.Description" xml:space="preserve">
<value>Manage and remove pre-installed applications that you don't need</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.ru-RU.resx b/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
index b35d4c0..e153024 100644
--- a/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
+++ b/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
@@ -2093,21 +2093,6 @@
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>По событию</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.tr-TR.resx b/optimizerDuck/Resources/Languages/Translations.tr-TR.resx
index a468c78..9ed12ff 100644
--- a/optimizerDuck/Resources/Languages/Translations.tr-TR.resx
+++ b/optimizerDuck/Resources/Languages/Translations.tr-TR.resx
@@ -2084,21 +2084,6 @@ En son özelliklerden, iyileştirmelerden ve hata düzeltmelerinden yararlanmak
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>Bir olayda</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
index 7e13eff..5bc9301 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
@@ -2085,21 +2085,6 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>Khi có sự kiện</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.zh-CN.resx b/optimizerDuck/Resources/Languages/Translations.zh-CN.resx
index 8bf2292..031ba85 100644
--- a/optimizerDuck/Resources/Languages/Translations.zh-CN.resx
+++ b/optimizerDuck/Resources/Languages/Translations.zh-CN.resx
@@ -2101,21 +2101,6 @@
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>事件发生时</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx b/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
index 1601549..84e686e 100644
--- a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
+++ b/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
@@ -2088,21 +2088,6 @@
<data name="Enum.StorageMediaType.Nvme" xml:space="preserve">
<value>NVMe</value>
</data>
- <data name="Enum.WindowsEdition.Home" xml:space="preserve">
- <value>Home</value>
- </data>
- <data name="Enum.WindowsEdition.Pro" xml:space="preserve">
- <value>Pro</value>
- </data>
- <data name="Enum.WindowsEdition.Education" xml:space="preserve">
- <value>Education</value>
- </data>
- <data name="Enum.WindowsEdition.Enterprise" xml:space="preserve">
- <value>Enterprise</value>
- </data>
- <data name="Enum.WindowsEdition.Server" xml:space="preserve">
- <value>Server</value>
- </data>
<data name="ScheduledTasks.Trigger.Event" xml:space="preserve">
<value>事件發生時</value>
</data>
diff --git a/optimizerDuck/Services/System/SystemInfo.cs b/optimizerDuck/Services/System/SystemInfo.cs
index c2d7977..244f82c 100644
--- a/optimizerDuck/Services/System/SystemInfo.cs
+++ b/optimizerDuck/Services/System/SystemInfo.cs
@@ -98,17 +98,6 @@ public enum StorageMediaType
Nvme,
}
-/// <summary>Windows edition from EditionID. Server SKUs collapse to Server.</summary>
-public enum WindowsEdition
-{
- Unknown,
- Home,
- Pro,
- Education,
- Enterprise,
- Server,
-}
-
/// <summary>Operating system facts. All display text is resolved in UI layer.</summary>
public sealed record WindowsInfo
{
@@ -120,7 +109,8 @@ public sealed record WindowsInfo
/// <summary>Display version (e.g. "24H2"). Null when unreadable.</summary>
public string? DisplayVersion { get; init; }
- public WindowsEdition Edition { get; init; } = WindowsEdition.Unknown;
+ /// <summary>Edition SKU straight from the registry (e.g. "CoreCountrySpecific"). Never normalized.</summary>
+ public string? EditionId { get; init; }
public Architecture Architecture { get; init; } = Architecture.Unknown;
public DeviceKind DeviceKind { get; init; } = DeviceKind.Unknown;
public DateTime? InstallDate { get; init; }
diff --git a/optimizerDuck/Services/System/SystemInfoService.cs b/optimizerDuck/Services/System/SystemInfoService.cs
index 852d31c..c2b7d94 100644
--- a/optimizerDuck/Services/System/SystemInfoService.cs
+++ b/optimizerDuck/Services/System/SystemInfoService.cs
@@ -1587,7 +1587,7 @@ internal static class WindowsProvider
{
int? build = null;
string? displayVersion = null;
- var edition = WindowsEdition.Unknown;
+ string? editionId = null;
DateTime? installDate = null;
using (
@@ -1604,7 +1604,7 @@ internal static class WindowsProvider
if (int.TryParse(buildText?.Split('.')[0], out var parsed))
build = parsed;
displayVersion = NullIfEmpty(ntKey.GetValue("DisplayVersion")?.ToString());
- edition = MapEdition(ntKey.GetValue("EditionID")?.ToString());
+ editionId = NullIfEmpty(ntKey.GetValue("EditionID")?.ToString());
installDate = ParseInstallDate(ntKey.GetValue("InstallDate"));
}
}
@@ -1618,7 +1618,7 @@ internal static class WindowsProvider
{
BuildNumber = build,
DisplayVersion = displayVersion,
- Edition = edition,
+ EditionId = editionId,
Architecture = CpuProvider.MapArchitecture(),
DeviceKind = DetectDeviceKind(),
InstallDate = installDate,
@@ -1631,31 +1631,6 @@ internal static class WindowsProvider
}
}
- internal static WindowsEdition MapEdition(string? editionId)
- {
- if (string.IsNullOrWhiteSpace(editionId))
- return WindowsEdition.Unknown;
- var id = editionId.Trim();
- if (id.StartsWith("Server", StringComparison.OrdinalIgnoreCase))
- return WindowsEdition.Server;
- if (id.StartsWith("Core", StringComparison.OrdinalIgnoreCase))
- return WindowsEdition.Home;
- return id switch
- {
- "Home" => WindowsEdition.Home,
- "Professional" => WindowsEdition.Pro,
- "ProfessionalEducation" => WindowsEdition.Education,
- "Education" => WindowsEdition.Education,
- "Enterprise" => WindowsEdition.Enterprise,
- _ when id.Contains("Education", StringComparison.OrdinalIgnoreCase) =>
- WindowsEdition.Education,
- _ when id.Contains("Enterprise", StringComparison.OrdinalIgnoreCase) =>
- WindowsEdition.Enterprise,
- _ when id.Contains("Pro", StringComparison.OrdinalIgnoreCase) => WindowsEdition.Pro,
- _ => WindowsEdition.Unknown,
- };
- }
-
private static DateTime? ParseInstallDate(object? value)
{
try
@@ -2151,7 +2126,7 @@ public sealed class SystemInfoService : IDisposable
_logger.LogInformation(
"OS: Windows {Build} {Edition} [{Arch}] ({Device})",
s.Windows.BuildNumber?.ToString() ?? "?",
- s.Windows.Edition,
+ s.Windows.EditionId,
s.Windows.Architecture,
s.Windows.DeviceKind
);
diff --git a/optimizerDuck/UI/Pages/DashboardPage.xaml b/optimizerDuck/UI/Pages/DashboardPage.xaml
index 8c1ea83..050c238 100644
--- a/optimizerDuck/UI/Pages/DashboardPage.xaml
+++ b/optimizerDuck/UI/Pages/DashboardPage.xaml
@@ -154,7 +154,7 @@
<StackPanel Grid.Row="0">
<ui:TextBlock FontTypography="BodyStrong" Text="{Binding ViewModel.WindowsTitle}" />
<ui:TextBlock FontTypography="Caption" Foreground="{DynamicResource TextFillColorSecondaryBrush}">
- <Run Text="{Binding ViewModel.SystemInfo.Windows.Edition, Converter={StaticResource EnumDisplayConverter}, Mode=OneWay}" />
+ <Run Text="{Binding ViewModel.SystemInfo.Windows.EditionId, TargetNullValue=—, Mode=OneWay}" />
<Run Text="·" />
<Run Text="{Binding ViewModel.SystemInfo.Windows.Architecture, Converter={StaticResource EnumDisplayConverter}, Mode=OneWay}" />
<Run Text="·" />