Initial commit for Visual Studio 2022

CHANGES.md

@@ -4,17 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.73] - 2020-12-23
-
-### Fixed
-
-- Fix #126
-
-## [2.72] - 2020-12-20
+## [2021.1] - 2021-06-20
 
 ### Added
 
-- Per solution settings. Just create an empty `VSColorOutput.json` in the same folder as the solution file.
-- Show time stamps in margin at every line (without incremental time)
-- Show hours in time stamps in margin
-- Show times in elapsed build time and margin according to system locale
+  - Port to preview version of Visual Studio 2022
+

README.md

@@ -6,7 +6,7 @@ VSColorOutput is a Visual Studio extension that adds color highlighting to Visua
 
 Custom match patterns can be added. Colors can be modified.  
 
-Developed in C# and NUnit.  
+Developed in C#
 
 ![Image](https://mike-ward.net/cdn/images/vscoloroutput/vscoloroutput.png)  
 

VSColorOutput.Tests/VSColorOutput.Tests.csproj

@@ -71,22 +71,22 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions">
-      <Version>5.10.2</Version>
+      <Version>6.0.0-beta0001</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>16.0.204</Version>
+      <Version>17.0.0-previews-1-31410-273</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.UnitTestLibrary">
-      <Version>14.3.25407</Version>
+      <Version>15.0.25726-Preview5</Version>
     </PackageReference>
     <PackageReference Include="Moq">
-      <Version>4.13.1</Version>
+      <Version>4.16.1</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.1.0</Version>
+      <Version>2.2.5-preview-20210605-01</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework">
-      <Version>2.1.0</Version>
+      <Version>2.2.5-preview-20210605-01</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />

VSColorOutput/Output/GCCErrorList/GCCErrorGenerator.cs

@@ -87,7 +87,7 @@ private static void AddTask(GCCErrorListItem item, TaskErrorCategory category)
 
         private static void TaskOnNavigate(object sender, EventArgs eventArgs)
         {
-            var task = sender as Task;
+            TaskListItem task = sender as TaskListItem;
             if (task == null) throw new ArgumentException("sender");
             task.Line++; // Navigation starts counting from 1, do ++
             _errorListProvider.Navigate(task, new Guid(Constants.vsViewKindCode));

VSColorOutput/Properties/AssemblyInfo.cs

@@ -10,6 +10,6 @@
 [assembly: AssemblyTrademark("VSColorOutput is a trademark of Mike Ward")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.73")]
-[assembly: AssemblyFileVersion("2.73")]
+[assembly: AssemblyVersion("2021.1")]
+[assembly: AssemblyFileVersion("2021.1")]
 [assembly: Guid("9D5A1B6F-D173-424E-B126-7A459F13DB7A")]

VSColorOutput/VSColorOutput.csproj

@@ -96,10 +96,10 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.204" ExcludeAssets="runtime">
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.0-previews-1-31410-273" ExcludeAssets="runtime">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.5.2044">
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.1619-preview1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

VSColorOutput/VsColorOutputPackage.cs

@@ -11,7 +11,7 @@ namespace VSColorOutput
     [Guid(VSColorOutputPackage.PackageGuidString)]
     [ProvideOptionPage(typeof(VsColorOutputOptionsDialog), VsColorOutputOptionsDialog.Category, VsColorOutputOptionsDialog.SubCategory, 1000, 1001, true)]
     [ProvideProfile(typeof(VsColorOutputOptionsDialog), VsColorOutputOptionsDialog.Category, VsColorOutputOptionsDialog.SubCategory, 1000, 1001, true)]
-    [InstalledProductRegistration("VSColorOutput", "Color output for build and debug windows - https://mike-ward.net/vscoloroutput", "2.73")]
+    [InstalledProductRegistration("VSColorOutput", "Color output for build and debug windows - https://mike-ward.net/vscoloroutput", "2021.1")]
     public sealed class VSColorOutputPackage : AsyncPackage
     {
         public const string PackageGuidString = "CD56B219-38CB-482A-9B2D-7582DF4AAF1E";

VSColorOutput/source.extension.vsixmanifest

@@ -1,24 +1,26 @@
 <?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="CD56B219-38CB-482A-9B2D-7582DF4AAF1E" Version="2.73" Language="en-US" Publisher="Mike Ward" />
-        <DisplayName>VSColorOutput</DisplayName>
-        <Description xml:space="preserve">Color output for build and debug windows</Description>
-        <MoreInfo>https://mike-ward.net/vscoloroutput</MoreInfo>
-        <License>Assets\License.txt</License>
-        <Icon>Assets\crayons.jpg</Icon>
-        <Tags>Build, Open Source, Productivity, Extension, Color, Output, Output Coloring</Tags>
-    </Metadata>
-    <Installation>
-        <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Community" />
-    </Installation>
-    <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-    </Dependencies>
-    <Assets>
-        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
-    </Assets>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
-    </Prerequisites>
+  <Metadata>
+    <Identity Id="CD56B219-38CB-482A-9B2D-7582DF4AAF1E" Version="2021.1" Language="en-US" Publisher="Mike Ward" />
+    <DisplayName>VSColorOutput</DisplayName>
+    <Description xml:space="preserve">Color output for build and debug windows</Description>
+    <MoreInfo>https://mike-ward.net/vscoloroutput</MoreInfo>
+    <License>Assets\License.txt</License>
+    <Icon>Assets\crayons.jpg</Icon>
+    <Tags>Build, Open Source, Productivity, Extension, Color, Output, Output Coloring</Tags>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+  </Dependencies>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+  </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
 </PackageManifest>