Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
feat: Add bloatware management service for AppX packages, shared helper constants, and localization resources.
fatDuckfe751e0c2e2b
diff --git a/optimizerDuck/Common/Helpers/Shared.cs b/optimizerDuck/Common/Helpers/Shared.csindex 94b0a11..edc48b9 100644--- a/optimizerDuck/Common/Helpers/Shared.cs+++ b/optimizerDuck/Common/Helpers/Shared.cs@@ -45,74 +45,114 @@ public static class Sharedpublic static string RevertDirectory =>Path.Combine(RootDirectory, "Revert");- public static readonly Dictionary<string, string> SafeApps = new()+ public static readonly HashSet<string> SafeApps = new(){- // bing- ["Microsoft.BingWeather"] = "Weather",- ["Microsoft.BingNews"] = "Bing News",- ["Microsoft.BingSearch"] = "Bing Search",-- ["Microsoft.GetHelp"] = "Get Help",- ["Microsoft.GetStarted"] = "Get Started / Tips",- ["Microsoft.Messaging"] = "Messaging",- ["Microsoft.Microsoft3DViewer"] = "3D Viewer",- ["Microsoft.MicrosoftSolitaireCollection"] = "Solitaire Collection",- ["Microsoft.MicrosoftStickyNotes"] = "Sticky Notes",- ["Microsoft.MixedReality.Portal"] = "Mixed Reality Portal",- ["Microsoft.OneConnect"] = "OneConnect (Connect App)",- ["Microsoft.People"] = "People",- ["Microsoft.Print3D"] = "Print 3D",- ["SkypeApp"] = "Skype",- ["Microsoft.WindowsAlarms"] = "Alarms & Clock",- ["Microsoft.WindowsCamera"] = "Camera",- ["Microsoft.WindowsMaps"] = "Maps",- ["Microsoft.WindowsFeedbackHub"] = "Feedback Hub",- ["Microsoft.WindowsSoundRecorder"] = "Voice Recorder",- ["Microsoft.ZuneMusic"] = "Media Player / Groove",- ["Microsoft.Sway"] = "Microsoft Sway",- ["Microsoft.3DBuilder"] = "3D Builder (legacy)",- ["Microsoft.DrawboardPDF"] = "Drawboard PDF (OEM)",- ["WindowsPhone"] = "Windows Phone (old)",- ["CommsPhone"] = "Communications Phone (old)",- ["Microsoft.Todos"] = "Microsoft To Do",- ["Microsoft.WindowsCommunicationsApps"] = "Mail and Calendar",- ["MicrosoftCorporationII.QuickAssist"] = "Quick Assist",- ["Microsoft.Office.OneNote"] = "OneNote",- ["Microsoft.YourPhone"] = "Phone Link",- ["Microsoft.MicrosoftNews"] = "Microsoft News",- ["Microsoft.MicrosoftOfficeHub"] = "Office Hub"+ // Bing / MSN+ "Microsoft.BingWeather",+ "Microsoft.BingNews",+ "Microsoft.BingSearch",+ "Microsoft.BingFinance",+ "Microsoft.BingSports",+ "Microsoft.BingFoodAndDrink",+ "Microsoft.BingHealthAndFitness",+ "Microsoft.BingTravel",+ "Microsoft.MicrosoftNews",++ // Utilities & Services+ "Microsoft.GetHelp",+ "Microsoft.GetStarted",+ "Microsoft.Messaging",+ "Microsoft.OneConnect",+ "Microsoft.People",+ "Microsoft.WindowsFeedbackHub",+ "Microsoft.WindowsMaps",+ "Microsoft.YourPhone",+ "Microsoft.OneNote",+ "Microsoft.Todos",+ "Microsoft.MicrosoftOfficeHub",+ "Microsoft.Office.OneNote",+ "Microsoft.Office.Sway",+ "Microsoft.SkypeApp",+ "Microsoft.Wallet",+ "Microsoft.MSWallet",+ "Microsoft.RemoteDesktop",+ "Microsoft.OutlookForWindows",+ "Microsoft.LinkedInForWindows",++ // Mixed Reality & 3D+ "Microsoft.Microsoft3DViewer",+ "Microsoft.MixedReality.Portal",+ "Microsoft.Print3D",+ "Microsoft.3DBuilder",+ "Microsoft.Paint3D",++ // Multimedia (Legacy/Redundant)+ "Microsoft.ZuneMusic",+ "Microsoft.ZuneVideo",+ "Microsoft.Sway",+ "Microsoft.WindowsSoundRecorder",++ // Entertainment & Games+ "Microsoft.MicrosoftSolitaireCollection",+ "Microsoft.WindowsAlarms",+ "Microsoft.549981C3F5F10", // Cortana++ // Third-party (often pre-installed by MS)+ "SpotifyAB.SpotifyMusic",+ "Disney.DisneyPlus",+ "Amazon.Amazon",+ "Clipchamp.Clipchamp",++ // Legacy / Others+ "WindowsPhone",+ "CommsPhone",+ "Microsoft.DrawboardPDF"};- public static readonly Dictionary<string, string> CautionApps = new()+ public static readonly HashSet<string> CautionApps = new(){- ["Microsoft.WindowsCalculator"] = "Calculator",- ["Microsoft.Windows.Photos"] = "Photos",- ["Microsoft.MSPaint"] = "Paint",- ["Microsoft.Paint3D"] = "Paint 3D",- ["Microsoft.ScreenSketch"] = "Snipping Tool & Sketch",- ["Microsoft.WindowsStore"] = "Microsoft Store",- ["Microsoft.XboxIdentityProvider"] = "Xbox Identity Provider",- ["Microsoft.WindowsTerminal"] = "Windows Terminal",- ["Microsoft.WindowsTerminalPreview"] = "Windows Terminal (Preview)",- ["Clipchamp.Clipchamp"] = "Clipchamp (Video Editor)",- ["Microsoft.WindowsNotepad"] = "Notepad",- ["Microsoft.PowerAutomateDesktop"] = "Power Automate",- ["MicrosoftTeams"] = "Microsoft Teams",- ["MicrosoftCorporationII.MicrosoftFamily"] = "Microsoft Family Safety",- ["MicrosoftCorporationII.MicrosoftSupportDiagnosticTool"] = "Support Diagnostic Tool",- // Extensions- ["Microsoft.HEIFImageExtension"] = "HEIF Image Extension",- ["Microsoft.WebMediaExtensions"] = "Web Media Extensions",- ["Microsoft.WebpImageExtension"] = "WebP Image Extension",- ["Microsoft.RawImageExtension"] = "Raw Image Extension",- ["Microsoft.VP9VideoExtensions"] = "VP9 Video Extension",- ["Microsoft.AV1VideoExtension"] = "AV1 Video Extension",- // Xbox / Game Bar- ["Microsoft.XboxSpeechToTextOverlay"] = "Xbox Speech Overlay",- ["Microsoft.XboxGameOverlay"] = "Xbox Game Overlay",- ["Microsoft.XboxGamingOverlay"] = "Xbox Game Bar",- ["Microsoft.XboxApp"] = "Xbox Console Companion",- ["Microsoft.Xbox.TCUI"] = "Xbox TCUI"+ // Core Utilities+ "Microsoft.WindowsCalculator",+ "Microsoft.WindowsPhotos",+ "Microsoft.MSPaint",+ "Microsoft.WindowsNotepad",+ "Microsoft.WindowsCamera",+ "Microsoft.ScreenSketch",++ // System Tools+ "Microsoft.WindowsStore",+ "Microsoft.StorePurchaseApp",+ "Microsoft.DesktopAppInstaller",+ "Microsoft.WindowsTerminal",+ "Microsoft.WindowsTerminalPreview",+ "Microsoft.PowerAutomateDesktop",++ // Communication+ "MicrosoftTeams",+ "Microsoft.WindowsCommunicationsApps",++ // Security & Family+ "MicrosoftCorporationII.MicrosoftFamily",+ "MicrosoftCorporationII.MicrosoftSupportDiagnosticTool",++ // Extensions (Essential for files)+ "Microsoft.HEIFImageExtension",+ "Microsoft.WebMediaExtensions",+ "Microsoft.WebpImageExtension",+ "Microsoft.RawImageExtension",+ "Microsoft.VP9VideoExtensions",+ "Microsoft.AV1VideoExtension",+ "Microsoft.HEVCVideoExtension",+ "Microsoft.MPEG2VideoExtension",++ // Xbox / Gaming Services+ "Microsoft.XboxIdentityProvider",+ "Microsoft.XboxSpeechToTextOverlay",+ "Microsoft.XboxGameOverlay",+ "Microsoft.XboxGamingOverlay",+ "Microsoft.XboxApp",+ "Microsoft.Xbox.TCUI",+ "Microsoft.GamingApp"};}\ No newline at end of filediff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resxindex 726b1f1..60102de 100644--- a/optimizerDuck/Resources/Languages/Translations.resx+++ b/optimizerDuck/Resources/Languages/Translations.resx@@ -831,7 +831,7 @@ Current version: {0}]]></value><value>Bloatware</value></data><data name="Settings.Bloatware.RemoveProvisioned.Title" xml:space="preserve">- <value>Also remove Provisioned packages</value>+ <value>Remove Provisioned packages</value></data><data name="Settings.Bloatware.RemoveProvisioned.Description" xml:space="preserve"><value>When removing installed AppX packages, also remove the corresponding Provisioned packages to prevent automatic reinstallation for new users.</value>diff --git a/optimizerDuck/Resources/Languages/Translations.ru-RU.resx b/optimizerDuck/Resources/Languages/Translations.ru-RU.resxindex c8ebf42..8ce0bd9 100644--- a/optimizerDuck/Resources/Languages/Translations.ru-RU.resx+++ b/optimizerDuck/Resources/Languages/Translations.ru-RU.resx@@ -876,7 +876,7 @@<value>Ненужные приложения</value></data><data name="Settings.Bloatware.RemoveProvisioned.Title" xml:space="preserve">- <value>Также удалять подготовленные пакеты</value>+ <value>Удалять подготовленные пакеты</value></data><data name="Settings.Bloatware.RemoveProvisioned.Description" xml:space="preserve"><value>При удалении установленных пакетов AppX также удалять соответствующие подготовленные пакеты, чтобы предотвратить автоматическую переустановку для новых пользователей.</value>diff --git a/optimizerDuck/Resources/Languages/Translations.vi-vn.resx b/optimizerDuck/Resources/Languages/Translations.vi-vn.resxindex 622d04f..f6cbaca 100644--- a/optimizerDuck/Resources/Languages/Translations.vi-vn.resx+++ b/optimizerDuck/Resources/Languages/Translations.vi-vn.resx@@ -828,7 +828,7 @@ Phiên bản hiện tại: {0}]]> </value><value>Bloatware</value></data><data name="Settings.Bloatware.RemoveProvisioned.Title" xml:space="preserve">- <value>Cũng xóa gói Provisioned</value>+ <value>Xóa gói Provisioned</value></data><data name="Settings.Bloatware.RemoveProvisioned.Description" xml:space="preserve"><value>Khi xóa gói AppX đã cài đặt, cũng xóa luôn các gói Provisioned tương ứng để ngăn tự động cài lại cho người dùng mới.</value>diff --git a/optimizerDuck/Resources/Languages/Translations.zh-Hans-CN.resx b/optimizerDuck/Resources/Languages/Translations.zh-Hans-CN.resxindex 172e6a6..b5c3653 100644--- a/optimizerDuck/Resources/Languages/Translations.zh-Hans-CN.resx+++ b/optimizerDuck/Resources/Languages/Translations.zh-Hans-CN.resx@@ -876,7 +876,7 @@<value>臃肿软件</value></data><data name="Settings.Bloatware.RemoveProvisioned.Title" xml:space="preserve">- <value>同时移除已配置包</value>+ <value>移除已配置包</value></data><data name="Settings.Bloatware.RemoveProvisioned.Description" xml:space="preserve"><value>移除已安装的 AppX 包时,同时移除对应的已配置包,以防止新用户时自动重新安装。</value>diff --git a/optimizerDuck/Services/BloatwareService.cs b/optimizerDuck/Services/BloatwareService.csindex 87bbc7c..7c5d240 100644--- a/optimizerDuck/Services/BloatwareService.cs+++ b/optimizerDuck/Services/BloatwareService.cs@@ -7,6 +7,8 @@ using optimizerDuck.Core.Models.Config;using optimizerDuck.Services.OptimizationServices;using System.Text.Json;using System.Text.Json.Serialization;+using System.Linq;+using System.Text.RegularExpressions;using JsonSerializer = System.Text.Json.JsonSerializer;namespace optimizerDuck.Services;@@ -17,43 +19,28 @@ public class BloatwareService(ILogger<BloatwareService> logger, IOptionsMonitor<{try{+ var safePattern = string.Join("|", Shared.SafeApps.Select(Regex.Escape));+ var cautionPattern = string.Join("|", Shared.CautionApps.Select(Regex.Escape));+var result = await ShellService.PowerShellAsync($$"""- # SAFE_APPS- $safeApps = "{{string.Join(",", Shared.SafeApps.Keys)}}" -split "," |- ForEach-Object { $_.Trim().ToLower() }-- # CAUTION_APPS- $cautionApps = "{{string.Join(",", Shared.CautionApps.Keys)}}" -split "," |- ForEach-Object { $_.Trim().ToLower() }-- # Installed removable apps- $installedApps = Get-AppxPackage | Where-Object { $_.NonRemovable -eq 0 }-- # Build result array efficiently- $result = foreach ($app in $installedApps) {- $nameLower = $app.Name.ToLower()- $risk = "Unknown"-- if ($safeApps | Where-Object { $nameLower -like "*$_*" }) {- $risk = "Safe"- }- elseif ($cautionApps | Where-Object { $nameLower -like "*$_*" }) {- $risk = "Caution"- }-- [PSCustomObject]@{- Name = $app.Name- PackageFullName = $app.PackageFullName- Publisher = $app.Publisher- Version = $app.Version.ToString()- InstallLocation = if ($app.InstallLocation) { $app.InstallLocation } else { "" }- Risk = $risk- }- }-- @($result) | ConvertTo-Json -Depth 4-- """);+ $safeRegex = '{{safePattern}}'+ $cautionRegex = '{{cautionPattern}}'++ Get-AppxPackage | Where-Object { $_.NonRemovable -eq $false } | ForEach-Object {+ $risk = "Unknown"+ if ($_.Name -match $safeRegex) { $risk = "Safe" }+ elseif ($_.Name -match $cautionRegex) { $risk = "Caution" }++ [PSCustomObject]@{+ Name = $_.Name+ PackageFullName = $_.PackageFullName+ Publisher = $_.Publisher+ Version = $_.Version.ToString()+ InstallLocation = if ($_.InstallLocation) { $_.InstallLocation } else { "" }+ Risk = $risk+ }+ } | ConvertTo-Json -Depth 2+ """);var options = new JsonSerializerOptions{