From 0c42af80437b09a4b8c588d1ffdcdd5e007f5189 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Sun, 1 Dec 2024 15:49:04 +0330
Subject: [PATCH] refactor vsix

---
 .../Common/NugetClientHelper.cs               |  8 ++---
 .../Common/Options/GlobalUsingOption.cs       |  2 +-
 .../Common/PreDefinedLibrary.cs               |  6 ++--
 .../Common/PredefinedCodes.cs                 |  2 +-
 .../DevWinUI_Template/Common/WizardConfig.cs  |  2 +-
 .../DevWinUI_TemplatePackage.cs               |  4 +--
 .../TemplateWizard/SharedWizard.cs            | 15 +++++-----
 .../WinUIAppBlankUnitTestWizard.cs            |  6 ++--
 .../TemplateWizard/WinUIAppBlankWizard.cs     |  6 ++--
 .../WinUIAppMVVMNavigationWizard.cs           | 14 ++++-----
 .../TemplateWizard/WinUIAppMVVMWizard.cs      | 12 ++++----
 .../WinUIAppNavigationWizard.cs               | 30 +++++++++----------
 .../TemplateWizard/WinUIAppWizard.cs          | 12 ++++----
 .../Views/MainWindow.xaml.cs                  | 12 ++++----
 .../source.extension.vsixmanifest             |  2 +-
 15 files changed, 63 insertions(+), 70 deletions(-)

diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/NugetClientHelper.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/NugetClientHelper.cs
index e43686f..c834778 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/NugetClientHelper.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/NugetClientHelper.cs
@@ -1,12 +1,12 @@
-using NuGet.Common;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NuGet.Common;
 using NuGet.Configuration;
 using NuGet.Packaging.Core;
 using NuGet.Protocol;
 using NuGet.Protocol.Core.Types;
 using NuGet.Versioning;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace DevWinUI_Template
 {
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/Options/GlobalUsingOption.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/Options/GlobalUsingOption.cs
index 7cff247..4dc37cf 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/Options/GlobalUsingOption.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/Options/GlobalUsingOption.cs
@@ -10,7 +10,7 @@ public class GlobalUsingOption
         public GlobalUsingOption(Dictionary<string, string> replacementsDictionary, string safeProjectName, bool fileLogger, bool debugLogger)
         {
             StringBuilder outputBuilder = new StringBuilder();
-            
+
             if (WizardConfig.UseJsonSettings)
             {
                 outputBuilder.AppendLine(Environment.NewLine + $"global using static {safeProjectName}.Common.AppHelper;");
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PreDefinedLibrary.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PreDefinedLibrary.cs
index 2cac25b..ba18526 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PreDefinedLibrary.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PreDefinedLibrary.cs
@@ -23,7 +23,7 @@ public class Library
     public bool IsSelected { get; set; }
     public Library()
     {
-        
+
     }
     public Library(string name, string version, string net9Version, Group group, bool includePreRelease = false)
     {
@@ -37,7 +37,7 @@ public Library(string name, string version, string net9Version, Group group, boo
     public Library(string name, Group group, bool includePreRelease = false)
     {
         Name = name;
-        Group= group;
+        Group = group;
         IncludePreRelease = includePreRelease;
         Net9Version = null;
         Version = null;
@@ -45,7 +45,7 @@ public Library(string name, Group group, bool includePreRelease = false)
     public Library(string name, bool includePreRelease = false)
     {
         Name = name;
-        Group= Group.None;
+        Group = Group.None;
         IncludePreRelease = includePreRelease;
         Net9Version = null;
         Version = null;
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PredefinedCodes.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PredefinedCodes.cs
index b183dc9..b9e157b 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PredefinedCodes.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PredefinedCodes.cs
@@ -41,7 +41,7 @@ public static class PredefinedCodes
     await menuService.SaveAsync(menu);
 }
 """";
-        
+
         public static readonly string SettingsCardCommentCode =
 """
 <!-- <dev:SettingsCard Description="Your Description"
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/WizardConfig.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/WizardConfig.cs
index 2dec488..055e468 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/WizardConfig.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/WizardConfig.cs
@@ -19,7 +19,7 @@ public static class WizardConfig
         public static string SolutionFolderName = "Solution Items";
         public static string TrimMode = "partial";
         public static string Nullable = "disable";
-        
+
         public static bool UseGithubWorkflowFile;
         public static bool UseXamlStylerFile;
 
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_TemplatePackage.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_TemplatePackage.cs
index e6e2101..be47b79 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_TemplatePackage.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_TemplatePackage.cs
@@ -1,7 +1,7 @@
-using Microsoft.VisualStudio.Shell;
-using System;
+using System;
 using System.Runtime.InteropServices;
 using System.Threading;
+using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
 
 namespace DevWinUI_Template
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/SharedWizard.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/SharedWizard.cs
index ca7d270..5835337 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/SharedWizard.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/SharedWizard.cs
@@ -4,8 +4,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using DevWinUI_Template.Options;
+using DevWinUI_Template.WizardUI;
 using EnvDTE;
-
 using EnvDTE80;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
@@ -13,8 +14,6 @@
 using Microsoft.VisualStudio.TemplateWizard;
 using Microsoft.VisualStudio.Threading;
 using NuGet.VisualStudio;
-using DevWinUI_Template.Options;
-using DevWinUI_Template.WizardUI;
 
 namespace DevWinUI_Template
 {
@@ -120,10 +119,10 @@ public async void RunStarted(object automationObject, Dictionary<string, string>
             await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
 
             _dte = automationObject as _DTE;
-            
+
             var inputForm = new MainWindow();
             var result = inputForm.ShowDialog();
-            
+
             await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
 
             if (result.HasValue && result.Value)
@@ -134,7 +133,7 @@ public async void RunStarted(object automationObject, Dictionary<string, string>
                 VSIXRootFolderPath = vsix.VSIXRootFolder;
 
                 _shouldAddProjectItem = true;
-                
+
                 AddEditorConfigFile();
 
                 // Add Base Library Versions
@@ -143,7 +142,7 @@ public async void RunStarted(object automationObject, Dictionary<string, string>
                 replacementsDictionary.Add("$MinimumTargetPlatform$", WizardConfig.MinimumTargetPlatform.ToString());
                 replacementsDictionary.Add("$Platforms$", WizardConfig.Platforms.ToString());
                 replacementsDictionary.Add("$RuntimeIdentifiers$", WizardConfig.RuntimeIdentifiers.ToString());
-                
+
                 replacementsDictionary.Add("$Nullable$", WizardConfig.Nullable);
                 replacementsDictionary.Add("$TrimMode$", WizardConfig.TrimMode);
                 replacementsDictionary.Add("$PublishAot$", WizardConfig.PublishAot.ToString());
@@ -619,7 +618,7 @@ private async Task StartInstallationAsync()
                 }
             }
         }
-        
+
         private void SaveAllProjects()
         {
             ThreadHelper.ThrowIfNotOnUIThread("SaveAllProjects must be called on the UI thread.");
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppBlankUnitTestWizard.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppBlankUnitTestWizard.cs
index 6233a04..733ad3a 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppBlankUnitTestWizard.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppBlankUnitTestWizard.cs
@@ -1,7 +1,7 @@
-using EnvDTE;
-using Microsoft.VisualStudio.TemplateWizard;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using DevWinUI_Template.WizardUI;
+using EnvDTE;
+using Microsoft.VisualStudio.TemplateWizard;
 
 namespace DevWinUI_Template
 {
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppBlankWizard.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppBlankWizard.cs
index 582bc2a..bfae43c 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppBlankWizard.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppBlankWizard.cs
@@ -1,7 +1,7 @@
-using EnvDTE;
-using Microsoft.VisualStudio.TemplateWizard;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using DevWinUI_Template.WizardUI;
+using EnvDTE;
+using Microsoft.VisualStudio.TemplateWizard;
 
 namespace DevWinUI_Template
 {
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppMVVMNavigationWizard.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppMVVMNavigationWizard.cs
index 79855b2..187bfcb 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppMVVMNavigationWizard.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppMVVMNavigationWizard.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-
+using DevWinUI_Template.WizardUI;
 using EnvDTE;
-
 using Microsoft.VisualStudio.TemplateWizard;
-using DevWinUI_Template.WizardUI;
 
 namespace DevWinUI_Template
 {
@@ -109,13 +107,13 @@ public bool ShouldAddProjectItem(string filePath)
             {
                 return false;
             }
-            else if (!WizardConfig.UseHomeLandingPage && 
-                !WizardConfig.UseColorsDic && 
+            else if (!WizardConfig.UseHomeLandingPage &&
+                !WizardConfig.UseColorsDic &&
                 filePath.Contains("ThemeResources.xaml"))
             {
                 return false;
             }
-            else if (filePath.Contains("Resources") && 
+            else if (filePath.Contains("Resources") &&
                 !filePath.Contains("ThemeResources"))
             {
                 return false;
@@ -124,8 +122,8 @@ public bool ShouldAddProjectItem(string filePath)
             {
                 return false;
             }
-            else if (!WizardImplementation.UseDebugLogger && 
-                !WizardImplementation.UseFileLogger && 
+            else if (!WizardImplementation.UseDebugLogger &&
+                !WizardImplementation.UseFileLogger &&
                 filePath.Contains("LoggerSetup"))
             {
                 return false;
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppMVVMWizard.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppMVVMWizard.cs
index ecb77f7..23c9398 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppMVVMWizard.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppMVVMWizard.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-
+using DevWinUI_Template.WizardUI;
 using EnvDTE;
-
 using Microsoft.VisualStudio.TemplateWizard;
-using DevWinUI_Template.WizardUI;
 
 namespace DevWinUI_Template
 {
@@ -42,8 +40,8 @@ public bool ShouldAddProjectItem(string filePath)
                 return false;
             }
 
-            if (!WizardConfig.UseJsonSettings && 
-                (filePath.Contains("AppConfig") || 
+            if (!WizardConfig.UseJsonSettings &&
+                (filePath.Contains("AppConfig") ||
                 filePath.Contains("AppHelper")))
             {
                 return false;
@@ -57,8 +55,8 @@ public bool ShouldAddProjectItem(string filePath)
             {
                 return false;
             }
-            else if (!WizardImplementation.UseDebugLogger && 
-                !WizardImplementation.UseFileLogger && 
+            else if (!WizardImplementation.UseDebugLogger &&
+                !WizardImplementation.UseFileLogger &&
                 filePath.Contains("LoggerSetup"))
             {
                 return false;
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppNavigationWizard.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppNavigationWizard.cs
index f2121e7..6832609 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppNavigationWizard.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppNavigationWizard.cs
@@ -1,7 +1,7 @@
-using EnvDTE;
-using Microsoft.VisualStudio.TemplateWizard;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using DevWinUI_Template.WizardUI;
+using EnvDTE;
+using Microsoft.VisualStudio.TemplateWizard;
 
 namespace DevWinUI_Template
 {
@@ -40,16 +40,16 @@ public bool ShouldAddProjectItem(string filePath)
                 return false;
             }
 
-            if (!WizardConfig.UseHomeLandingPage && 
+            if (!WizardConfig.UseHomeLandingPage &&
                 filePath.Contains("HomeLanding"))
             {
                 return false;
             }
-            else if (!WizardConfig.UseSettingsPage && 
-                (filePath.Contains("SettingsPage.xaml") || 
-                filePath.Contains("AboutUsSettingPage") || 
-                filePath.Contains("ThemeSettingPage") || 
-                filePath.Contains("GeneralSettingPage") || 
+            else if (!WizardConfig.UseSettingsPage &&
+                (filePath.Contains("SettingsPage.xaml") ||
+                filePath.Contains("AboutUsSettingPage") ||
+                filePath.Contains("ThemeSettingPage") ||
+                filePath.Contains("GeneralSettingPage") ||
                 filePath.Contains("AppUpdateSettingPage") ||
                 filePath.Contains("Backdrop.png") ||
                 filePath.Contains("Tint.png") ||
@@ -63,7 +63,7 @@ public bool ShouldAddProjectItem(string filePath)
             {
                 return false;
             }
-            else if (WizardConfig.UseSettingsPage && 
+            else if (WizardConfig.UseSettingsPage &&
                 !WizardConfig.UseAboutPage &&
                 (filePath.Contains("AboutUsSettingPage") ||
                 filePath.Contains("Info.png")))
@@ -96,13 +96,13 @@ public bool ShouldAddProjectItem(string filePath)
                 return false;
             }
             else if (!WizardConfig.UseJsonSettings &&
-                (filePath.Contains("AppConfig") || 
+                (filePath.Contains("AppConfig") ||
                 filePath.Contains("AppHelper")))
             {
                 return false;
             }
-            else if (!WizardConfig.UseHomeLandingPage && 
-                !WizardConfig.UseColorsDic && 
+            else if (!WizardConfig.UseHomeLandingPage &&
+                !WizardConfig.UseColorsDic &&
                 filePath.Contains("ThemeResources.xaml"))
             {
                 return false;
@@ -116,8 +116,8 @@ public bool ShouldAddProjectItem(string filePath)
             {
                 return false;
             }
-            else if (!WizardImplementation.UseDebugLogger && 
-                !WizardImplementation.UseFileLogger && 
+            else if (!WizardImplementation.UseDebugLogger &&
+                !WizardImplementation.UseFileLogger &&
                 filePath.Contains("LoggerSetup"))
             {
                 return false;
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppWizard.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppWizard.cs
index 3534f81..f7eb06a 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppWizard.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/WinUIAppWizard.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-
+using DevWinUI_Template.WizardUI;
 using EnvDTE;
-
 using Microsoft.VisualStudio.TemplateWizard;
-using DevWinUI_Template.WizardUI;
 
 namespace DevWinUI_Template
 {
@@ -42,8 +40,8 @@ public bool ShouldAddProjectItem(string filePath)
                 return false;
             }
 
-            if (!WizardConfig.UseJsonSettings && 
-                (filePath.Contains("AppConfig") || 
+            if (!WizardConfig.UseJsonSettings &&
+                (filePath.Contains("AppConfig") ||
                 filePath.Contains("AppHelper")))
             {
                 return false;
@@ -57,8 +55,8 @@ public bool ShouldAddProjectItem(string filePath)
             {
                 return false;
             }
-            else if (!WizardImplementation.UseDebugLogger && 
-                !WizardImplementation.UseFileLogger && 
+            else if (!WizardImplementation.UseDebugLogger &&
+                !WizardImplementation.UseFileLogger &&
                 filePath.Contains("LoggerSetup"))
             {
                 return false;
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Views/MainWindow.xaml.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Views/MainWindow.xaml.cs
index 61e9718..c44f924 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/Views/MainWindow.xaml.cs
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Views/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
-using System.Windows;
-using System;
-using Wpf.Ui.Controls;
+using System;
+using System.Windows;
 using DevWinUI_Template.WizardUI;
+using Wpf.Ui.Controls;
 
 namespace DevWinUI_Template;
 
@@ -34,9 +34,9 @@ private void MainWindowWizard_Loaded(object sender, RoutedEventArgs e)
         try
         {
             Wpf.Ui.Appearance.SystemThemeWatcher.Watch(
-                this,                                    
-                Wpf.Ui.Controls.WindowBackdropType.Mica, 
-                true                                     
+                this,
+                Wpf.Ui.Controls.WindowBackdropType.Mica,
+                true
             );
         }
         catch (Exception)
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest b/VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest
index 19863b1..217ee3c 100644
--- a/VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest
+++ b/VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="DevWinUI_Template.18eb89b1-bd1f-4e22-9196-6ea05b8ca61d" Version="11.0.1" Language="en-US" Publisher="Mahdi Hosseini" />
+        <Identity Id="DevWinUI_Template.18eb89b1-bd1f-4e22-9196-6ea05b8ca61d" Version="11.0.2" Language="en-US" Publisher="Mahdi Hosseini" />
         <DisplayName>DevWinUI Templates for WinUI</DisplayName>
         <Description xml:space="preserve">DevWinUI  Project Template, help you quickly create a new WinUI 3 App with DevWinUI  and MVVM Packages. We prepare your project with the following features: NavigationView, Custom TitleBar, HomeLandingPage and Settings Page (with Theme settings).
 We also always use the latest version of WindowsAppSDK.