Skip to content

Portable Tool for an Ideal Windows Setup

-simplify handling & ways to remove Edge

Greedeks51fd25d79f3f
diff --git a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
index 6e430141..77612f0c 100644
--- a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
+++ b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
@@ -18,7 +18,7 @@ namespace GTweak.Utilities.Tweaks
private static bool isLocalAccount = false;
private static readonly string pathPackage = Path.Combine(StoragePaths.SystemDisk, "Program Files", "WindowsApps");
- internal static readonly Dictionary<string, (string Alias, bool IsUnavailable, List<string> Scripts)> PackagesDetails = new Dictionary<string, (string Alias, bool IsUnavailable, List<string> Scripts)>()
+ private static readonly Dictionary<string, (string Alias, bool IsUnavailable, List<string> Scripts)> PackagesDetails = new Dictionary<string, (string Alias, bool IsUnavailable, List<string> Scripts)>()
{
["MicrosoftStore"] = (null, false, new List<string> { "Microsoft.WindowsStore" }),
["Todos"] = ("TodoList", false, new List<string> { "Microsoft.Todos", "Microsoft.ToDo" }),
@@ -67,6 +67,18 @@ namespace GTweak.Utilities.Tweaks
["OneDrive"] = (null, false, null)
};
+ internal static bool HandleAvailabilityStatus(string key, bool? isUnavailable = null)
+ {
+ if (PackagesDetails.TryGetValue(key, out var details))
+ {
+ if (isUnavailable.HasValue)
+ PackagesDetails[key] = (details.Alias, isUnavailable.Value, details.Scripts);
+
+ return details.IsUnavailable;
+ }
+ return false;
+ }
+
internal async void ViewInstalledPackages() => InstalledPackages = await CommandExecutor.GetCommandOutput("Get-AppxPackage | Select-Object -ExpandProperty Name");
internal static Task DeletingPackage(string packageName)
@@ -239,6 +251,7 @@ namespace GTweak.Utilities.Tweaks
TrustedInstaller.CreateProcessAsTrustedInstaller(SettingsRepository.PID, $@"cmd.exe /c for /f ""delims="" %i in ('dir /b /s ""{StoragePaths.SystemDisk}Windows\System32\Tasks\*Edge*""') do (if exist ""%i"" (if exist ""%i\"" (rmdir /s /q ""%i"") else (del /f /q ""%i"")))");
RegistryHelp.DeleteValue(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Run", "MicrosoftEdgeAutoLaunch_03AF54719E0271FA0A92D5F15CBA10EA");
+ RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SOFTWARE\Policies\Microsoft\Edge", true);
RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SOFTWARE\Microsoft\Active Setup\Installed Components\{9459C573-B17A-45AE-9F64-1857B5D58CEE}", true);
RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\edgeupdate", true);
RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\edgeupdatem", true);
@@ -250,6 +263,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView", true);
RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SOFTWARE\Classes\MSEdgeHTM", true);
RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SOFTWARE\Clients\StartMenuInternet\Microsoft Edge", true);
+ RegistryHelp.DeleteFolderTree(Registry.ClassesRoot, @"AppID\MicrosoftEdgeUpdate.exe", true);
foreach (var path in new[] { Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft", "Edge"), Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft", "EdgeCore"),
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft", "EdgeUpdate"), Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft", "EdgeWebView"), Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft", "Temp")})
diff --git a/.Source/GTweak/View/PakagesView.xaml.cs b/.Source/GTweak/View/PakagesView.xaml.cs
index b9f53e16..a2ad3723 100644
--- a/.Source/GTweak/View/PakagesView.xaml.cs
+++ b/.Source/GTweak/View/PakagesView.xaml.cs
@@ -18,7 +18,7 @@ namespace GTweak.View
{
private readonly DispatcherTimer timer;
private TimeSpan time = TimeSpan.FromSeconds(0);
- private string applicationName = string.Empty;
+ private string packageName = string.Empty;
public PakagesView()
{
@@ -56,17 +56,17 @@ namespace GTweak.View
private async void ClickApp_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
- Image appImage = (Image)sender;
- applicationName = appImage.Name;
+ Image pakageImage = (Image)sender;
+ packageName = pakageImage.Name;
switch (e.LeftButton)
{
- case MouseButtonState.Pressed when appImage.Source == (DrawingImage)FindResource("A_DI_" + applicationName):
+ case MouseButtonState.Pressed when Equals(pakageImage.Source, FindResource("A_DI_" + packageName)):
{
timer.Stop();
BackgroundQueue backgroundQueue = new BackgroundQueue();
- await backgroundQueue.QueueTask(delegate { UninstallingPakages.DeletingPackage(applicationName); });
+ await backgroundQueue.QueueTask(delegate { UninstallingPakages.DeletingPackage(packageName); });
await backgroundQueue.QueueTask(async delegate
{
@@ -74,17 +74,17 @@ namespace GTweak.View
{
await Dispatcher.InvokeAsync(() =>
{
- UninstallingPakages.PackagesDetails[appImage.Name] = (UninstallingPakages.PackagesDetails[appImage.Name].Alias, true, UninstallingPakages.PackagesDetails[appImage.Name].Scripts);
+ UninstallingPakages.HandleAvailabilityStatus(packageName, true);
UpdateViewStatePakages();
});
- await UninstallingPakages.DeletingPackage(applicationName);
+ await UninstallingPakages.DeletingPackage(packageName);
await Task.Delay(3000);
await Dispatcher.InvokeAsync(() =>
{
- UninstallingPakages.PackagesDetails[appImage.Name] = (UninstallingPakages.PackagesDetails[appImage.Name].Alias, false, UninstallingPakages.PackagesDetails[appImage.Name].Scripts);
+ UninstallingPakages.HandleAvailabilityStatus(packageName, false);
UpdateViewStatePakages();
});
}
@@ -95,7 +95,7 @@ namespace GTweak.View
break;
}
- case MouseButtonState.Pressed when appImage.Source == (DrawingImage)FindResource("DA_DI_" + applicationName) && applicationName == "OneDrive":
+ case MouseButtonState.Pressed when Equals(pakageImage.Source, FindResource("DA_DI_" + packageName)) && packageName == "OneDrive":
{
timer.Stop();
@@ -108,7 +108,7 @@ namespace GTweak.View
{
await Dispatcher.InvokeAsync(() =>
{
- UninstallingPakages.PackagesDetails[appImage.Name] = (UninstallingPakages.PackagesDetails[appImage.Name].Alias, true, UninstallingPakages.PackagesDetails[appImage.Name].Scripts);
+ UninstallingPakages.HandleAvailabilityStatus(packageName, true);
UpdateViewStatePakages();
});
@@ -116,7 +116,7 @@ namespace GTweak.View
await Dispatcher.InvokeAsync(() =>
{
- UninstallingPakages.PackagesDetails[appImage.Name] = (UninstallingPakages.PackagesDetails[appImage.Name].Alias, false, UninstallingPakages.PackagesDetails[appImage.Name].Scripts);
+ UninstallingPakages.HandleAvailabilityStatus(packageName, false);
UpdateViewStatePakages();
});
}
@@ -136,8 +136,8 @@ namespace GTweak.View
static bool isContains(string pattern) => new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.IgnorePatternWhitespace).IsMatch(UninstallingPakages.InstalledPackages);
return !isOneDrive
- ? !UninstallingPakages.PackagesDetails[packageName].IsUnavailable ? isContains(partName) ? (DrawingImage)FindResource($"A_DI_{packageName}") : (DrawingImage)FindResource($"DA_DI_{packageName}") : (DrawingImage)FindResource("DI_Sandtime")
- : !UninstallingPakages.PackagesDetails[packageName].IsUnavailable ? UninstallingPakages.IsOneDriveInstalled ? (DrawingImage)FindResource($"A_DI_{packageName}") : (DrawingImage)FindResource($"DA_DI_{packageName}") : (DrawingImage)FindResource("DI_Sandtime");
+ ? !UninstallingPakages.HandleAvailabilityStatus(packageName) ? isContains(partName) ? (DrawingImage)FindResource($"A_DI_{packageName}") : (DrawingImage)FindResource($"DA_DI_{packageName}") : (DrawingImage)FindResource("DI_Sandtime")
+ : !UninstallingPakages.HandleAvailabilityStatus(packageName) ? UninstallingPakages.IsOneDriveInstalled ? (DrawingImage)FindResource($"A_DI_{packageName}") : (DrawingImage)FindResource($"DA_DI_{packageName}") : (DrawingImage)FindResource("DI_Sandtime");
}
private void UpdateViewStatePakages()