Upgrade R# SDK to 2020.1

Author: olsh

appveyor.yml

@@ -1,7 +1,7 @@
 version: 1.0.{build}
 image: Visual Studio 2019
 install:
-  - dotnet tool install -g Cake.Tool --version 0.35.0 
+  - dotnet tool install -g Cake.Tool --version 0.37.0 
 build_script:
 - cmd: >-
     dotnet cake -Target=CreateArtifact -buildConfig=Release

build.cake

@@ -1,12 +1,12 @@
-#tool "nuget:?package=MSBuild.SonarQube.Runner.Tool&version=4.6.0"
-#tool "nuget:?package=NUnit.ConsoleRunner&version=3.10.0"
+#tool "nuget:?package=MSBuild.SonarQube.Runner.Tool&version=4.8.0"
+#tool "nuget:?package=NUnit.ConsoleRunner&version=3.11.1"
 
-#addin "nuget:?package=Cake.Sonar&version=1.1.22"
+#addin "nuget:?package=Cake.Sonar&version=1.1.25"
 
 var target = Argument("target", "Default");
 var buildConfiguration = Argument("buildConfig", "Debug");
 
-var waveVersion = Argument("wave", "193");
+var waveVersion = Argument("wave", "201");
 var waveNugetVersion = $"[{waveVersion}.0]";
 var host = Argument("Host", "Resharper");
 

src/ReSharper.Structured.Logging/Analyzer/CorrectExceptionPassingAnalyzer.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-
+using JetBrains.Metadata.Reader.API;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.CSharp.Tree;

src/ReSharper.Structured.Logging/Extensions/PsiExtensions.cs

@@ -17,8 +17,7 @@ public static class PsiExtensions
         [CanBeNull]
         public static ICSharpArgument GetTemplateArgument(this IInvocationExpression invocationExpression)
         {
-            if (!(invocationExpression.Reference?.Resolve()
-                      .DeclaredElement is ITypeMember typeMember))
+            if (!(invocationExpression.Reference.Resolve().DeclaredElement is ITypeMember typeMember))
             {
                 return null;
             }
@@ -59,7 +58,7 @@ public static bool IsSerilogContextFactoryLogger([NotNull]this IInvocationExpres
                 return false;
             }
 
-            var declaredElement = invocationExpression.Reference?.Resolve().DeclaredElement as IClrDeclaredElement;
+            var declaredElement = invocationExpression.Reference.Resolve().DeclaredElement as IClrDeclaredElement;
             var containingType = declaredElement?.GetContainingType();
             if (containingType == null)
             {

src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.Rider.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <VersionPrefix>2019.3.4</VersionPrefix>
+    <VersionPrefix>2020.1.0</VersionPrefix>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <PropertyGroup>
@@ -10,7 +10,7 @@
     <RootNamespace>ReSharper.Structured.Logging</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.Rider.SDK" Version="2019.3.4" />
+    <PackageReference Include="JetBrains.Rider.SDK" Version="2020.1.0" />
   </ItemGroup>
   <PropertyGroup>
     <OutputPath>bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>

src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <VersionPrefix>2019.3.4</VersionPrefix>
+    <VersionPrefix>2020.1.0</VersionPrefix>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2019.3.4" />
+    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.1.0" />
   </ItemGroup>
   <PropertyGroup>
     <OutputPath>bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>

test/src/ReSharper.Structured.Logging.Rider.Tests.csproj

@@ -4,7 +4,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.Rider.SDK.Tests" Version="2019.3.4" />
+    <PackageReference Include="JetBrains.Rider.SDK.Tests" Version="2020.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\ReSharper.Structured.Logging\ReSharper.Structured.Logging.Rider.csproj" />

test/src/ReSharper.Structured.Logging.Tests.csproj

@@ -4,7 +4,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2019.3.4" />
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\ReSharper.Structured.Logging\ReSharper.Structured.Logging.csproj" />