From 17455920ccfbc2f9ba118e5a079ee52b3e450ec9 Mon Sep 17 00:00:00 2001
From: Dominik Rauch <dominik@rauch.io>
Date: Tue, 24 Nov 2020 20:32:35 +0100
Subject: [PATCH 1/5] Add support for R#/Rider 2020.2

---
 ...jects_ImplicitNullability_BuildVersion.xml |  2 +-
 Build/Build.ps1                               |  6 +++---
 History.md                                    |  4 ++++
 ImplicitNullability.sln                       | 10 +++++-----
 README.md                                     |  2 +-
 ...itNullability.Plugin.Tests.RD20202.csproj} |  2 +-
 ...itNullability.Plugin.Tests.RS20202.csproj} |  2 +-
 ...nHierarchyWarningFilteringDecoratorTest.cs |  2 +-
 ...Plugin.VsFormatDefinitions.RS20202.csproj} |  2 +-
 ...ncyInHierarchyWarningFilteringDecorator.cs |  3 ++-
 ...tNotNullConflictInHierarchyHighlighting.cs | 19 +++++++++---------
 ...mentCannotOverrideCanBeNullHighlighting.cs | 19 +++++++++---------
 ...nknownBaseMemberNullabilityHighlighting.cs | 20 +++++++++----------
 ...nknownBaseMemberNullabilityHighlighting.cs | 20 +++++++++----------
 .../NotNullOnImplicitCanBeNullHighlighting.cs | 18 ++++++++---------
 ...ImplicitNullability.Plugin.RD20202.csproj} |  2 +-
 ...ImplicitNullability.Plugin.RS20202.csproj} |  2 +-
 .../StaticNullabilityItemTypeHighlighting.cs  | 17 ++++++++--------
 .../StaticNullabilityTypeHighlighting.cs      | 17 ++++++++--------
 Src/RiderPlugin/build.gradle                  |  4 ++--
 20 files changed, 84 insertions(+), 89 deletions(-)
 rename Src/ImplicitNullability.Plugin.Tests/{ImplicitNullability.Plugin.Tests.RD20201.csproj => ImplicitNullability.Plugin.Tests.RD20202.csproj} (98%)
 rename Src/ImplicitNullability.Plugin.Tests/{ImplicitNullability.Plugin.Tests.RS20201.csproj => ImplicitNullability.Plugin.Tests.RS20202.csproj} (98%)
 rename Src/ImplicitNullability.Plugin.VsFormatDefinitions/{ImplicitNullability.Plugin.VsFormatDefinitions.RS20201.csproj => ImplicitNullability.Plugin.VsFormatDefinitions.RS20202.csproj} (97%)
 rename Src/ImplicitNullability.Plugin/{ImplicitNullability.Plugin.RD20201.csproj => ImplicitNullability.Plugin.RD20202.csproj} (98%)
 rename Src/ImplicitNullability.Plugin/{ImplicitNullability.Plugin.RS20201.csproj => ImplicitNullability.Plugin.RS20202.csproj} (98%)

diff --git a/.teamcity/OpenSourceProjects_ImplicitNullability/buildTypes/OpenSourceProjects_ImplicitNullability_BuildVersion.xml b/.teamcity/OpenSourceProjects_ImplicitNullability/buildTypes/OpenSourceProjects_ImplicitNullability_BuildVersion.xml
index e747025..d93ec09 100644
--- a/.teamcity/OpenSourceProjects_ImplicitNullability/buildTypes/OpenSourceProjects_ImplicitNullability_BuildVersion.xml
+++ b/.teamcity/OpenSourceProjects_ImplicitNullability/buildTypes/OpenSourceProjects_ImplicitNullability_BuildVersion.xml
@@ -7,7 +7,7 @@
       <option name="buildNumberPattern" value="%Version%.%build.counter%" />
     </options>
     <parameters>
-      <param name="Version" value="4.10.0" />
+      <param name="Version" value="4.11.0" />
     </parameters>
     <build-runners />
     <vcs-settings />
diff --git a/Build/Build.ps1 b/Build/Build.ps1
index da70d98..5c63f66 100644
--- a/Build/Build.ps1
+++ b/Build/Build.ps1
@@ -19,15 +19,15 @@ $MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\
 $MSBuildAdditionalArgs = "/nowarn:MSB3277"
 $NUnitAdditionalArgs = "--x86 --labels=All --agents=1"
 $NUnitTestAssemblyPaths = @(
-    "Src\ImplicitNullability.Plugin.Tests\bin\RD20201\$Configuration\ImplicitNullability.Plugin.Tests.RD20201.dll"
-    "Src\ImplicitNullability.Plugin.Tests\bin\RS20201\$Configuration\ImplicitNullability.Plugin.Tests.RS20201.dll"
+    "Src\ImplicitNullability.Plugin.Tests\bin\RD20202\$Configuration\ImplicitNullability.Plugin.Tests.RD20202.dll"
+    "Src\ImplicitNullability.Plugin.Tests\bin\RS20202\$Configuration\ImplicitNullability.Plugin.Tests.RS20202.dll"
     "Src\ImplicitNullability.Samples.Consumer\bin\OfInternalCodeWithIN\$Configuration\ImplicitNullability.Samples.Consumer.OfInternalCodeWithIN.dll"
 )
 $NUnitFrameworkVersion = "net-4.5"
 $TestCoverageFilter = "+[ImplicitNullability*]* -[ImplicitNullability*]ReSharperExtensionsShared.* -[ImplicitNullability.Samples.CodeWithIN.*]* -[ImplicitNullability.Samples.CodeWithoutIN.External]*"
 $NuspecPath = "Src\ImplicitNullability.Plugin\ImplicitNullability.nuspec"
 $NugetPackProperties = @(
-    "Version=$(CalcNuGetPackageVersion 20201);Configuration=$Configuration;DependencyVer=[201.0];BinDirInclude=bin\RS20201"
+    "Version=$(CalcNuGetPackageVersion 20202);Configuration=$Configuration;DependencyVer=[201.0];BinDirInclude=bin\RS20202"
 )
 $RiderPluginProject = "Src\RiderPlugin"
 $NugetPushServer = "https://www.myget.org/F/ulrichb/api/v2/package"
diff --git a/History.md b/History.md
index 69bd92a..62c434a 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+### 4.11.0 ###
+- (!) End-of-life note: Please switch to C# 8 Nullable Reference Types
+- ReSharper and Rider 2020.2 support
+
 ### 4.10.0 ###
 - (!) End-of-life note: Please switch to C# 8 Nullable Reference Types
 - ReSharper and Rider 2020.1 support
diff --git a/ImplicitNullability.sln b/ImplicitNullability.sln
index a2458d3..2469a30 100644
--- a/ImplicitNullability.sln
+++ b/ImplicitNullability.sln
@@ -26,17 +26,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplicitNullability.Samples
 		{C98DF2CD-3BB5-4213-9D90-08241ED5B74F} = {C98DF2CD-3BB5-4213-9D90-08241ED5B74F}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.VsFormatDefinitions.RS20201", "Src\ImplicitNullability.Plugin.VsFormatDefinitions\ImplicitNullability.Plugin.VsFormatDefinitions.RS20201.csproj", "{69D96DC8-E1A0-4412-AD54-BAEC0B43520E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.VsFormatDefinitions.RS20202", "Src\ImplicitNullability.Plugin.VsFormatDefinitions\ImplicitNullability.Plugin.VsFormatDefinitions.RS20202.csproj", "{69D96DC8-E1A0-4412-AD54-BAEC0B43520E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.RS20201", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.RS20201.csproj", "{2F246B16-414A-4FDF-9DE2-3EC8E51D1B9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.RS20202", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.RS20202.csproj", "{2F246B16-414A-4FDF-9DE2-3EC8E51D1B9A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.RS20201", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.RS20201.csproj", "{1C93B659-62A2-4539-815D-D20BABB47451}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.RS20202", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.RS20202.csproj", "{1C93B659-62A2-4539-815D-D20BABB47451}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplicitNullability.Samples.CodeWithIN.Special", "Src\ImplicitNullability.Samples.CodeWithIN.Special\ImplicitNullability.Samples.CodeWithIN.Special.csproj", "{4979B806-EB66-4C3F-8BB0-7AF284AEB0BD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.RD20201", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.RD20201.csproj", "{4ECAB56A-44C9-4A46-B401-FBD782634AA0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.RD20202", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.RD20202.csproj", "{4ECAB56A-44C9-4A46-B401-FBD782634AA0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.RD20201", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.RD20201.csproj", "{2E9FE56E-2507-42FC-8146-2F4F9BA4397D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.RD20202", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.RD20202.csproj", "{2E9FE56E-2507-42FC-8146-2F4F9BA4397D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/README.md b/README.md
index 72d1e34..a5561cf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-:warning: **End-of-life note:** C# 8+ (VS 2019+) supports [_nullable reference types_](https://docs.microsoft.com/en-us/dotnet/csharp/tutorials/nullable-reference-types) which [supersedes](#c-nullable-reference-types) - and perfectly aligns with - _Implicit Nullability_. Therefore ReSharper/Rider 2020.1 is the last version supported by _Implicit Nullability_.
+:warning: **End-of-life note:** C# 8+ (VS 2019+) supports [_nullable reference types_](https://docs.microsoft.com/en-us/dotnet/csharp/tutorials/nullable-reference-types) which [supersedes](#c-nullable-reference-types) - and perfectly aligns with - _Implicit Nullability_. Therefore ReSharper/Rider 2020.2 is the last version supported by _Implicit Nullability_.
 
 ## Implicit Nullability ReSharper Extension
 
diff --git a/Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RD20201.csproj b/Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RD20202.csproj
similarity index 98%
rename from Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RD20201.csproj
rename to Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RD20202.csproj
index 65d33aa..07fae93 100644
--- a/Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RD20201.csproj
+++ b/Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RD20202.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Rider.SDK.Tests" Version="2020.1.*" />
+    <PackageReference Include="JetBrains.Rider.SDK.Tests" Version="2020.2.*" />
     <PackageReference Include="FakeItEasy" Version="4.*" />
     <PackageReference Include="ncalc" Version="1.3.*" />
   </ItemGroup>
diff --git a/Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RS20201.csproj b/Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RS20202.csproj
similarity index 98%
rename from Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RS20201.csproj
rename to Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RS20202.csproj
index 204efc3..2d24b94 100644
--- a/Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RS20201.csproj
+++ b/Src/ImplicitNullability.Plugin.Tests/ImplicitNullability.Plugin.Tests.RS20202.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.1.*" />
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.2.*" />
     <PackageReference Include="FakeItEasy" Version="4.*" />
     <PackageReference Include="ncalc" Version="1.3.*" />
   </ItemGroup>
diff --git a/Src/ImplicitNullability.Plugin.Tests/UnitTests/AnnotationRedundancyInHierarchyWarningFilteringDecoratorTest.cs b/Src/ImplicitNullability.Plugin.Tests/UnitTests/AnnotationRedundancyInHierarchyWarningFilteringDecoratorTest.cs
index c4d0e84..e12c81e 100644
--- a/Src/ImplicitNullability.Plugin.Tests/UnitTests/AnnotationRedundancyInHierarchyWarningFilteringDecoratorTest.cs
+++ b/Src/ImplicitNullability.Plugin.Tests/UnitTests/AnnotationRedundancyInHierarchyWarningFilteringDecoratorTest.cs
@@ -28,7 +28,7 @@ public void ConsumeHighlighting_WithSomeHighlighting_ShouldPassCall()
 
             _sut.ConsumeHighlighting(highlightingInfo);
 
-            A_.CallTo(() => _decorated.ConsumeHighlighting(highlightingInfo)).MustHaveHappened();
+            A_.CallTo(() => _decorated.ConsumeHighlighting(highlightingInfo, null, null)).MustHaveHappened();
         }
 
         [Test]
diff --git a/Src/ImplicitNullability.Plugin.VsFormatDefinitions/ImplicitNullability.Plugin.VsFormatDefinitions.RS20201.csproj b/Src/ImplicitNullability.Plugin.VsFormatDefinitions/ImplicitNullability.Plugin.VsFormatDefinitions.RS20202.csproj
similarity index 97%
rename from Src/ImplicitNullability.Plugin.VsFormatDefinitions/ImplicitNullability.Plugin.VsFormatDefinitions.RS20201.csproj
rename to Src/ImplicitNullability.Plugin.VsFormatDefinitions/ImplicitNullability.Plugin.VsFormatDefinitions.RS20202.csproj
index 141f078..3e142ad 100644
--- a/Src/ImplicitNullability.Plugin.VsFormatDefinitions/ImplicitNullability.Plugin.VsFormatDefinitions.RS20201.csproj
+++ b/Src/ImplicitNullability.Plugin.VsFormatDefinitions/ImplicitNullability.Plugin.VsFormatDefinitions.RS20202.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.1.*" />
+    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.2.*" />
     <PackageReference Include="VSSDK.Text.10" Version="10.*" />
   </ItemGroup>
 
diff --git a/Src/ImplicitNullability.Plugin/AnnotationRedundancyInHierarchyWarningFilteringDecorator.cs b/Src/ImplicitNullability.Plugin/AnnotationRedundancyInHierarchyWarningFilteringDecorator.cs
index 534762b..3c5635e 100644
--- a/Src/ImplicitNullability.Plugin/AnnotationRedundancyInHierarchyWarningFilteringDecorator.cs
+++ b/Src/ImplicitNullability.Plugin/AnnotationRedundancyInHierarchyWarningFilteringDecorator.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using JetBrains.DocumentModel;
 using JetBrains.ReSharper.Daemon.CSharp.Errors;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 
@@ -13,7 +14,7 @@ public AnnotationRedundancyInHierarchyWarningFilteringDecorator(IHighlightingCon
             _decorated = decorated;
         }
 
-        public void ConsumeHighlighting(HighlightingInfo highlightingInfo)
+        public void ConsumeHighlighting(HighlightingInfo highlightingInfo, DocumentRange[] secondaryDocumentRanges = null, string secondaryAttributeId = null)
         {
             if (!(highlightingInfo.Highlighting is AnnotationRedundancyInHierarchyWarning))
             {
diff --git a/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullConflictInHierarchyHighlighting.cs b/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullConflictInHierarchyHighlighting.cs
index 804fb80..c6db354 100644
--- a/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullConflictInHierarchyHighlighting.cs
+++ b/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullConflictInHierarchyHighlighting.cs
@@ -1,18 +1,17 @@
-using ImplicitNullability.Plugin.Highlighting;
-using JetBrains.ReSharper.Feature.Services.Daemon;
+using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.Tree;
 
-[assembly: RegisterConfigurableSeverity(
-    ImplicitNotNullConflictInHierarchyHighlighting.SeverityId,
-    CompoundItemName: null,
-    Group: HighlightingGroupIds.CodeSmell,
-    Title: ImplicitNotNullConflictInHierarchyHighlighting.Message,
-    Description: ImplicitNotNullConflictInHierarchyHighlighting.Description,
-    DefaultSeverity: Severity.WARNING)]
-
 namespace ImplicitNullability.Plugin.Highlighting
 {
+    [RegisterConfigurableSeverity(
+        SeverityId,
+        CompoundItemName: null,
+        Group: HighlightingGroupIds.CodeSmell,
+        Title: Message,
+        Description: Description,
+        DefaultSeverity: Severity.WARNING)]
+
     [ConfigurableSeverityHighlighting(
         SeverityId,
         CSharpLanguage.Name,
diff --git a/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.cs b/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.cs
index 580a764..5cc2ec7 100644
--- a/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.cs
+++ b/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.cs
@@ -1,18 +1,17 @@
-using ImplicitNullability.Plugin.Highlighting;
-using JetBrains.ReSharper.Feature.Services.Daemon;
+using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.Tree;
 
-[assembly: RegisterConfigurableSeverity(
-    ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.SeverityId,
-    CompoundItemName: null,
-    Group: HighlightingGroupIds.CodeSmell,
-    Title: ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.Message,
-    Description: ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.Description,
-    DefaultSeverity: Severity.WARNING)]
-
 namespace ImplicitNullability.Plugin.Highlighting
 {
+    [RegisterConfigurableSeverity(
+        SeverityId,
+        CompoundItemName: null,
+        Group: HighlightingGroupIds.CodeSmell,
+        Title: Message,
+        Description: Description,
+        DefaultSeverity: Severity.WARNING)]
+
     [ConfigurableSeverityHighlighting(
         SeverityId,
         CSharpLanguage.Name,
diff --git a/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.cs b/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.cs
index f471967..e86ca83 100644
--- a/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.cs
+++ b/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.cs
@@ -1,19 +1,17 @@
-using ImplicitNullability.Plugin.Highlighting;
-using JetBrains.ReSharper.Feature.Services.Daemon;
+using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.Tree;
 
-[assembly: RegisterConfigurableSeverity(
-    ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.SeverityId,
-    CompoundItemName: null,
-    Group: HighlightingGroupIds.CodeSmell,
-    Title: ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.Message,
-    Description: ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.Description,
-    DefaultSeverity: Severity.WARNING,
-    AlternativeIDs = "ImplicitNotNullOverridesUnknownExternalMember")]
-
 namespace ImplicitNullability.Plugin.Highlighting
 {
+    [RegisterConfigurableSeverity(
+        SeverityId,
+        CompoundItemName: null,
+        Group: HighlightingGroupIds.CodeSmell,
+        Title: Message,
+        Description: Description,
+        DefaultSeverity: Severity.WARNING,
+        AlternativeIDs = "ImplicitNotNullOverridesUnknownExternalMember")]
     [ConfigurableSeverityHighlighting(
         SeverityId,
         CSharpLanguage.Name,
diff --git a/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.cs b/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.cs
index 53a29da..04e0ba6 100644
--- a/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.cs
+++ b/Src/ImplicitNullability.Plugin/Highlighting/ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.cs
@@ -1,19 +1,17 @@
-using ImplicitNullability.Plugin.Highlighting;
-using JetBrains.ReSharper.Feature.Services.Daemon;
+using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.Tree;
 
-[assembly: RegisterConfigurableSeverity(
-    ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.SeverityId,
-    CompoundItemName: null,
-    Group: HighlightingGroupIds.CodeSmell,
-    Title: ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.Message,
-    Description: ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.Description,
-    DefaultSeverity: Severity.HINT,
-    AlternativeIDs = "ImplicitNotNullResultOverridesUnknownExternalMember")]
-
 namespace ImplicitNullability.Plugin.Highlighting
 {
+    [RegisterConfigurableSeverity(
+        SeverityId,
+        CompoundItemName: null,
+        Group: HighlightingGroupIds.CodeSmell,
+        Title: Message,
+        Description: Description,
+        DefaultSeverity: Severity.HINT,
+        AlternativeIDs = "ImplicitNotNullResultOverridesUnknownExternalMember")]
     [ConfigurableSeverityHighlighting(
         SeverityId,
         CSharpLanguage.Name,
diff --git a/Src/ImplicitNullability.Plugin/Highlighting/NotNullOnImplicitCanBeNullHighlighting.cs b/Src/ImplicitNullability.Plugin/Highlighting/NotNullOnImplicitCanBeNullHighlighting.cs
index 5532d26..6ca7096 100644
--- a/Src/ImplicitNullability.Plugin/Highlighting/NotNullOnImplicitCanBeNullHighlighting.cs
+++ b/Src/ImplicitNullability.Plugin/Highlighting/NotNullOnImplicitCanBeNullHighlighting.cs
@@ -1,18 +1,16 @@
-using ImplicitNullability.Plugin.Highlighting;
-using JetBrains.ReSharper.Feature.Services.Daemon;
+using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.Tree;
 
-[assembly: RegisterConfigurableSeverity(
-    NotNullOnImplicitCanBeNullHighlighting.SeverityId,
-    CompoundItemName: null,
-    Group: HighlightingGroupIds.CodeSmell,
-    Title: NotNullOnImplicitCanBeNullHighlighting.Message,
-    Description: NotNullOnImplicitCanBeNullHighlighting.Description,
-    DefaultSeverity: Severity.WARNING)]
-
 namespace ImplicitNullability.Plugin.Highlighting
 {
+    [RegisterConfigurableSeverity(
+        SeverityId,
+        CompoundItemName: null,
+        Group: HighlightingGroupIds.CodeSmell,
+        Title: Message,
+        Description: Description,
+        DefaultSeverity: Severity.WARNING)]
     [ConfigurableSeverityHighlighting(
         SeverityId,
         CSharpLanguage.Name,
diff --git a/Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RD20201.csproj b/Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RD20202.csproj
similarity index 98%
rename from Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RD20201.csproj
rename to Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RD20202.csproj
index a37fb67..a092dde 100644
--- a/Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RD20201.csproj
+++ b/Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RD20202.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Rider.SDK" Version="2020.1.*" />
+    <PackageReference Include="JetBrains.Rider.SDK" Version="2020.2.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RS20201.csproj b/Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RS20202.csproj
similarity index 98%
rename from Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RS20201.csproj
rename to Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RS20202.csproj
index 34616ce..e5ab2c2 100644
--- a/Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RS20201.csproj
+++ b/Src/ImplicitNullability.Plugin/ImplicitNullability.Plugin.RS20202.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.1.*" />
+    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.2.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityItemTypeHighlighting.cs b/Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityItemTypeHighlighting.cs
index 172e334..e8d93bf 100644
--- a/Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityItemTypeHighlighting.cs
+++ b/Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityItemTypeHighlighting.cs
@@ -1,4 +1,3 @@
-using ImplicitNullability.Plugin.TypeHighlighting;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.Tree;
@@ -6,18 +5,18 @@
 
 // For ReSharper/VS's format definition, see NullabilityItemTypeHighlightingClassificationFormatDefinition
 
-[assembly: RegisterHighlighter(
-    StaticNullabilityItemTypeHighlighting.HighlightingId,
-    EffectColor = "#FF7CE3",
-    EffectType = EffectType.DOTTED_UNDERLINE,
-    Layer = HighlighterLayer.SYNTAX,
-    VSPriority = VSPriority.IDENTIFIERS)]
-
 namespace ImplicitNullability.Plugin.TypeHighlighting
 {
+    [RegisterHighlighter(
+        HighlightingId,
+        EffectColor = "#FF7CE3",
+        EffectType = EffectType.DOTTED_UNDERLINE,
+        Layer = HighlighterLayer.SYNTAX,
+        VSPriority = VSPriority.IDENTIFIERS)]
     [StaticSeverityHighlighting(
         Severity.INFO,
-        CSharpLanguage.Name,
+        typeof(HighlightingGroupIds.CodeSmellStatic),
+        Languages = CSharpLanguage.Name,
         AttributeId = HighlightingId,
         ShowToolTipInStatusBar = false,
         ToolTipFormatString = Message)]
diff --git a/Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityTypeHighlighting.cs b/Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityTypeHighlighting.cs
index 6e08415..481d448 100644
--- a/Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityTypeHighlighting.cs
+++ b/Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityTypeHighlighting.cs
@@ -1,4 +1,3 @@
-using ImplicitNullability.Plugin.TypeHighlighting;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.Tree;
@@ -6,18 +5,18 @@
 
 // For ReSharper/VS's format definition, see NullabilityTypeHighlightingClassificationFormatDefinition
 
-[assembly: RegisterHighlighter(
-    StaticNullabilityTypeHighlighting.HighlightingId,
-    EffectColor = "#E53DFF",
-    EffectType = EffectType.DOTTED_UNDERLINE,
-    Layer = HighlighterLayer.SYNTAX,
-    VSPriority = VSPriority.IDENTIFIERS)]
-
 namespace ImplicitNullability.Plugin.TypeHighlighting
 {
+    [RegisterHighlighter(
+        HighlightingId,
+        EffectColor = "#E53DFF",
+        EffectType = EffectType.DOTTED_UNDERLINE,
+        Layer = HighlighterLayer.SYNTAX,
+        VSPriority = VSPriority.IDENTIFIERS)]
     [StaticSeverityHighlighting(
         Severity.INFO,
-        CSharpLanguage.Name,
+        typeof(HighlightingGroupIds.CodeSmellStatic),
+        Languages = CSharpLanguage.Name,
         AttributeId = HighlightingId,
         ShowToolTipInStatusBar = false,
         ToolTipFormatString = Message)]
diff --git a/Src/RiderPlugin/build.gradle b/Src/RiderPlugin/build.gradle
index ee9416f..1cc16d0 100644
--- a/Src/RiderPlugin/build.gradle
+++ b/Src/RiderPlugin/build.gradle
@@ -16,7 +16,7 @@ if (!project.hasProperty('configuration')) ext.configuration = 'Debug'
 intellij {
     type = 'RD'
     // https://www.jetbrains.com/intellij-repository/releases
-    version = '2020.1.0'
+    version = '2020.2.0'
     downloadSources = false
 }
 
@@ -25,7 +25,7 @@ compileKotlin {
 }
 
 prepareSandbox {
-    from("$projectDir/../$gradle.resharperPluginProjectName/bin/RD20201/$configuration", {
+    from("$projectDir/../$gradle.resharperPluginProjectName/bin/RD20202/$configuration", {
         into "$intellij.pluginName/dotnet"
         include "$gradle.resharperPluginProjectName*"
     })

From f5f5d273d95220152469505b491e0486e949c7fb Mon Sep 17 00:00:00 2001
From: Dominik Rauch <dominik@rauch.io>
Date: Fri, 27 Nov 2020 17:41:36 +0100
Subject: [PATCH 2/5] Fix MSBuildPath for CI server.

---
 Build/Build.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Build/Build.ps1 b/Build/Build.ps1
index 5c63f66..388e977 100644
--- a/Build/Build.ps1
+++ b/Build/Build.ps1
@@ -15,7 +15,7 @@ trap { $error[0] | Format-List -Force; $host.SetShouldExit(1) }
 
 $BuildOutputPath = "Build\Output"
 $SolutionFilePath = "ImplicitNullability.sln"
-$MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\*\MSBuild\15.0\Bin\MSBuild.exe").FullName
+$MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\*\MSBuild\16.0\Bin\MSBuild.exe").FullName
 $MSBuildAdditionalArgs = "/nowarn:MSB3277"
 $NUnitAdditionalArgs = "--x86 --labels=All --agents=1"
 $NUnitTestAssemblyPaths = @(

From b4b6bd1b5868732af30fd85756ab2ce34cca922d Mon Sep 17 00:00:00 2001
From: Dominik Rauch <dominik@rauch.io>
Date: Fri, 27 Nov 2020 18:20:12 +0100
Subject: [PATCH 3/5] Fix MSBuild location.

---
 Build/Build.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Build/Build.ps1 b/Build/Build.ps1
index 388e977..aadd1d1 100644
--- a/Build/Build.ps1
+++ b/Build/Build.ps1
@@ -15,7 +15,7 @@ trap { $error[0] | Format-List -Force; $host.SetShouldExit(1) }
 
 $BuildOutputPath = "Build\Output"
 $SolutionFilePath = "ImplicitNullability.sln"
-$MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\*\MSBuild\16.0\Bin\MSBuild.exe").FullName
+$MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\*\MSBuild\Current\Bin\MSBuild.exe").FullName
 $MSBuildAdditionalArgs = "/nowarn:MSB3277"
 $NUnitAdditionalArgs = "--x86 --labels=All --agents=1"
 $NUnitTestAssemblyPaths = @(

From 34d9f5b189199ff098d14afa25c028adfe51776f Mon Sep 17 00:00:00 2001
From: Dominik Rauch <dominik@rauch.io>
Date: Fri, 27 Nov 2020 18:30:02 +0100
Subject: [PATCH 4/5] Submodule Shared updated

Submodule Shared:
    > 544f1b9 - Replace Exec PS function
---
 Shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Shared b/Shared
index 08b3536..544f1b9 160000
--- a/Shared
+++ b/Shared
@@ -1 +1 @@
-Subproject commit 08b35365488355e5177f773d8a0479a7bae39980
+Subproject commit 544f1b9a0352d6cfaf9185c11d3d6207d876493e

From c1289fadcd703aac72797d095debf78119466f0d Mon Sep 17 00:00:00 2001
From: Dominik Rauch <dominik@rauch.io>
Date: Fri, 27 Nov 2020 18:59:49 +0100
Subject: [PATCH 5/5] Fix DependencyVer.

---
 Build/Build.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Build/Build.ps1 b/Build/Build.ps1
index aadd1d1..755f456 100644
--- a/Build/Build.ps1
+++ b/Build/Build.ps1
@@ -27,7 +27,7 @@ $NUnitFrameworkVersion = "net-4.5"
 $TestCoverageFilter = "+[ImplicitNullability*]* -[ImplicitNullability*]ReSharperExtensionsShared.* -[ImplicitNullability.Samples.CodeWithIN.*]* -[ImplicitNullability.Samples.CodeWithoutIN.External]*"
 $NuspecPath = "Src\ImplicitNullability.Plugin\ImplicitNullability.nuspec"
 $NugetPackProperties = @(
-    "Version=$(CalcNuGetPackageVersion 20202);Configuration=$Configuration;DependencyVer=[201.0];BinDirInclude=bin\RS20202"
+    "Version=$(CalcNuGetPackageVersion 20202);Configuration=$Configuration;DependencyVer=[202.0];BinDirInclude=bin\RS20202"
 )
 $RiderPluginProject = "Src\RiderPlugin"
 $NugetPushServer = "https://www.myget.org/F/ulrichb/api/v2/package"