Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
A
itsfatduck27a9bb34b780
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.csindex a1de388..c1a53f4 100644--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs@@ -1,7 +1,6 @@//------------------------------------------------------------------------------// <auto-generated>// This code was generated by a tool.-// Runtime Version:4.0.30319.42000//// Changes to this file may cause incorrect behavior and will be lost if// the code is regenerated.@@ -749,8 +748,8 @@ namespace optimizerDuck.Resources.Languages {/// </summary>public static string Optimizer_BloatwareAndServices_ConfigureServices_Progress_ChangeServiceStartupType {get {- return ResourceManager.GetString("Optimizer.BloatwareAndServices.ConfigureServices.Progress.ChangeServiceStartupTyp" +- "e", resourceCulture);+ return ResourceManager.GetString(("Optimizer.BloatwareAndServices.ConfigureServices.Progress.ChangeServiceStartupTyp" ++ "e"), resourceCulture);}}@@ -1209,8 +1208,8 @@ namespace optimizerDuck.Resources.Languages {/// </summary>public static string Optimizer_PowerManagement_InstallOptimizerDuckPowerPlan_Error_DetectActivePlanFailed {get {- return ResourceManager.GetString("Optimizer.PowerManagement.InstallOptimizerDuckPowerPlan.Error.DetectActivePlanFai" +- "led", resourceCulture);+ return ResourceManager.GetString(("Optimizer.PowerManagement.InstallOptimizerDuckPowerPlan.Error.DetectActivePlanFai" ++ "led"), resourceCulture);}}@@ -2331,6 +2330,33 @@ namespace optimizerDuck.Resources.Languages {}}+ /// <summary>+ /// Looks up a localized string similar to Bloatware.+ /// </summary>+ public static string Settings_Bloatware_Header {+ get {+ return ResourceManager.GetString("Settings.Bloatware.Header", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Remove installed and provisioned AppX packages.+ /// </summary>+ public static string Settings_Bloatware_RemoveProvisioned_Description {+ get {+ return ResourceManager.GetString("Settings.Bloatware.RemoveProvisioned.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Remove AppX Packages (Installed & Provisioned).+ /// </summary>+ public static string Settings_Bloatware_RemoveProvisioned_Title {+ get {+ return ResourceManager.GetString("Settings.Bloatware.RemoveProvisioned.Title", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to You are about to delete all resources downloaded or generated during the optimization process. Please note that this action is permanent and cannot be undone, so make sure you are certain before proceeding../// </summary>diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resxindex 04541c6..0368284 100644--- a/optimizerDuck/Resources/Languages/Translations.resx+++ b/optimizerDuck/Resources/Languages/Translations.resx@@ -827,4 +827,13 @@ Current version: {0}]]></value><data name="BloatwareDialog.Confirmation.Message" xml:space="preserve"><value></value></data>+ <data name="Settings.Bloatware.Header" xml:space="preserve">+ <value>Bloatware</value>+ </data>+ <data name="Settings.Bloatware.RemoveProvisioned.Title" xml:space="preserve">+ <value>Remove AppX Packages (Installed & Provisioned)</value>+ </data>+ <data name="Settings.Bloatware.RemoveProvisioned.Description" xml:space="preserve">+ <value>Remove installed and provisioned AppX packages</value>+ </data></root>\ No newline at end of filediff --git a/optimizerDuck/Resources/Languages/Translations.vi-vn.resx b/optimizerDuck/Resources/Languages/Translations.vi-vn.resxindex 1a49b17..1535393 100644--- a/optimizerDuck/Resources/Languages/Translations.vi-vn.resx+++ b/optimizerDuck/Resources/Languages/Translations.vi-vn.resx@@ -825,4 +825,13 @@ Phiên bản hiện tại: {0}]]> </value><data name="BloatwareDialog.Confirmation.Message" xml:space="preserve"><value>Bạn chuẩn bị sẽ xóa: {0}</value></data>+ <data name="Settings.Bloatware.Header" xml:space="preserve">+ <value>Bloatware</value>+ </data>+ <data name="Settings.Bloatware.RemoveProvisioned.Title" xml:space="preserve">+ <value>Xóa Gói AppX (Đã cài đặt & Provisioned)</value>+ </data>+ <data name="Settings.Bloatware.RemoveProvisioned.Description" xml:space="preserve">+ <value>Xóa các gói AppX đã cài đặt và gói hệ thống provisioned (các gói được cài sẵn trong hệ thống)</value>+ </data></root>\ No newline at end of filediff --git a/optimizerDuck/Services/BloatwareService.cs b/optimizerDuck/Services/BloatwareService.csindex ec74b37..b710975 100644--- a/optimizerDuck/Services/BloatwareService.cs+++ b/optimizerDuck/Services/BloatwareService.cs@@ -18,42 +18,42 @@ public class BloatwareService(ILogger<BloatwareService> logger, IOptionsMonitor<try{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-- """);+ # 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++ """);var options = new JsonSerializerOptions{@@ -61,7 +61,8 @@ public class BloatwareService(ILogger<BloatwareService> logger, IOptionsMonitor<Converters = { new JsonStringEnumConverter() }};- var apps = JsonSerializer.Deserialize<List<AppXPackage>>(result.Stdout, options)!.OrderBy(a => a.Name).ToList();+ var apps = JsonSerializer.Deserialize<List<AppXPackage>>(result.Stdout, options)!.OrderBy(a => a.Name)+ .ToList();logger.LogInformation("Found {AppCount} AppX packages", apps.Count);@@ -89,47 +90,60 @@ public class BloatwareService(ILogger<BloatwareService> logger, IOptionsMonitor<appXPackage.Name, appXPackage.PackageFullName);var script = $$"""- $pkg = "{{appXPackage.PackageFullName}}"-- Write-Output "Removing installed package..."-- Get-AppxPackage -AllUsers |- Where-Object { $_.PackageFullName -eq $pkg } |- ForEach-Object {- try {- Remove-AppxPackage -Package $_.PackageFullName -AllUsers -ErrorAction Stop- Write-Output "Removed installed package: $($_.PackageFullName)"- } catch {- Write-Output "Failed removing installed package: $($_.PackageFullName)"- }- }- """;+ $pkgFull = "{{appXPackage.PackageFullName}}"+ $pkgName = $pkgFull.Split('_')[0] + "_" + $pkgFull.Split('_')[-1]++ Write-Output "Searching installed package..."++ $installed = Get-AppxPackage -AllUsers | Where-Object { $_.PackageFullName -eq $pkgFull }++ if (-not $installed) {+ Write-Output "Installed package not found"+ }+ else {+ foreach ($p in $installed) {+ try {+ Remove-AppxPackage -Package $p.PackageFullName -ErrorAction Stop+ Write-Output "Removed installed package: $($p.PackageFullName)"+ } catch {+ Write-Output "Failed removing installed package: $($p.PackageFullName)"+ }+ }+ }+ """;+if (appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned){script += """-- Write-Output "Removing provisioned package..."-- Get-AppxProvisionedPackage -Online |- Where-Object { $_.PackageName -like "*$pkg*" } |- ForEach-Object {- try {- Remove-AppxProvisionedPackage -Online -PackageName $_.PackageName -ErrorAction Stop | Out-Null- Write-Output "Removed provisioned package: $($_.PackageName)"- } catch {- Write-Output "Failed removing provisioned package: $($_.PackageName)"- }- }- """;+ Write-Output "Searching provisioned package..."++ $prov = Get-AppxProvisionedPackage -Online |+ Where-Object { $_.PackageName -eq $pkgName }++ if (-not $prov) {+ Write-Output "Provisioned package not found"+ }+ else {+ foreach ($p in $prov) {+ try {+ Remove-AppxProvisionedPackage -Online -PackageName $p.PackageName -ErrorAction Stop | Out-Null+ Write-Output "Removed provisioned package: $($p.PackageName)"+ } catch {+ Write-Output "Failed removing provisioned package: $($p.PackageName)"+ }+ }+ }+ """;}else{script += """- Write-Output "Skipping provisioned package removal (disabled by user)"- """;+ Write-Output "Skipping provisioned package removal (disabled by user)"+ """;}+var result = await ShellService.PowerShellAsync(script);if (!string.IsNullOrWhiteSpace(result.Stderr))diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.csindex 20ea5e8..e043696 100644--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs@@ -61,6 +61,7 @@ public partial class SettingsViewModel({SelectedCultureName = appOptionsMonitor.CurrentValue.App.Language;ShellTimeoutMs = appOptionsMonitor.CurrentValue.Optimize.ShellTimeoutMs;+ RemoveProvisioned = appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned;CurrentApplicationTheme = ApplicationThemeManager.GetAppTheme();ApplicationThemeManager.Changed += OnThemeChanged;@@ -169,6 +170,14 @@ public partial class SettingsViewModel(}}+ [RelayCommand]+ private void ToggleRemoveProvisioned()+ {+ if (!_isInitialized) return;+ _ = configManager.SetAsync("bloatware:removeProvisioned",+ (!appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned).ToString());+ }+[RelayCommand]private void OpenLatestRelease(){diff --git a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml b/optimizerDuck/UI/Views/Pages/SettingsPage.xamlindex ba2bf23..da6bdc6 100644--- a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml+++ b/optimizerDuck/UI/Views/Pages/SettingsPage.xaml@@ -1,22 +1,22 @@<Page+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ Margin="0,32,0,0"+ Title="SettingsPage"+ d:DataContext="{d:DesignInstance pages:SettingsPage}"+ d:DesignHeight="1200"+ d:DesignWidth="800"+ mc:Ignorable="d"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"x:Class="optimizerDuck.UI.Views.Pages.SettingsPage"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:converters="clr-namespace:optimizerDuck.Common.Helpers.Converters"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="SettingsPage"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance pages:SettingsPage}"- d:DesignHeight="1200"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- mc:Ignorable="d">+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"><Page.Resources><converters:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />@@ -37,9 +37,9 @@<ui:CardControl.Header><StackPanel><ui:TextBlock- Margin="0"FontTypography="BodyStrong"Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ Margin="0"Text="{ext:Loc Settings.Appearance.LanguageSelector.Title}"TextWrapping="Wrap" /><ui:TextBlock@@ -59,9 +59,9 @@<ui:CardControl.Header><StackPanel><ui:TextBlock- Margin="0"Appearance="Primary"FontTypography="BodyStrong"+ Margin="0"Text="{ext:Loc Settings.Appearance.ThemeSelector.Title}"TextWrapping="Wrap" /><ui:TextBlock@@ -87,9 +87,9 @@<ui:CardControl.Header><StackPanel><ui:TextBlock- Margin="0"Appearance="Primary"FontTypography="BodyStrong"+ Margin="0"Text="{ext:Loc Settings.Optimize.ShellTimeout.Title}"TextWrapping="Wrap" /><ui:TextBlock@@ -120,9 +120,9 @@<ui:CardControl.Header><StackPanel><ui:TextBlock- Margin="0"Appearance="Primary"FontTypography="BodyStrong"+ Margin="0"Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Title}"TextWrapping="Wrap" /><ui:TextBlock@@ -132,7 +132,7 @@</StackPanel></ui:CardControl.Header>- <ui:ToggleSwitch Command />+ <ui:ToggleSwitch Command="{Binding ViewModel.ToggleRemoveProvisionedCommand}" IsChecked="{Binding ViewModel.RemoveProvisioned}" /></ui:CardControl></StackPanel>@@ -146,9 +146,9 @@<ui:CardControl.Header><StackPanel><ui:TextBlock- Margin="0"Appearance="Primary"FontTypography="BodyStrong"+ Margin="0"Text="{ext:Loc Settings.Advanced.ClearResources.Title}"TextWrapping="Wrap" /><ui:TextBlock@@ -159,21 +159,21 @@</ui:CardControl.Header><ui:Button- VerticalAlignment="Center"Appearance="Danger"Command="{Binding ViewModel.ClearResourcesCommand}"Content="{ext:Loc Button.Clear}"Cursor="Hand"- Icon="{ui:SymbolIcon Delete24}" />+ Icon="{ui:SymbolIcon Delete24}"+ VerticalAlignment="Center" /></ui:CardControl><ui:CardControl Icon="{ui:SymbolIcon DatabaseLightning20}"><ui:CardControl.Header><StackPanel><ui:TextBlock- Margin="0"Appearance="Primary"FontTypography="BodyStrong"+ Margin="0"Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"TextWrapping="Wrap" /><ui:TextBlock@@ -184,21 +184,21 @@</ui:CardControl.Header><ui:Button- VerticalAlignment="Center"Appearance="Danger"Command="{Binding ViewModel.ClearAllRevertDataCommand}"Content="{ext:Loc Button.Clear}"Cursor="Hand"- Icon="{ui:SymbolIcon Delete24}" />+ Icon="{ui:SymbolIcon Delete24}"+ VerticalAlignment="Center" /></ui:CardControl><ui:CardControl Icon="{ui:SymbolIcon Folder24}"><ui:CardControl.Header><StackPanel><ui:TextBlock- Margin="0"Appearance="Primary"FontTypography="BodyStrong"+ Margin="0"Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"TextWrapping="Wrap" /><ui:TextBlock@@ -209,11 +209,11 @@</ui:CardControl.Header><ui:Button- VerticalAlignment="Center"Command="{Binding ViewModel.OpenRootDirCommand}"Content="{ext:Loc Button.Open}"Cursor="Hand"- Icon="{ui:SymbolIcon OpenFolder24}" />+ Icon="{ui:SymbolIcon OpenFolder24}"+ VerticalAlignment="Center" /></ui:CardControl></StackPanel>@@ -250,7 +250,7 @@Icon="{ui:SymbolIcon Open24}" /></ui:CardControl>- <ui:CardAction VerticalAlignment="Stretch" Command="{Binding ViewModel.OpenAcknowledgementsCommand}">+ <ui:CardAction Command="{Binding ViewModel.OpenAcknowledgementsCommand}" VerticalAlignment="Stretch"><ui:CardAction.Icon><ui:SymbolIcon Symbol="DocumentHeart24" /></ui:CardAction.Icon>@@ -268,8 +268,8 @@</ui:CardAction><ui:TextBlock- Margin="0,15,0,0"FontTypography="Subtitle"+ Margin="0,15,0,0"Text="{ext:Loc Settings.About.LearnMore}"TextTrimming="WordEllipsis"TextWrapping="Wrap" />