Merge branch 'feature/v5.1.2' into master

Author: michael-damatov

Sources/.nuget/NuGet.exe

@@ -266,7 +266,7 @@ static void RunConsoleApplication([NotNull] string executablePath, [NotNull] str
             }
         }
 
-        static void Process_DataReceived(object sender, [NotNull] DataReceivedEventArgs e) => Console.WriteLine("    " + e.Data);
+        static void Process_DataReceived([CanBeNull] object sender, [NotNull] DataReceivedEventArgs e) => Console.WriteLine("    " + e.Data);
 
         static void OpenInWindowsExplorer([NotNull] string nuspecPath, [NotNull] string packageFileName)
         {

Sources/ReCommendedExtension.Deployment/Program.cs

@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.5" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.7" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 

Sources/ReCommendedExtension.Deployment/ReCommendedExtension.Deployment.csproj

@@ -33,7 +33,7 @@
         <copyright>{{AssemblyCopyright}}</copyright>
         <tags>recommended extension resharper plugin addin prodot</tags>
         <dependencies>
-            <dependency id="Wave" version="[201.0,201.1)" />
+            <dependency id="Wave" version="[202.0,202.1)" />
         </dependencies>
     </metadata>
     <files>

Sources/ReCommendedExtension.Deployment/ReCommendedExtension.nuspec

@@ -1,10 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
+using JetBrains.Annotations;
 using JetBrains.Application.Settings;
 using JetBrains.ProjectModel.Properties.CSharp;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.FeaturesTestFramework.Daemon;
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.ControlFlow;
+using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.TestFramework;
 using NUnit.Framework;
 using ReCommendedExtension.Analyzers.Annotation;
@@ -50,8 +52,9 @@ highlighting is ConflictingAnnotationWarning ||
         [TestCase("Override.cs", ValueAnalysisMode.PESSIMISTIC)]
         [TestCase("ItemNotNull.cs", ValueAnalysisMode.PESSIMISTIC)]
         [TestNetFramework45]
+        [CSharpLanguageLevel(CSharpLanguageLevel.CSharp73)]
         [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
-        public void TestFileWithValueAnalysisMode(string file, ValueAnalysisMode valueAnalysisMode)
+        public void TestFileWithValueAnalysisMode([NotNull] string file, ValueAnalysisMode valueAnalysisMode)
             => ExecuteWithinSettingsTransaction(
                 store =>
                 {

Sources/ReCommendedExtension.Tests/Analyzers/AnnotationAnalyzerTests.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using JetBrains.Annotations;
 using JetBrains.Application.Settings;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.FeaturesTestFramework.Daemon;
@@ -23,7 +24,7 @@ protected override bool HighlightingPredicate(IHighlighting highlighting, IPsiSo
         [TestCase("WithoutAnnotations_Optimistic.cs", ValueAnalysisMode.OPTIMISTIC)]
         [TestCase("WithoutAnnotations_Pessimistic.cs", ValueAnalysisMode.OFF)]
         [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
-        public void TestFileWithValueAnalysisMode(string file, ValueAnalysisMode valueAnalysisMode)
+        public void TestFileWithValueAnalysisMode([NotNull] string file, ValueAnalysisMode valueAnalysisMode)
             => ExecuteWithinSettingsTransaction(
                 store =>
                 {

Sources/ReCommendedExtension.Tests/Analyzers/AnnotationAnalyzerTestsWithoutAnnotations.cs

@@ -1,10 +1,13 @@
+using System.Diagnostics.CodeAnalysis;
 using JetBrains.ReSharper.FeaturesTestFramework.Intentions;
+using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.TestFramework;
 using NUnit.Framework;
 using ReCommendedExtension.ContextActions;
 
 namespace ReCommendedExtension.Tests.ContextActions
 {
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     [TestFixture]
     public sealed class AnnotateWithInstantHandleAvailabilityTests : CSharpContextActionAvailabilityTestBase<AnnotateWithInstantHandle>
     {
@@ -13,10 +16,21 @@ public sealed class AnnotateWithInstantHandleAvailabilityTests : CSharpContextAc
         protected override string RelativeTestDataPath => @"ContextActions\AnnotateWithInstantHandle";
 
         [Test]
-        public void TestAvailability() => DoNamedTest2();
+        [CSharpLanguageLevel(CSharpLanguageLevel.CSharp80)]
+        public void TestAvailabilityCS80() => DoNamedTest2();
 
         [Test]
+        [CSharpLanguageLevel(CSharpLanguageLevel.CSharp90)]
+        public void TestAvailabilityCS90() => DoNamedTest2();
+
+        [Test]
+        [CSharpLanguageLevel(CSharpLanguageLevel.CSharp80)]
+        [TestNetCore30(ANNOTATIONS_PACKAGE)]
+        public void TestAvailabilityAsyncEnumerableCS80() => DoNamedTest2();
+
+        [Test]
+        [CSharpLanguageLevel(CSharpLanguageLevel.CSharp90)]
         [TestNetCore30(ANNOTATIONS_PACKAGE)]
-        public void TestAvailabilityAsyncEnumerable() => DoNamedTest2();
+        public void TestAvailabilityAsyncEnumerableCS90() => DoNamedTest2();
     }
 }

Sources/ReCommendedExtension.Tests/ContextActions/AnnotateWithInstantHandleAvailabilityTests.cs

@@ -1,5 +1,6 @@
 using JetBrains.ProjectModel.Properties.CSharp;
 using JetBrains.ReSharper.FeaturesTestFramework.Intentions;
+using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.TestFramework;
 using NUnit.Framework;
 using ReCommendedExtension.ContextActions;
@@ -14,12 +15,13 @@ public sealed class AnnotateWithItemNotNullAvailabilityTests : CSharpContextActi
         protected override string RelativeTestDataPath => @"ContextActions\AnnotateWithItemNotNull";
 
         [Test]
+        [CSharpLanguageLevel(CSharpLanguageLevel.CSharp73)]
         [TestNetFramework45]
         [TestPackagesWithAnnotations("System.Threading.Tasks.Extensions")]
         public void TestAvailability() => DoNamedTest2();
 
         [Test]
-        [TestNetCore30]
+        [TestNetCore30(ANNOTATIONS_PACKAGE)]
         [NullableContext(NullableContextKind.Enable)]
         public void TestAvailabilityNullableAnnotationContext() => DoNamedTest2();
     }

Sources/ReCommendedExtension.Tests/ContextActions/AnnotateWithItemNotNullAvailabilityTests.cs

@@ -1,3 +1,4 @@
+using JetBrains.Annotations;
 using JetBrains.ReSharper.FeaturesTestFramework.Intentions;
 using JetBrains.ReSharper.TestFramework;
 using NUnit.Framework;
@@ -16,6 +17,6 @@ public sealed class OperatorExecuteTests : CSharpContextActionExecuteTestBase<No
         [TestCase("ExecuteConversion.cs")]
         [TestCase("ExecuteOverload.cs")]
         [TestCase("ExecuteOverloadNonEmpty.cs")]
-        public void TestFile(string file) => DoTestSolution(file);
+        public void TestFile([NotNull] string file) => DoTestSolution(file);
     }
 }

Sources/ReCommendedExtension.Tests/ContextActions/CodeContracts/Elements/OperatorExecuteTests.cs

@@ -17,11 +17,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Lifetimes" Version="2020.1.3" />
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.1.4">
+    <PackageReference Include="JetBrains.Lifetimes" Version="2020.2.1" />
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.10.1" />
   </ItemGroup>