Standardization 2.0

CalvinAllen · CalvinAllen · commit 03b306241235 · 2024-05-13T18:17:02.000-04:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -22,19 +22,19 @@ jobs:
         id: artifact_manifest
         uses: ActionsTools/read-json-action@main
         with:
-          file_path: ./artifact/CodingWithCalvin.OpenBinFolder.Vsix.info
+          file_path: ./artifact/CodingWithCalvin.OpenBinFolder.info
           
       - name: 3. Publish Release to Marketplace
         uses: CodingWithCalvin/GHA-VSMarketplacePublisher@v1
         with:
           marketplace-pat: ${{ secrets.VS_PAT }}
           publish-manifest-path: ./src/extension.manifest.json
-          vsix-path: ./artifact/CodingWithCalvin.OpenBinFolder.Vsix.vsix
+          vsix-path: ./artifact/CodingWithCalvin.OpenBinFolder.vsix
 
       - name: 4. Create Tag & Release
         uses: ncipollo/release-action@v1.14.0
         with:
-          artifacts: ./artifact/CodingWithCalvin.OpenBinFolder.Vsix.vsix
+          artifacts: ./artifact/CodingWithCalvin.OpenBinFolder.vsix
           generateReleaseNotes: true
           makeLatest: true
           token: ${{secrets.GH_SECRET}}
diff --git a/.github/workflows/release_build_and_deploy.yml b/.github/workflows/release_build_and_deploy.yml
@@ -22,24 +22,24 @@ jobs:
     - name: 1. Versioning Release
       uses: CalvinAllen/action-vs-vsix-versioner@v1
       with:
-        extension-manifest-file: 'src/CodingWithCalvin.OpenBinFolder.Vsix/source.extension.vsixmanifest'
-        extension-source-file: 'src/CodingWithCalvin.OpenBinFolder.Vsix/source.extension.cs'
+        extension-manifest-file: 'src/CodingWithCalvin.OpenBinFolder/source.extension.vsixmanifest'
+        extension-source-file: 'src/CodingWithCalvin.OpenBinFolder/source.extension.cs'
 
     - name: 2. Restoring Packages
       run: nuget restore src/CodingWithCalvin.OpenBinFolder.sln
     
     - name: 3. Building Project
-      run: msbuild 'src/CodingWithCalvin.OpenBinFolder.Vsix/CodingWithCalvin.OpenBinFolder.Vsix.csproj' /p:configuration='Release' /p:platform='x64'
+      run: msbuild 'src/CodingWithCalvin.OpenBinFolder/CodingWithCalvin.OpenBinFolder.csproj' /p:configuration='Release' /p:platform='x64'
 
     - name: 4. Create Information File
       uses: jsdaniell/create-json@v1.2.3
       with:
-        name: 'src/CodingWithCalvin.OpenBinFolder.Vsix/bin/x64/Release/CodingWithCalvin.OpenBinFolder.Vsix.info'
+        name: 'src/CodingWithCalvin.OpenBinFolder/bin/x64/Release/CodingWithCalvin.OpenBinFolder.info'
         json: '{"sha":"${{ github.sha }}", "version":"${{ steps.step-version.outputs.version }}"}'
     
     - name: 5. Publishing Build Artifact
       uses: actions/upload-artifact@v4
       with:
         path: |
-          src/CodingWithCalvin.OpenBinFolder.Vsix/bin/x64/Release/CodingWithCalvin.OpenBinFolder.Vsix.info
-          src/CodingWithCalvin.OpenBinFolder.Vsix/bin/x64/Release/CodingWithCalvin.OpenBinFolder.Vsix.vsix
+          src/CodingWithCalvin.OpenBinFolder/bin/x64/Release/CodingWithCalvin.OpenBinFolder.info
+          src/CodingWithCalvin.OpenBinFolder/bin/x64/Release/CodingWithCalvin.OpenBinFolder.vsix
diff --git a/resources/extension.manifest.json b/resources/extension.manifest.json
diff --git a/resources/folder-icon.png b/resources/folder-icon.png
diff --git a/resources/logo.png b/resources/logo.png
diff --git a/src/CodingWithCalvin.OpenBinFolder.sln b/src/CodingWithCalvin.OpenBinFolder.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33516.290
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodingWithCalvin.OpenBinFolder.Vsix", "CodingWithCalvin.OpenBinFolder.Vsix\CodingWithCalvin.OpenBinFolder.Vsix.csproj", "{66C238AD-8111-4579-A40C-48859AB61F25}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodingWithCalvin.OpenBinFolder", "CodingWithCalvin.OpenBinFolder\CodingWithCalvin.OpenBinFolder.csproj", "{66C238AD-8111-4579-A40C-48859AB61F25}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6088E91A-FC66-421E-A439-8EE4E7D28147}"
 	ProjectSection(SolutionItems) = preProject
-		extension.manifest.json = extension.manifest.json
+		..\resources\extension.manifest.json = ..\resources\extension.manifest.json
 		..\.github\workflows\publish.yml = ..\.github\workflows\publish.yml
 		..\README.md = ..\README.md
 		..\.github\workflows\release_build_and_deploy.yml = ..\.github\workflows\release_build_and_deploy.yml
diff --git a/src/CodingWithCalvin.OpenBinFolder/CodingWithCalvin.OpenBinFolder.csproj b/src/CodingWithCalvin.OpenBinFolder/CodingWithCalvin.OpenBinFolder.csproj
@@ -33,8 +33,8 @@
     <ProjectGuid>{66C238AD-8111-4579-A40C-48859AB61F25}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CodingWithCalvin.OpenBinFolder.Vsix</RootNamespace>
-    <AssemblyName>CodingWithCalvin.OpenBinFolder.Vsix</AssemblyName>
+    <RootNamespace>CodingWithCalvin.OpenBinFolder</RootNamespace>
+    <AssemblyName>CodingWithCalvin.OpenBinFolder</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@@ -63,6 +63,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="resources\LICENSE">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
       <Generator>VsixManifestGenerator</Generator>
@@ -93,16 +96,12 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\LICENSE">
-      <Link>Resources\LICENSE</Link>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="..\Resources\folder-icon.png">
-      <Link>Resources\folder-icon.png</Link>
+    <Content Include="..\..\resources\folder-icon.png">
+      <Link>resources\folder-icon.png</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\Resources\logo.png">
-      <Link>Resources\logo.png</Link>
+    <Content Include="..\..\resources\logo.png">
+      <Link>resources\logo.png</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
diff --git a/src/CodingWithCalvin.OpenBinFolder/Commands/OpenBinFolderCommand.cs b/src/CodingWithCalvin.OpenBinFolder/Commands/OpenBinFolderCommand.cs
@@ -7,7 +7,7 @@
 using Microsoft.VisualStudio.Shell;
 using Project = EnvDTE.Project;
 
-namespace CodingWithCalvin.OpenBinFolder.Vsix.Commands
+namespace CodingWithCalvin.OpenBinFolder.Commands
 {
     internal class OpenBinFolderCommand
     {
@@ -17,18 +17,22 @@ private OpenBinFolderCommand(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.OpenBinCommandId);
+            var menuCommandId = new CommandID(
+                PackageGuids.CommandSetGuid,
+                PackageIds.OpenBinCommandId
+            );
             var menuItem = new MenuCommand(OpenPath, menuCommandId);
             commandService.AddCommand(menuItem);
         }
-        
+
         private IServiceProvider ServiceProvider => _package;
 
         public static void Initialize(Package package)
@@ -39,13 +43,16 @@ public static void Initialize(Package package)
         private void OpenPath(object sender, EventArgs e)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            
+
             if (!(ServiceProvider.GetService(typeof(DTE)) is DTE2 dte))
             {
                 throw new ArgumentNullException(nameof(dte));
             }
 
-            foreach (UIHierarchyItem selectedItem in (Array)dte.ToolWindows.SolutionExplorer.SelectedItems)
+            foreach (
+                UIHierarchyItem selectedItem in (Array)
+                    dte.ToolWindows.SolutionExplorer.SelectedItems
+            )
             {
                 switch (selectedItem.Object)
                 {
@@ -56,11 +63,13 @@ private void OpenPath(object sender, EventArgs e)
                         }
                         catch (Exception ex)
                         {
-                            MessageBox.Show($@"
+                            MessageBox.Show(
+                                $@"
                                 Unable to determine output path for selected project
                                 {Environment.NewLine}
                                 {Environment.NewLine}
-                                Exception: {ex.Message}");
+                                Exception: {ex.Message}"
+                            );
                         }
 
                         break;
@@ -69,18 +78,18 @@ private void OpenPath(object sender, EventArgs e)
 
             void OpenProjectBinFolder(Project project)
             {
-                var projectPath = Path.GetDirectoryName(project.FullName) 
-                                  ?? throw new InvalidOperationException();
+                var projectPath =
+                    Path.GetDirectoryName(project.FullName)
+                    ?? throw new InvalidOperationException();
 
-                var projectOutputPath = project.ConfigurationManager.ActiveConfiguration.Properties
-                    .Item("OutputPath").Value.ToString();
+                var projectOutputPath = project
+                    .ConfigurationManager.ActiveConfiguration.Properties.Item("OutputPath")
+                    .Value.ToString();
 
                 var projectBinPath = Path.Combine(projectPath, projectOutputPath);
 
                 System.Diagnostics.Process.Start(
-                    Directory.Exists(projectBinPath) 
-                        ? projectBinPath 
-                        : projectPath
+                    Directory.Exists(projectBinPath) ? projectBinPath : projectPath
                 );
             }
         }
diff --git a/src/CodingWithCalvin.OpenBinFolder/OpenBinFolderPackage.cs b/src/CodingWithCalvin.OpenBinFolder/OpenBinFolderPackage.cs
@@ -1,19 +1,22 @@
 ﻿using System;
 using System.Runtime.InteropServices;
 using System.Threading;
-using CodingWithCalvin.OpenBinFolder.Vsix.Commands;
+using CodingWithCalvin.OpenBinFolder.Commands;
 using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
 
-namespace CodingWithCalvin.OpenBinFolder.Vsix
+namespace CodingWithCalvin.OpenBinFolder
 {
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [InstalledProductRegistration(Vsix.Name, Vsix.Description, Vsix.Version)]
     [Guid(PackageGuids.PackageGuidString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     public sealed class OpenBinFolderPackage : 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.OpenBinFolder/Properties/AssemblyInfo.cs b/src/CodingWithCalvin.OpenBinFolder/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 ﻿using System.Reflection;
 using System.Runtime.InteropServices;
-using CodingWithCalvin.OpenBinFolder.Vsix;
+using CodingWithCalvin.OpenBinFolder;
 
 [assembly: AssemblyTitle(Vsix.Name)]
 [assembly: AssemblyDescription(Vsix.Description)]
diff --git a/src/CodingWithCalvin.OpenBinFolder/VSCommandTable.cs b/src/CodingWithCalvin.OpenBinFolder/VSCommandTable.cs
@@ -3,7 +3,7 @@
 //     This file was generated by VSIX Synchronizer
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace CodingWithCalvin.OpenBinFolder.Vsix
+namespace CodingWithCalvin.OpenBinFolder
 {
     using System;
     
diff --git a/src/CodingWithCalvin.OpenBinFolder/VSCommandTable.vsct b/src/CodingWithCalvin.OpenBinFolder/VSCommandTable.vsct
@@ -15,7 +15,7 @@
     </Buttons>
 
     <Bitmaps>
-      <Bitmap guid="IconGuid" usedList="FolderIcon" href="../resources/folder-icon.png" />
+      <Bitmap guid="IconGuid" usedList="FolderIcon" href="../../resources/folder-icon.png" />
     </Bitmaps>
   </Commands>
 
diff --git a/src/CodingWithCalvin.OpenBinFolder/resources/LICENSE b/src/CodingWithCalvin.OpenBinFolder/resources/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Coding with Calvin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/CodingWithCalvin.OpenBinFolder/source.extension.cs b/src/CodingWithCalvin.OpenBinFolder/source.extension.cs
@@ -3,7 +3,7 @@
 //     This file was generated by VSIX Synchronizer
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace CodingWithCalvin.OpenBinFolder.Vsix
+namespace CodingWithCalvin.OpenBinFolder
 {
     internal sealed partial class Vsix
     {
@@ -13,6 +13,6 @@ internal sealed partial class Vsix
         public const string Language = "en-US";
         public const string Version = "1.1";
         public const string Author = "Coding With Calvin";
-        public const string Tags = "bin,debug,release,folder,output";
+        public const string Tags = "bin,debug,folder,output";
     }
 }
diff --git a/src/CodingWithCalvin.OpenBinFolder/source.extension.vsixmanifest b/src/CodingWithCalvin.OpenBinFolder/source.extension.vsixmanifest
@@ -5,8 +5,8 @@
         <DisplayName>Open Bin Folder</DisplayName>
         <Description xml:space="preserve">Adds an 'Open Bin Folder' to the right click menu of the project for quick access to the builds output folder.</Description>
         <MoreInfo>https://github.com/CodingWithCalvin/VS-OpenBinFolder</MoreInfo>
-        <License>Resources\LICENSE</License>
-        <Icon>Resources\logo.png</Icon>
+        <License>resources\LICENSE</License>
+        <Icon>resources\logo.png</Icon>
         <Tags>bin,debug,folder,output</Tags>
     </Metadata>
     <Installation>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Microsoft.VisualStudio.Shell;`
`8`	`8`	`using Project = EnvDTE.Project;`
`9`	`9`
`10`		`-namespace CodingWithCalvin.OpenBinFolder.Vsix.Commands`
	`10`	`+namespace CodingWithCalvin.OpenBinFolder.Commands`
`11`	`11`	`{`
`12`	`12`	`internal class OpenBinFolderCommand`
`13`	`13`	`{`
`@@ -17,18 +17,22 @@ private OpenBinFolderCommand(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.OpenBinCommandId);`
	`28`	`+ var menuCommandId = new CommandID(`
	`29`	`+ PackageGuids.CommandSetGuid,`
	`30`	`+ PackageIds.OpenBinCommandId`
	`31`	`+ );`
`28`	`32`	`var menuItem = new MenuCommand(OpenPath, 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)`
`@@ -39,13 +43,16 @@ public static void Initialize(Package package)`
`39`	`43`	`private void OpenPath(object sender, EventArgs e)`
`40`	`44`	`{`
`41`	`45`	`ThreadHelper.ThrowIfNotOnUIThread();`
`42`		`-`
	`46`	`+`
`43`	`47`	`if (!(ServiceProvider.GetService(typeof(DTE)) is DTE2 dte))`
`44`	`48`	`{`
`45`	`49`	`throw new ArgumentNullException(nameof(dte));`
`46`	`50`	`}`
`47`	`51`
`48`		`- foreach (UIHierarchyItem selectedItem in (Array)dte.ToolWindows.SolutionExplorer.SelectedItems)`
	`52`	`+ foreach (`
	`53`	`+ UIHierarchyItem selectedItem in (Array)`
	`54`	`+ dte.ToolWindows.SolutionExplorer.SelectedItems`
	`55`	`+ )`
`49`	`56`	`{`
`50`	`57`	`switch (selectedItem.Object)`
`51`	`58`	`{`
`@@ -56,11 +63,13 @@ private void OpenPath(object sender, EventArgs e)`
`56`	`63`	`}`
`57`	`64`	`catch (Exception ex)`
`58`	`65`	`{`
`59`		`- MessageBox.Show($@"`
	`66`	`+ MessageBox.Show(`
	`67`	`+ $@"`
`60`	`68`	`Unable to determine output path for selected project`
`61`	`69`	`{Environment.NewLine}`
`62`	`70`	`{Environment.NewLine}`
`63`		`- Exception: {ex.Message}");`
	`71`	`+ Exception: {ex.Message}"`
	`72`	`+ );`
`64`	`73`	`}`
`65`	`74`
`66`	`75`	`break;`
`@@ -69,18 +78,18 @@ private void OpenPath(object sender, EventArgs e)`
`69`	`78`
`70`	`79`	`void OpenProjectBinFolder(Project project)`
`71`	`80`	`{`
`72`		`- var projectPath = Path.GetDirectoryName(project.FullName)`
`73`		`- ?? throw new InvalidOperationException();`
	`81`	`+ var projectPath =`
	`82`	`+ Path.GetDirectoryName(project.FullName)`
	`83`	`+ ?? throw new InvalidOperationException();`
`74`	`84`
`75`		`- var projectOutputPath = project.ConfigurationManager.ActiveConfiguration.Properties`
`76`		`- .Item("OutputPath").Value.ToString();`
	`85`	`+ var projectOutputPath = project`
	`86`	`+ .ConfigurationManager.ActiveConfiguration.Properties.Item("OutputPath")`
	`87`	`+ .Value.ToString();`
`77`	`88`
`78`	`89`	`var projectBinPath = Path.Combine(projectPath, projectOutputPath);`
`79`	`90`
`80`	`91`	`System.Diagnostics.Process.Start(`
`81`		`- Directory.Exists(projectBinPath)`
`82`		`- ? projectBinPath`
`83`		`- : projectPath`
	`92`	`+ Directory.Exists(projectBinPath) ? projectBinPath : projectPath`
`84`	`93`	`);`
`85`	`94`	`}`
`86`	`95`	`}`
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.OpenBinFolder.Vsix`
	`6`	`+namespace CodingWithCalvin.OpenBinFolder`
`7`	`7`	`{`
`8`	`8`	`using System;`
`9`	`9`