Forgot some namespace changes.

CalvinAllen · CalvinAllen · commit 37a39efec26a · 2024-05-13T18:46:04.000-04:00
diff --git a/src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj b/src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj
@@ -33,8 +33,8 @@
     <ProjectGuid>{123DBC9B-8955-4446-9A74-DD2B8068F7B0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CodingWithCalvin.SuperClean.Vsix</RootNamespace>
-    <AssemblyName>CodingWithCalvin.SuperClean.Vsix</AssemblyName>
+    <RootNamespace>CodingWithCalvin.SuperClean</RootNamespace>
+    <AssemblyName>CodingWithCalvin.SuperClean</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
diff --git a/src/CodingWithCalvin.SuperClean/Commands/SuperCleanCommand.cs b/src/CodingWithCalvin.SuperClean/Commands/SuperCleanCommand.cs
@@ -7,7 +7,7 @@
 using Microsoft.VisualStudio.Shell;
 using MessageBox = System.Windows.Forms.MessageBox;
 
-namespace CodingWithCalvin.SuperClean.Vsix.Commands
+namespace CodingWithCalvin.SuperClean.Commands
 {
     internal class SuperCleanCommand
     {
@@ -17,18 +17,22 @@ private SuperCleanCommand(Package package)
         {
             _package = package;
 
-            var commandService = (OleMenuCommandService)ServiceProvider.GetService(typeof(IMenuCommandService));
+            var commandService = (OleMenuCommandService)
+                ServiceProvider.GetService(typeof(IMenuCommandService));
 
             if (commandService == null)
             {
                 return;
             }
 
-            var menuCommandId = new CommandID(PackageGuids.CommandSetGuid, PackageIds.SuperCleanCommandId);
+            var menuCommandId = new CommandID(
+                PackageGuids.CommandSetGuid,
+                PackageIds.SuperCleanCommandId
+            );
             var menuItem = new MenuCommand(OpenPathWrapper, menuCommandId);
             commandService.AddCommand(menuItem);
         }
-        
+
         private IServiceProvider ServiceProvider => _package;
 
         public static void Initialize(Package package)
@@ -44,11 +48,13 @@ private static void OpenPathWrapper(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                MessageBox.Show($@"
+                MessageBox.Show(
+                    $@"
                                 Fatal Error! Unable to invoke Super Clean!
                                 {Environment.NewLine}
                                 {Environment.NewLine}
-                                Exception: {ex.Message}");
+                                Exception: {ex.Message}"
+                );
             }
         }
 
@@ -72,15 +78,16 @@ private static async Task OpenPathAsync(object sender, EventArgs e)
                         {
                             throw new ApplicationException(errors);
                         }
-
                     }
                     catch (Exception ex)
                     {
-                        MessageBox.Show($@"
+                        MessageBox.Show(
+                            $@"
                                 Unable to Super Clean solution
                                 {Environment.NewLine}
                                 {Environment.NewLine}
-                                Exception: {ex.Message}");
+                                Exception: {ex.Message}"
+                        );
                     }
 
                     break;
@@ -91,11 +98,13 @@ Unable to Super Clean solution
                     }
                     catch (Exception ex)
                     {
-                        MessageBox.Show($@"
+                        MessageBox.Show(
+                            $@"
                                 Unable to Super Clean project ${activeItem.Name}
                                 {Environment.NewLine}
                                 {Environment.NewLine}
-                                Exception: {ex.Message}");
+                                Exception: {ex.Message}"
+                        );
                     }
 
                     break;
@@ -124,8 +133,9 @@ Unable to Super Clean project ${activeItem.Name}
 
             void SuperCleanProject(SolutionItem project)
             {
-                var projectPath = Path.GetDirectoryName(project.FullPath) 
-                                  ?? throw new InvalidOperationException();
+                var projectPath =
+                    Path.GetDirectoryName(project.FullPath)
+                    ?? throw new InvalidOperationException();
 
                 var binPath = Path.Combine(projectPath, "bin");
                 var objPath = Path.Combine(projectPath, "obj");
diff --git a/src/CodingWithCalvin.SuperClean/Properties/AssemblyInfo.cs b/src/CodingWithCalvin.SuperClean/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 ﻿using System.Reflection;
 using System.Runtime.InteropServices;
-using CodingWithCalvin.SuperClean.Vsix;
+using CodingWithCalvin.SuperClean;
 
 [assembly: AssemblyTitle(Vsix.Name)]
 [assembly: AssemblyDescription(Vsix.Description)]
diff --git a/src/CodingWithCalvin.SuperClean/SuperCleanPackage.cs b/src/CodingWithCalvin.SuperClean/SuperCleanPackage.cs
@@ -1,19 +1,22 @@
 ﻿using System;
 using System.Runtime.InteropServices;
 using System.Threading;
-using CodingWithCalvin.SuperClean.Vsix.Commands;
+using CodingWithCalvin.SuperClean.Commands;
 using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
 
-namespace CodingWithCalvin.SuperClean.Vsix
+namespace CodingWithCalvin.SuperClean
 {
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [InstalledProductRegistration(Vsix.Name, Vsix.Description, Vsix.Version)]
     [Guid(PackageGuids.PackageGuidString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     public sealed class SuperCleanPackage : AsyncPackage
     {
-        protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+        protected override async Task InitializeAsync(
+            CancellationToken cancellationToken,
+            IProgress<ServiceProgressData> progress
+        )
         {
             await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
diff --git a/src/CodingWithCalvin.SuperClean/VSCommandTable.cs b/src/CodingWithCalvin.SuperClean/VSCommandTable.cs
@@ -3,7 +3,7 @@
 //     This file was generated by VSIX Synchronizer
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace CodingWithCalvin.SuperClean.Vsix
+namespace CodingWithCalvin.SuperClean
 {
     using System;
     
diff --git a/src/CodingWithCalvin.SuperClean/source.extension.cs b/src/CodingWithCalvin.SuperClean/source.extension.cs
@@ -3,7 +3,7 @@
 //     This file was generated by VSIX Synchronizer
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace CodingWithCalvin.SuperClean.Vsix
+namespace CodingWithCalvin.SuperClean
 {
     internal sealed partial class Vsix
     {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Microsoft.VisualStudio.Shell;`
`8`	`8`	`using MessageBox = System.Windows.Forms.MessageBox;`
`9`	`9`
`10`		`-namespace CodingWithCalvin.SuperClean.Vsix.Commands`
	`10`	`+namespace CodingWithCalvin.SuperClean.Commands`
`11`	`11`	`{`
`12`	`12`	`internal class SuperCleanCommand`
`13`	`13`	`{`
`@@ -17,18 +17,22 @@ private SuperCleanCommand(Package package)`
`17`	`17`	`{`
`18`	`18`	`_package = package;`
`19`	`19`
`20`		`- var commandService = (OleMenuCommandService)ServiceProvider.GetService(typeof(IMenuCommandService));`
	`20`	`+ var commandService = (OleMenuCommandService)`
	`21`	`+ ServiceProvider.GetService(typeof(IMenuCommandService));`
`21`	`22`
`22`	`23`	`if (commandService == null)`
`23`	`24`	`{`
`24`	`25`	`return;`
`25`	`26`	`}`
`26`	`27`
`27`		`- var menuCommandId = new CommandID(PackageGuids.CommandSetGuid, PackageIds.SuperCleanCommandId);`
	`28`	`+ var menuCommandId = new CommandID(`
	`29`	`+ PackageGuids.CommandSetGuid,`
	`30`	`+ PackageIds.SuperCleanCommandId`
	`31`	`+ );`
`28`	`32`	`var menuItem = new MenuCommand(OpenPathWrapper, menuCommandId);`
`29`	`33`	`commandService.AddCommand(menuItem);`
`30`	`34`	`}`
`31`		`-`
	`35`	`+`
`32`	`36`	`private IServiceProvider ServiceProvider => _package;`
`33`	`37`
`34`	`38`	`public static void Initialize(Package package)`
`@@ -44,11 +48,13 @@ private static void OpenPathWrapper(object sender, EventArgs e)`
`44`	`48`	`}`
`45`	`49`	`catch (Exception ex)`
`46`	`50`	`{`
`47`		`- MessageBox.Show($@"`
	`51`	`+ MessageBox.Show(`
	`52`	`+ $@"`
`48`	`53`	`Fatal Error! Unable to invoke Super Clean!`
`49`	`54`	`{Environment.NewLine}`
`50`	`55`	`{Environment.NewLine}`
`51`		`- Exception: {ex.Message}");`
	`56`	`+ Exception: {ex.Message}"`
	`57`	`+ );`
`52`	`58`	`}`
`53`	`59`	`}`
`54`	`60`
`@@ -72,15 +78,16 @@ private static async Task OpenPathAsync(object sender, EventArgs e)`
`72`	`78`	`{`
`73`	`79`	`throw new ApplicationException(errors);`
`74`	`80`	`}`
`75`		`-`
`76`	`81`	`}`
`77`	`82`	`catch (Exception ex)`
`78`	`83`	`{`
`79`		`- MessageBox.Show($@"`
	`84`	`+ MessageBox.Show(`
	`85`	`+ $@"`
`80`	`86`	`Unable to Super Clean solution`
`81`	`87`	`{Environment.NewLine}`
`82`	`88`	`{Environment.NewLine}`
`83`		`- Exception: {ex.Message}");`
	`89`	`+ Exception: {ex.Message}"`
	`90`	`+ );`
`84`	`91`	`}`
`85`	`92`
`86`	`93`	`break;`
`@@ -91,11 +98,13 @@ Unable to Super Clean solution`
`91`	`98`	`}`
`92`	`99`	`catch (Exception ex)`
`93`	`100`	`{`
`94`		`- MessageBox.Show($@"`
	`101`	`+ MessageBox.Show(`
	`102`	`+ $@"`
`95`	`103`	`Unable to Super Clean project ${activeItem.Name}`
`96`	`104`	`{Environment.NewLine}`
`97`	`105`	`{Environment.NewLine}`
`98`		`- Exception: {ex.Message}");`
	`106`	`+ Exception: {ex.Message}"`
	`107`	`+ );`
`99`	`108`	`}`
`100`	`109`
`101`	`110`	`break;`
`@@ -124,8 +133,9 @@ Unable to Super Clean project ${activeItem.Name}`
`124`	`133`
`125`	`134`	`void SuperCleanProject(SolutionItem project)`
`126`	`135`	`{`
`127`		`- var projectPath = Path.GetDirectoryName(project.FullPath)`
`128`		`- ?? throw new InvalidOperationException();`
	`136`	`+ var projectPath =`
	`137`	`+ Path.GetDirectoryName(project.FullPath)`
	`138`	`+ ?? throw new InvalidOperationException();`
`129`	`139`
`130`	`140`	`var binPath = Path.Combine(projectPath, "bin");`
`131`	`141`	`var objPath = Path.Combine(projectPath, "obj");`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`// This file was generated by VSIX Synchronizer`
`4`	`4`	`// </auto-generated>`
`5`	`5`	`// ------------------------------------------------------------------------------`
`6`		`-namespace CodingWithCalvin.SuperClean.Vsix`
	`6`	`+namespace CodingWithCalvin.SuperClean`
`7`	`7`	`{`
`8`	`8`	`using System;`
`9`	`9`