Skip to content

Commit bc681ad

Browse files
DerekZiembaDerekZiemba
committed
Fixed null reference error. Added underlining. Added classifiers for: virtual methods, interface methods and properties, and overloaded operators.
1 parent 278a4a0 commit bc681ad

17 files changed

+602
-232
lines changed

‎ZMBA.Common.targets

+16-27
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,40 @@
99
<PropertyGroup>
1010
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1111
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
12-
<SchemaVersion>2.0</SchemaVersion>
13-
<AppDesignerFolder>Properties</AppDesignerFolder>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
16-
<NoWarn>CS0649, CS4014</NoWarn>
17-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
18-
<LangVersion>7.1</LangVersion>
12+
<SchemaVersion>2.0</SchemaVersion>
13+
<NoWarn>CS0649, CS4014</NoWarn>
14+
<LangVersion>7.2</LangVersion>
1915
<ProjectView>ShowAllFiles</ProjectView>
2016
<ErrorReport>prompt</ErrorReport>
2117
</PropertyGroup>
2218

2319
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2420
<DebugSymbols>true</DebugSymbols>
25-
<!-- <DebugType>full</DebugType> -->
2621
<DebugType>full</DebugType>
2722
<Optimize>false</Optimize>
28-
<OutputPath>bin\Debug\</OutputPath>
2923
<DefineConstants>DEBUG;TRACE</DefineConstants>
3024
<ErrorReport>prompt</ErrorReport>
3125
<WarningLevel>4</WarningLevel>
26+
<OutputPath>bin\Debug\</OutputPath>
3227
</PropertyGroup>
3328
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34-
<DebugType>embedded</DebugType>
29+
<DebugType>pdbonly</DebugType>
3530
<Optimize>true</Optimize>
31+
<DefineConstants>TRACE</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
3634
<OutputPath>bin\Release\</OutputPath>
35+
</PropertyGroup>
36+
37+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseEmb|AnyCPU' ">
38+
<DebugType>embedded</DebugType>
39+
<Optimize>true</Optimize>
3740
<DefineConstants>TRACE</DefineConstants>
3841
<ErrorReport>prompt</ErrorReport>
3942
<WarningLevel>4</WarningLevel>
43+
<OutputPath>bin\ReleaseEmb\</OutputPath>
4044
</PropertyGroup>
41-
<ItemGroup>
42-
<Reference Include="WindowsBase" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="PresentationCore" />
45-
<Reference Include="PresentationFramework" />
46-
<Reference Include="System" />
47-
<Reference Include="System.Core" />
48-
<Reference Include="System.ComponentModel.Composition" />
49-
<Reference Include="System.Data" />
50-
<Reference Include="System.Data.DataSetExtensions" />
51-
<Reference Include="System.Management" />
52-
<Reference Include="System.Numerics" />
53-
<Reference Include="System.Xaml" />
54-
<Reference Include="System.Xml" />
55-
<Reference Include="System.Xml.Linq" />
56-
</ItemGroup>
57-
45+
46+
5847

5948
</Project>

‎ZMBA.SyntaxColorizer.VS2015/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// You can specify all the values or you can default the Build and Revision Numbers
3030
// by using the '*' as shown below:
3131
// [assembly: AssemblyVersion("1.0.*")]
32-
[assembly: AssemblyVersion("2015.0.0.*")]
33-
[assembly: AssemblyFileVersion("2015.0.0.1")]
32+
[assembly: AssemblyVersion("2015.0.3.*")]
33+
[assembly: AssemblyFileVersion("2015.0.3")]

‎ZMBA.SyntaxColorizer.VS2015/ZMBA.SyntaxColorizer.VS2015.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
<Private>True</Private>
8181
</Reference>
8282
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
83-
<HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
83+
<HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
8484
<Private>True</Private>
8585
</Reference>
8686
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
87-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
87+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6072\lib\net11\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
8888
<Private>True</Private>
8989
</Reference>
9090
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -104,11 +104,11 @@
104104
<Private>True</Private>
105105
</Reference>
106106
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
107-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
107+
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6071\lib\net11\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
108108
<Private>True</Private>
109109
</Reference>
110110
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
111-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
111+
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
112112
<Private>True</Private>
113113
</Reference>
114114
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎ZMBA.SyntaxColorizer.VS2015/packages.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<package id="Microsoft.Composition" version="1.0.27" targetFramework="net462" />
1515
<package id="Microsoft.VisualStudio.CoreUtility" version="14.3.25407" targetFramework="net462" />
1616
<package id="Microsoft.VisualStudio.Editor" version="14.3.25407" targetFramework="net462" />
17-
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net462" />
18-
<package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net462" />
17+
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net462" />
18+
<package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6072" targetFramework="net462" />
1919
<package id="Microsoft.VisualStudio.Text.Data" version="14.3.25407" targetFramework="net462" />
2020
<package id="Microsoft.VisualStudio.Text.Logic" version="14.3.25407" targetFramework="net462" />
2121
<package id="Microsoft.VisualStudio.Text.UI" version="14.3.25407" targetFramework="net462" />
2222
<package id="Microsoft.VisualStudio.Text.UI.Wpf" version="14.3.25407" targetFramework="net462" />
23-
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net462" />
24-
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net462" />
23+
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6071" targetFramework="net462" />
24+
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50728" targetFramework="net462" />
2525
<package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net462" />
2626
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net462" />
2727
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net462" />

‎ZMBA.SyntaxColorizer.VS2015/source.extension.vsixmanifest

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="ZMBA.SyntaxColorizer.VS2015.de5e3942-59e7-41a0-8db5-e74286a92139" Version="1.0.0.0" Language="en-US" Publisher="Derek Ziemba" />
4+
<Identity Id="ZMBA.SyntaxColorizer.VS2015.de5e3942-59e7-41a0-8db5-e74286a92139" Version="1.0.3.0" Language="en-US" Publisher="Derek Ziemba" />
55
<DisplayName>ZMBA.SyntaxColorizer.VS2015</DisplayName>
6-
<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.
7-
Supported languages: C#, Visual Basic, JavaScript, HTML</Description>
6+
<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>
87
</Metadata>
98
<Installation>
109
<InstallationTarget Version="[14.0]" Id="Microsoft.VisualStudio.Pro" />

‎ZMBA.SyntaxColorizer.VS2017/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// You can specify all the values or you can default the Build and Revision Numbers
3030
// by using the '*' as shown below:
3131
// [assembly: AssemblyVersion("1.0.*")]
32-
[assembly: AssemblyVersion("2017.0.0.*")]
33-
[assembly: AssemblyFileVersion("2017.0.0.1")]
32+
[assembly: AssemblyVersion("2017.0.3.*")]
33+
[assembly: AssemblyFileVersion("2017.0.3")]

0 commit comments

Comments
 (0)