Added shared project for VS 2019 and VS 2022, two separate vsix files…

… are created now

.gitignore

@@ -140,7 +140,7 @@ publish/
 *.[Pp]ublish.xml
 *.azurePubxml
 
-# TODO: Un-comment the next line if you do not want to checkin 
+# TODO: Un-comment the next line if you do not want to checkin
 # your web deploy settings because they may include unencrypted
 # passwords
 #*.pubxml
@@ -243,5 +243,5 @@ ModelManifest.xml
 
 # FAKE - F# Make
 .fake/
-/BlackSpace/Key.snk
+Key.snk
 /Visual Studio 2015/Visualizers/attribcache140.bin

BlackSpace.sln

@@ -1,22 +1,58 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33214.272
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlackSpace", "BlackSpace\BlackSpace.csproj", "{7AD2B41A-974B-4B31-91E7-3E137D8AD273}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlackSpace2022", "BlackSpace\BlackSpace2022.csproj", "{7AD2B41A-974B-4B31-91E7-3E137D8AD273}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BlackSpaceShared", "BlackSpaceShared\BlackSpaceShared.shproj", "{D171E5DB-D9DE-4B08-B24F-3B21056E779D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlackSpace2019", "BlackSpace2019\BlackSpace2019.csproj", "{D2A1455F-A0E8-4239-8368-782AFEEFBE65}"
 EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		BlackSpaceShared\BlackSpaceShared.projitems*{7ad2b41a-974b-4b31-91e7-3e137d8ad273}*SharedItemsImports = 4
+		BlackSpaceShared\BlackSpaceShared.projitems*{d171e5db-d9de-4b08-b24f-3b21056e779d}*SharedItemsImports = 13
+		BlackSpaceShared\BlackSpaceShared.projitems*{d2a1455f-a0e8-4239-8368-782afeefbe65}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm64 = Debug|arm64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm64 = Release|arm64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Debug|arm64.ActiveCfg = Debug|arm64
+		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Debug|arm64.Build.0 = Debug|arm64
+		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Debug|x86.ActiveCfg = Debug|x86
+		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Debug|x86.Build.0 = Debug|x86
 		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Release|arm64.ActiveCfg = Release|arm64
+		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Release|arm64.Build.0 = Release|arm64
+		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Release|x86.ActiveCfg = Release|x86
+		{7AD2B41A-974B-4B31-91E7-3E137D8AD273}.Release|x86.Build.0 = Release|x86
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Debug|arm64.Build.0 = Debug|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Debug|x86.Build.0 = Debug|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Release|arm64.Build.0 = Release|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Release|x86.ActiveCfg = Release|Any CPU
+		{D2A1455F-A0E8-4239-8368-782AFEEFBE65}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FD56EC77-AB07-4C02-8EFE-2F08DC50EE8D}
+	EndGlobalSection
 EndGlobal

BlackSpace/BlackSpace.csproj → BlackSpace/BlackSpace2022.csproj

@@ -56,90 +56,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="BlackSpaceOptionsPackage.cs" />
-    <Compile Include="DeleteWhiteSpaceWhenSavingCommandHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="BlackSpaceAdornment.cs" />
-    <Compile Include="BlackSpaceAdornmentTextViewCreationListener.cs" />
-    <Compile Include="DeleteWhiteSpaceWhenSaving.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="Key.snk" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="BlackSpace.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="BlackSpaceDesat.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="BlackSpaceLarge.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="BlackSpacePreview.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="index.html" />
-    <Content Include="LICENSE-2.0.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="RELEASE-NOTES.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="Resources\BlackSpaceOptionsPackage.ico" />
-    <Content Include="stylesheet.css" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="netstandard" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Drawing.Design" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UIAutomationProvider" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="VSPackage.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <ManifestResourceName>VSPackage</ManifestResourceName>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Editor">
       <Version>17.4.255</Version>
@@ -156,6 +88,28 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="LICENSE-2.0.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Resources\BlackSpace.ico" />
+    <Content Include="Resources\BlackSpaceDesat.ico" />
+    <Content Include="Resources\BlackSpaceLarge.ico">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Resources\BlackSpaceOptionsPackage.ico" />
+    <Content Include="Resources\BlackSpacePreview.png">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Resources\LICENSE-2.0.txt">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Resources\RELEASE-NOTES.txt">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+  </ItemGroup>
+  <Import Project="..\BlackSpaceShared\BlackSpaceShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.