Working VS2019

DerekZiemba · Mar 6, 2019 · 5e1fc8e · 5e1fc8e
1 parent ae75470
commit 5e1fc8e
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 21 deletions.
diff --git a/ZMBA.SyntaxColorizer.VS2015/source.extension.vsixmanifest b/ZMBA.SyntaxColorizer.VS2015/source.extension.vsixmanifest
@@ -4,7 +4,6 @@
         <Identity Id="ZMBA.SyntaxColorizer.VS2015.de5e3942-59e7-41a0-8db5-e74286a92139" Version="1.0.4.0" Language="en-US" Publisher="Derek Ziemba" />
         <DisplayName>ZMBA.SyntaxColorizer.VS2015</DisplayName>
         <Description xml:space="preserve">Style code Font and Color based on Syntax and Semantic meaning. Font Style  Font and Color based on Syntax and Semantic meaning. Supported languages: C#, Visual Basic, JavaScript, HTML</Description>
-        <License>..\LICENSE.txt</License>
     </Metadata>
     <Installation>
         <InstallationTarget Version="[14.0]" Id="Microsoft.VisualStudio.Pro" />

diff --git a/ZMBA.SyntaxColorizer.VS2017/source.extension.vsixmanifest b/ZMBA.SyntaxColorizer.VS2017/source.extension.vsixmanifest
@@ -5,7 +5,6 @@
         <DisplayName>ZMBA.SyntaxColorizer.VS2017</DisplayName>
         <Description xml:space="preserve">Style code Font and Color based on Syntax and Semantic meaning. Font Style  Font and Color based on Syntax and Semantic meaning.
 Supported languages: C#, Visual Basic, JavaScript, HTML</Description>
-      <License>..\LICENSE.txt</License>
     </Metadata>
     <Installation>
         <InstallationTarget Version="[15.0, 16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />

diff --git a/ZMBA.SyntaxColorizer.VS2019/Properties/AssemblyInfo.cs b/ZMBA.SyntaxColorizer.VS2019/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyTitle("ZMBA.SyntaxColorizer.VS2019")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Derek Ziemba")]
+[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ZMBA.SyntaxColorizer.VS2019")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2019.0.4.*")]
-[assembly: AssemblyFileVersion("2019.0.4.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ZMBA.SyntaxColorizer.VS2019/ZMBA.SyntaxColorizer.VS2019.csproj b/ZMBA.SyntaxColorizer.VS2019/ZMBA.SyntaxColorizer.VS2019.csproj
@@ -10,7 +10,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{46B5403E-A28C-4784-97C1-BE6E260B327A}</ProjectGuid>
+    <ProjectGuid>{2F9B9128-5C61-4779-8045-42F0F0681479}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ZMBA.SyntaxColorizer.VS2019</RootNamespace>
@@ -54,12 +54,39 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis">
+      <Version>3.0.0-beta4-final</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp">
+      <Version>3.0.0-beta4-final</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures">
+      <Version>2.8.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text">
+      <Version>2.9.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic">
+      <Version>3.0.0-beta4-final</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common">
+      <Version>3.0.0-beta4-final</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.9.3" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.0.2262" />
+    <PackageReference Include="System.ComponentModel">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.ComponentModel.Composition">
+      <Version>4.6.0-preview.19073.11</Version>
+    </PackageReference>
   </ItemGroup>
+  <Import Project="..\ZMBA.SyntaxColorizer\ZMBA.SyntaxColorizer.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. 

diff --git a/ZMBA.SyntaxColorizer.VS2019/ZMBA.SyntaxColorizer.VS2019Package.cs b/ZMBA.SyntaxColorizer.VS2019/ZMBA.SyntaxColorizer.VS2019Package.cs
@@ -24,13 +24,13 @@ namespace ZMBA.SyntaxColorizer.VS2019
   /// </para>
   /// </remarks>
   [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-  [Guid(ZMBA.SyntaxColorizer.VS2019Package.PackageGuidString)]
-  public sealed class ZMBA.SyntaxColorizer.VS2019Package : AsyncPackage
+  [Guid(SyntaxColorizer_VS2019Package.PackageGuidString)]
+  public sealed class SyntaxColorizer_VS2019Package : AsyncPackage
     {
          /// <summary>
         /// ZMBA.SyntaxColorizer.VS2019Package GUID string.
         /// </summary>
-        public const string PackageGuidString = "1e25cef6-ed3d-4a14-9ed3-6e8cc2da634d";
+        public const string PackageGuidString = "9b2017db-7aa2-4092-9787-cd28b47160e1";
 
   #region Package Members
 

diff --git a/ZMBA.SyntaxColorizer.VS2019/source.extension.vsixmanifest b/ZMBA.SyntaxColorizer.VS2019/source.extension.vsixmanifest
@@ -1,11 +1,10 @@
 <?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="ZMBA.SyntaxColorizer.VS2019.57597315-70cb-4920-bbe3-3ee7d8db71f4" Version="1.0.4.3" Language="en-US" Publisher="Derek Ziemba" />
+    <Identity Id="ZMBA.SyntaxColorizer.VS2019.e2b98ac0-cc6a-4211-8b5c-d3854e619ad6" Version="1.0.4.3" Language="en-US" Publisher="Derek Ziemba" />
     <DisplayName>ZMBA.SyntaxColorizer.VS2019</DisplayName>
     <Description xml:space="preserve">Style code Font and Color based on Syntax and Semantic meaning. Font Style  Font and Color based on Syntax and Semantic meaning.
 Supported languages: C#, Visual Basic, JavaScript, HTML</Description>
-    <License>..\LICENSE.txt</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />

diff --git a/ZMBA.SyntaxColorizer.sln b/ZMBA.SyntaxColorizer.sln
@@ -16,11 +16,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		ZMBA.SyntaxColorizer.targets = ZMBA.SyntaxColorizer.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZMBA.SyntaxColorizer.VS2019", "ZMBA.SyntaxColorizer.VS2019\ZMBA.SyntaxColorizer.VS2019.csproj", "{46B5403E-A28C-4784-97C1-BE6E260B327A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZMBA.SyntaxColorizer.VS2019", "ZMBA.SyntaxColorizer.VS2019\ZMBA.SyntaxColorizer.VS2019.csproj", "{2F9B9128-5C61-4779-8045-42F0F0681479}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		ZMBA.SyntaxColorizer\ZMBA.SyntaxColorizer.projitems*{0dd30895-f150-413d-a20b-b34dba7aaca1}*SharedItemsImports = 4
+		ZMBA.SyntaxColorizer\ZMBA.SyntaxColorizer.projitems*{2f9b9128-5c61-4779-8045-42f0f0681479}*SharedItemsImports = 4
 		ZMBA.SyntaxColorizer\ZMBA.SyntaxColorizer.projitems*{7a1ffcb8-1711-42fe-ac90-8255d2834a27}*SharedItemsImports = 13
 		ZMBA.SyntaxColorizer\ZMBA.SyntaxColorizer.projitems*{e04ee368-b501-4ec3-9e74-3aa3977b2d69}*SharedItemsImports = 4
 	EndGlobalSection
@@ -47,14 +48,14 @@ Global
 		{E04EE368-B501-4EC3-9E74-3AA3977B2D69}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E04EE368-B501-4EC3-9E74-3AA3977B2D69}.ReleaseEmb|Any CPU.ActiveCfg = ReleaseEmb|Any CPU
 		{E04EE368-B501-4EC3-9E74-3AA3977B2D69}.ReleaseEmb|Any CPU.Build.0 = ReleaseEmb|Any CPU
-		{46B5403E-A28C-4784-97C1-BE6E260B327A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{46B5403E-A28C-4784-97C1-BE6E260B327A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{46B5403E-A28C-4784-97C1-BE6E260B327A}.Release(debuggable)|Any CPU.ActiveCfg = Release|Any CPU
-		{46B5403E-A28C-4784-97C1-BE6E260B327A}.Release(debuggable)|Any CPU.Build.0 = Release|Any CPU
-		{46B5403E-A28C-4784-97C1-BE6E260B327A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{46B5403E-A28C-4784-97C1-BE6E260B327A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{46B5403E-A28C-4784-97C1-BE6E260B327A}.ReleaseEmb|Any CPU.ActiveCfg = Release|Any CPU
-		{46B5403E-A28C-4784-97C1-BE6E260B327A}.ReleaseEmb|Any CPU.Build.0 = Release|Any CPU
+		{2F9B9128-5C61-4779-8045-42F0F0681479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F9B9128-5C61-4779-8045-42F0F0681479}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F9B9128-5C61-4779-8045-42F0F0681479}.Release(debuggable)|Any CPU.ActiveCfg = Release|Any CPU
+		{2F9B9128-5C61-4779-8045-42F0F0681479}.Release(debuggable)|Any CPU.Build.0 = Release|Any CPU
+		{2F9B9128-5C61-4779-8045-42F0F0681479}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F9B9128-5C61-4779-8045-42F0F0681479}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F9B9128-5C61-4779-8045-42F0F0681479}.ReleaseEmb|Any CPU.ActiveCfg = Release|Any CPU
+		{2F9B9128-5C61-4779-8045-42F0F0681479}.ReleaseEmb|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ZMBA.SyntaxColorizer/src/ClassifierContext.cs b/ZMBA.SyntaxColorizer/src/ClassifierContext.cs
@@ -36,7 +36,7 @@ internal static ClassifierContext GetContext(ref ClassifierContext cached, Snaps
 				if(ctx != null && ctx.SnapShot == txtsnapshot) {
 					ctx.Classified.Clear();
 					return ctx;
-				} else {
+				} else { 
 					SourceTextContainer srcTextContainer = txtsnapshot.TextBuffer.AsTextContainer();
 					Workspace workspace = Workspace.GetWorkspaceRegistration(srcTextContainer).Workspace;
 					if(workspace == null) { return null; }