Updated to VS 2019 and CodeRush 19.x

src/CodeRushContextProviders.sln → CodeRushContextProviders.sln

@@ -1,11 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "P3Net.CodeRush.ContextProviders", "P3Net.CodeRush.ContextProviders\P3Net.CodeRush.ContextProviders.csproj", "{08EDE138-C862-47CC-A720-A6DDC011FB41}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "P3Net.CodeRush.ContextProviders", "src\P3Net.CodeRush.ContextProviders\P3Net.CodeRush.ContextProviders.csproj", "{08EDE138-C862-47CC-A720-A6DDC011FB41}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "P3NetCodeRushContextProvidersInstaller", "P3NetCodeRushContextProvidersInstaller\P3NetCodeRushContextProvidersInstaller.csproj", "{D6E39614-43CF-4015-B729-9F180D63A018}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "P3NetCodeRushContextProvidersInstaller", "src\P3NetCodeRushContextProvidersInstaller\P3NetCodeRushContextProvidersInstaller.csproj", "{D6E39614-43CF-4015-B729-9F180D63A018}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{90B741C1-36D5-48D4-A54F-814E94824510}"
+	ProjectSection(SolutionItems) = preProject
+		directory.build.props = directory.build.props
+		README.md = README.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,16 +31,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 3
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = https://cooldadtx.visualstudio.com/
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = P3NetCodeRushContextProvidersInstaller\\P3NetCodeRushContextProvidersInstaller.csproj
-		SccProjectName1 = P3NetCodeRushContextProvidersInstaller
-		SccLocalPath1 = P3NetCodeRushContextProvidersInstaller
-		SccProjectUniqueName2 = P3Net.CodeRush.ContextProviders\\P3Net.CodeRush.ContextProviders.csproj
-		SccProjectName2 = P3Net.CodeRush.ContextProviders
-		SccLocalPath2 = P3Net.CodeRush.ContextProviders
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {96AC430C-CF3B-4A11-BC90-FE865A4D36F7}
 	EndGlobalSection
 EndGlobal

README.md

@@ -1,6 +1,13 @@
-# P3Net
-CodeRush for Roslyn extension based upon the blog articles.
+CodeRush for Roslyn extension that expands the available 
 
 [Writing a Context Provider for CodeRush for Roslyn](http://www.michaeltaylorp3.net/writing-a-context-provider-for-coderush-for-roslyn/)
 
 [CodeRush- Writing a Context Provider](http://www.michaeltaylorp3.net/coderush-the-thrills-of-writing-an-addin/)
+
+## Release History
+
+| Release | Description |
+| - | - |
+| 2.0.0 | Updated to Visual Studio 2019 and CodeRush 19.x |
+| 1.1.0 | Updated to Visual Studio 2017 and CodeRush 18.x |
+| 1.0.0 | Original Version |

directory.build.props

@@ -0,0 +1,11 @@
+<Project>
+    <PropertyGroup>
+        <Version>2.0.0</Version>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+        <Product>P3Net CodeRush Context Providers</Product>
+
+        <Company>Michael Taylor</Company>
+        <Authors>P3Net;Michael Taylor</Authors>
+        <Copyright>Copyright © Michael Taylor, All Rights Reserved</Copyright>
+    </PropertyGroup>
+</Project>

src/P3Net.CodeRush.ContextProviders/Comments/CommentContextProvider.cs

@@ -1,8 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
+/*
+ * Copyright © 2012 Michael Taylor (P3Net)
+ * All Rights Reserved
+ *
+ * http://www.michaeltaylorp3.net
+ */
+using System;
 using System.Threading.Tasks;
 
 using DevExpress.CodeAnalysis.Workspaces;
@@ -22,15 +24,9 @@ public abstract class CommentContextProvider : DefaultContextProvider
 
         protected bool IsDocumentation { get; set; }
 
-        public override string Language
-        {
-            get { return KnownLanguageNames.CSharp; }
-        }
+        public override string Language => KnownLanguageNames.CSharp;
 
-        public override string Category
-        {
-            get { return @"P3Net\Code"; }
-        }
+        public override string Category => @"P3Net\Code";       
 
         public override async Task<bool> IsSatisfiedAsync ( IProviderContext context, ParameterCollection parameters )
         {
@@ -71,7 +67,7 @@ private bool InDocumentationElement ( SyntaxNode node )
         }
 
         //Determine if we are in a comment
-        private bool InCommentElement ( SyntaxNode node )
+        private bool InCommentElement ( SyntaxNode node ) 
         {
             var kind = node.Kind();
             return kind == SyntaxKind.SingleLineCommentTrivia || kind == SyntaxKind.MultiLineCommentTrivia;

src/P3Net.CodeRush.ContextProviders/P3Net.CodeRush.ContextProviders.csproj

@@ -1,13 +1,7 @@
 <Project Sdk="Microsoft.Net.Sdk">
     <PropertyGroup>
-        <TargetFramework>net461</TargetFramework>
-    <ApplicationVersion>1.2.0</ApplicationVersion>
-    <Company>P3Net</Company>
-    <Version>1.2.0</Version>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <RepositoryUrl>https://github.com/CoolDadTx/p3net-coderush-extensions</RepositoryUrl>
-    <RepositoryType>GitHub</RepositoryType>
-    <PackageReleaseNotes>Updated to CodeRush 18.1</PackageReleaseNotes>    
+        <TargetFramework>net472</TargetFramework>
+        <PackageReleaseNotes>Updated to CodeRush 18.1</PackageReleaseNotes>    
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="System.ComponentModel.Composition" />
@@ -27,9 +21,9 @@
             <HintPath>..\Libraries\DevExpress.CodeRush.TextEditor.dll</HintPath>
         </Reference>
     </ItemGroup>
+
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.0" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.8.0" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="2.8.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.1.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.1.0" />
     </ItemGroup>
 </Project>

src/P3NetCodeRushContextProvidersInstaller/P3NetCodeRushContextProvidersInstaller.csproj

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>$(VisualStudionVersion)</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
+	<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -15,13 +19,16 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>P3NetCodeRushContextProvidersInstaller</RootNamespace>
     <AssemblyName>P3NetCodeRushContextProvidersInstaller</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
     <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+      <StartAction>Program</StartAction>
+      <StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
+      <StartArguments>/rootsuffix Exp</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -57,10 +64,14 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.7.7\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="16.0.29">
+		   <PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+    </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
 </Project>

src/P3NetCodeRushContextProvidersInstaller/Properties/AssemblyInfo.cs

@@ -8,26 +8,13 @@
 [assembly: AssemblyTitle("P3Net CodeRush ContextProviders Installer")]
 [assembly: AssemblyDescription("Installer for P3Net.CodeRush.ContextProviders")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("P3Net")]
+[assembly: AssemblyCompany("Michael Taylor")]
 [assembly: AssemblyProduct("P3Net.CodeRush")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]

src/P3NetCodeRushContextProvidersInstaller/source.extension.vsixmanifest

@@ -1,24 +1,23 @@
 <?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="P3Net.CodeRush.ContextProviders.VS2017" Version="1.2.0" Language="en-US" Publisher="P3Net" />
-        <DisplayName>P3Net CodeRush ContextProviders (VS 2017)</DisplayName>
+        <Identity Id="P3Net.CodeRush.ContextProviders" Version="2.0.0" Language="en-US" Publisher="P3Net" />
+        <DisplayName>P3Net CodeRush ContextProviders</DisplayName>
         <Description xml:space="preserve">Installer for CodeRush for Roslyn context providers from P3Net.</Description>
         <MoreInfo>https://github.com/CoolDadTx/CodeRush_Extensions</MoreInfo>
-        <GettingStartedGuide>http://www.michaeltaylorp3.net</GettingStartedGuide>
-        <ReleaseNotes>Updated to support CodeRush 18.1</ReleaseNotes>
+        <GettingStartedGuide>http://www.michaeltaylorp3.net/writing-a-context-provider-for-coderush-for-roslyn/</GettingStartedGuide>
+        <ReleaseNotes>http://www.michaeltaylorp3.net/writing-a-context-provider-for-coderush-for-roslyn/</ReleaseNotes>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
     </Installation>
     <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-        <Dependency d:Source="Installed" Id="81b8f465-6112-407e-a05a-44e3188746af" DisplayName="CodeRush" Version="[18.1.3,19.0)" d:InstallSource="Download" />
+        <Dependency d:Source="Installed" Id="81b8f465-6112-407e-a05a-44e3188746af" DisplayName="CodeRush" Version="[19.1,20.0)" d:InstallSource="Download" />
     </Dependencies>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="P3Net.CodeRush.ContextProviders" Path="|P3Net.CodeRush.ContextProviders|" />
     </Assets>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
 </PackageManifest>