diff --git a/src/CodeRushContextProviders.sln b/CodeRushContextProviders.sln similarity index 52% rename from src/CodeRushContextProviders.sln rename to CodeRushContextProviders.sln index aabfe23..1a65cd5 100644 --- a/src/CodeRushContextProviders.sln +++ b/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 diff --git a/README.md b/README.md index 7d3d26f..5b39cf3 100644 --- a/README.md +++ b/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 | \ No newline at end of file diff --git a/directory.build.props b/directory.build.props new file mode 100644 index 0000000..0dae402 --- /dev/null +++ b/directory.build.props @@ -0,0 +1,11 @@ + + + 2.0.0 + 2.0.0.0 + P3Net CodeRush Context Providers + + Michael Taylor + P3Net;Michael Taylor + Copyright © Michael Taylor, All Rights Reserved + + \ No newline at end of file diff --git a/src/Libraries/DevExpress.CodeAnalysis.Workspaces.dll b/src/Libraries/DevExpress.CodeAnalysis.Workspaces.dll index 46054a3..b2a7a5b 100644 Binary files a/src/Libraries/DevExpress.CodeAnalysis.Workspaces.dll and b/src/Libraries/DevExpress.CodeAnalysis.Workspaces.dll differ diff --git a/src/Libraries/DevExpress.CodeAnalysis.dll b/src/Libraries/DevExpress.CodeAnalysis.dll index 2017f2e..04db660 100644 Binary files a/src/Libraries/DevExpress.CodeAnalysis.dll and b/src/Libraries/DevExpress.CodeAnalysis.dll differ diff --git a/src/Libraries/DevExpress.CodeRush.Foundation.dll b/src/Libraries/DevExpress.CodeRush.Foundation.dll index cc088be..6aa1c1d 100644 Binary files a/src/Libraries/DevExpress.CodeRush.Foundation.dll and b/src/Libraries/DevExpress.CodeRush.Foundation.dll differ diff --git a/src/Libraries/DevExpress.CodeRush.Platform.dll b/src/Libraries/DevExpress.CodeRush.Platform.dll index 6339dcd..987dc9e 100644 Binary files a/src/Libraries/DevExpress.CodeRush.Platform.dll and b/src/Libraries/DevExpress.CodeRush.Platform.dll differ diff --git a/src/Libraries/DevExpress.CodeRush.TextEditor.dll b/src/Libraries/DevExpress.CodeRush.TextEditor.dll index 6a207b9..eca4d8c 100644 Binary files a/src/Libraries/DevExpress.CodeRush.TextEditor.dll and b/src/Libraries/DevExpress.CodeRush.TextEditor.dll differ diff --git a/src/P3Net.CodeRush.ContextProviders/Comments/CommentContextProvider.cs b/src/P3Net.CodeRush.ContextProviders/Comments/CommentContextProvider.cs index d0b28ce..452db4f 100644 --- a/src/P3Net.CodeRush.ContextProviders/Comments/CommentContextProvider.cs +++ b/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 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; diff --git a/src/P3Net.CodeRush.ContextProviders/P3Net.CodeRush.ContextProviders.csproj b/src/P3Net.CodeRush.ContextProviders/P3Net.CodeRush.ContextProviders.csproj index adfbd04..e3442cf 100644 --- a/src/P3Net.CodeRush.ContextProviders/P3Net.CodeRush.ContextProviders.csproj +++ b/src/P3Net.CodeRush.ContextProviders/P3Net.CodeRush.ContextProviders.csproj @@ -1,13 +1,7 @@  - net461 - 1.2.0 - P3Net - 1.2.0 - 1.2.0.0 - https://github.com/CoolDadTx/p3net-coderush-extensions - GitHub - Updated to CodeRush 18.1 + net472 + Updated to CodeRush 18.1 @@ -27,9 +21,9 @@ ..\Libraries\DevExpress.CodeRush.TextEditor.dll + - - - + + \ No newline at end of file diff --git a/src/P3NetCodeRushContextProvidersInstaller/P3NetCodeRushContextProvidersInstaller.csproj b/src/P3NetCodeRushContextProvidersInstaller/P3NetCodeRushContextProvidersInstaller.csproj index a83fc5b..2503795 100644 --- a/src/P3NetCodeRushContextProvidersInstaller/P3NetCodeRushContextProvidersInstaller.csproj +++ b/src/P3NetCodeRushContextProvidersInstaller/P3NetCodeRushContextProvidersInstaller.csproj @@ -1,8 +1,12 @@  - 15.0 + $(VisualStudionVersion) $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + PackageReference @@ -15,13 +19,16 @@ Properties P3NetCodeRushContextProvidersInstaller P3NetCodeRushContextProvidersInstaller - v4.6.1 + v4.7.2 false false false false false false + Program + $(DevEnvDir)\devenv.exe + /rootsuffix Exp true @@ -57,10 +64,14 @@ - - + + + + + all + + - \ No newline at end of file diff --git a/src/P3NetCodeRushContextProvidersInstaller/Properties/AssemblyInfo.cs b/src/P3NetCodeRushContextProvidersInstaller/Properties/AssemblyInfo.cs index 9811ea6..1df239e 100644 --- a/src/P3NetCodeRushContextProvidersInstaller/Properties/AssemblyInfo.cs +++ b/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")] diff --git a/src/P3NetCodeRushContextProvidersInstaller/packages.config b/src/P3NetCodeRushContextProvidersInstaller/packages.config deleted file mode 100644 index af198ab..0000000 --- a/src/P3NetCodeRushContextProvidersInstaller/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/P3NetCodeRushContextProvidersInstaller/source.extension.vsixmanifest b/src/P3NetCodeRushContextProvidersInstaller/source.extension.vsixmanifest index 027db9a..3eb325b 100644 --- a/src/P3NetCodeRushContextProvidersInstaller/source.extension.vsixmanifest +++ b/src/P3NetCodeRushContextProvidersInstaller/source.extension.vsixmanifest @@ -1,24 +1,23 @@ - - P3Net CodeRush ContextProviders (VS 2017) + + P3Net CodeRush ContextProviders Installer for CodeRush for Roslyn context providers from P3Net. https://github.com/CoolDadTx/CodeRush_Extensions - http://www.michaeltaylorp3.net - Updated to support CodeRush 18.1 + http://www.michaeltaylorp3.net/writing-a-context-provider-for-coderush-for-roslyn/ + http://www.michaeltaylorp3.net/writing-a-context-provider-for-coderush-for-roslyn/ - + - - + - +