From 19ce28dedd9c0df9c49633635c087130966ce106 Mon Sep 17 00:00:00 2001
From: "Calvin A. Allen" <calvin.allen@outlook.com>
Date: Mon, 13 May 2024 16:49:16 -0400
Subject: [PATCH] Remove all x86 references

---
 .../AssemblyInfo.cs                              |  9 ++-------
 .../Commands/OpenExecutableCommand.cs            |  5 -----
 ...hCalvin.OpenInNotepadPlusPlus.Vsix.x64.csproj |  4 +---
 src/CodingWithCalvin.OpenInNotepadPlusPlus.sln   | 16 +++-------------
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/CodingWithCalvin.OpenInNotepadPlusPlus.Shared/AssemblyInfo.cs b/src/CodingWithCalvin.OpenInNotepadPlusPlus.Shared/AssemblyInfo.cs
index 27c7d74..1573125 100644
--- a/src/CodingWithCalvin.OpenInNotepadPlusPlus.Shared/AssemblyInfo.cs
+++ b/src/CodingWithCalvin.OpenInNotepadPlusPlus.Shared/AssemblyInfo.cs
@@ -1,11 +1,6 @@
-#if X64
-using CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64;
-#elif X86
-using CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x86;
-#endif
-
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
+using CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64;
 
 [assembly: AssemblyTitle(VsixConstants.Name)]
 [assembly: AssemblyDescription(VsixConstants.Description)]
diff --git a/src/CodingWithCalvin.OpenInNotepadPlusPlus.Shared/Commands/OpenExecutableCommand.cs b/src/CodingWithCalvin.OpenInNotepadPlusPlus.Shared/Commands/OpenExecutableCommand.cs
index d77aba7..295b206 100644
--- a/src/CodingWithCalvin.OpenInNotepadPlusPlus.Shared/Commands/OpenExecutableCommand.cs
+++ b/src/CodingWithCalvin.OpenInNotepadPlusPlus.Shared/Commands/OpenExecutableCommand.cs
@@ -7,12 +7,7 @@
 using System.Windows.Forms;
 using CodingWithCalvin.OpenInNotepadPlusPlus.Shared.Helpers;
 using CodingWithCalvin.OpenInNotepadPlusPlus.Shared.Dialogs;
-
-#if X64
 using CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64;
-#elif X86
-using CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x86;
-#endif
 
 namespace CodingWithCalvin.OpenInNotepadPlusPlus.Shared.Commands
 {
diff --git a/src/CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64/CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64.csproj b/src/CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64/CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64.csproj
index 50fe2a4..a521a31 100644
--- a/src/CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64/CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64.csproj
+++ b/src/CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64/CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x64.csproj
@@ -63,8 +63,6 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="extension.manifest.json" />
-    <None Include="README.md" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -102,4 +100,4 @@
   <Import Project="..\CodingWithCalvin.OpenInNotepadPlusPlus.Shared\CodingWithCalvin.OpenInNotepadPlusPlus.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/CodingWithCalvin.OpenInNotepadPlusPlus.sln b/src/CodingWithCalvin.OpenInNotepadPlusPlus.sln
index c8ed03c..75efa69 100644
--- a/src/CodingWithCalvin.OpenInNotepadPlusPlus.sln
+++ b/src/CodingWithCalvin.OpenInNotepadPlusPlus.sln
@@ -7,38 +7,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodingWithCalvin.OpenInNote
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D4EE3BDC-84CE-485E-9E33-ED9D9C2CDDD7}"
 	ProjectSection(SolutionItems) = preProject
+		extension.manifest.json = 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
 	EndProjectSection
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CodingWithCalvin.OpenInNotepadPlusPlus.Shared", "CodingWithCalvin.OpenInNotepadPlusPlus.Shared\CodingWithCalvin.OpenInNotepadPlusPlus.Shared.shproj", "{6A60675F-7859-4D83-9CCC-EF3485EEC9A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x86", "CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x86\CodingWithCalvin.OpenInNotepadPlusPlus.Vsix.x86.csproj", "{AD67C87A-4D09-4A09-983E-BBE07DC9E7C9}"
-EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		CodingWithCalvin.OpenInNotepadPlusPlus.Shared\CodingWithCalvin.OpenInNotepadPlusPlus.Shared.projitems*{6a60675f-7859-4d83-9ccc-ef3485eec9a5}*SharedItemsImports = 13
-		CodingWithCalvin.OpenInNotepadPlusPlus.Shared\CodingWithCalvin.OpenInNotepadPlusPlus.Shared.projitems*{ad67c87a-4d09-4a09-983e-bbe07dc9e7c9}*SharedItemsImports = 4
 		CodingWithCalvin.OpenInNotepadPlusPlus.Shared\CodingWithCalvin.OpenInNotepadPlusPlus.Shared.projitems*{add4175c-aa5c-49e4-afaf-6b9d3e832e8d}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{ADD4175C-AA5C-49E4-AFAF-6B9D3E832E8D}.Debug|x64.ActiveCfg = Debug|x64
 		{ADD4175C-AA5C-49E4-AFAF-6B9D3E832E8D}.Debug|x64.Build.0 = Debug|x64
-		{ADD4175C-AA5C-49E4-AFAF-6B9D3E832E8D}.Debug|x86.ActiveCfg = Debug|x64
 		{ADD4175C-AA5C-49E4-AFAF-6B9D3E832E8D}.Release|x64.ActiveCfg = Release|x64
 		{ADD4175C-AA5C-49E4-AFAF-6B9D3E832E8D}.Release|x64.Build.0 = Release|x64
-		{ADD4175C-AA5C-49E4-AFAF-6B9D3E832E8D}.Release|x86.ActiveCfg = Release|x64
-		{AD67C87A-4D09-4A09-983E-BBE07DC9E7C9}.Debug|x64.ActiveCfg = Debug|x86
-		{AD67C87A-4D09-4A09-983E-BBE07DC9E7C9}.Debug|x86.ActiveCfg = Debug|x86
-		{AD67C87A-4D09-4A09-983E-BBE07DC9E7C9}.Debug|x86.Build.0 = Debug|x86
-		{AD67C87A-4D09-4A09-983E-BBE07DC9E7C9}.Release|x64.ActiveCfg = Release|x86
-		{AD67C87A-4D09-4A09-983E-BBE07DC9E7C9}.Release|x86.ActiveCfg = Release|x86
-		{AD67C87A-4D09-4A09-983E-BBE07DC9E7C9}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE