Upgrade SDK to 2022.3.0

olsh · web-flow · commit 5922e654f750 · 2022-12-23T13:06:24.000+03:00
* Upgrade SDK to 2022.3.0-eap02

* Update SDK to EAP05

* Update SDK to EAP07

* Update SDK to 2022.3

* Update build dependencies

* Upgrade SDK
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkVersion>2022.2.3</SdkVersion>
+    <SdkVersion>2022.3.1</SdkVersion>
   </PropertyGroup>
   <!-- https://jetbrains.slack.com/archives/CBZ36NH7C/p1628090127002200 -->
   <PropertyGroup>
-    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3277</MSBuildWarningsAsMessages>
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3277;MSB3270</MSBuildWarningsAsMessages>
   </PropertyGroup>
 </Project>
diff --git a/appveyor.yml b/appveyor.yml
@@ -15,7 +15,7 @@ build_script:
     build.cmd upload-rider-artifact --configuration Release --is-rider-host
 
     build.cmd sonar --configuration Release
-test: off
+test: false
 
 cache:
   - '%USERPROFILE%\.sonar\cache'
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.6.21'
-    id 'org.jetbrains.intellij' version '1.9.0'
+    id 'org.jetbrains.intellij' version '1.11.0'
 }
 
 sourceCompatibility = 1.8
diff --git a/build/Build.cs b/build/Build.cs
@@ -3,7 +3,6 @@
 using Nuke.Common;
 using Nuke.Common.CI;
 using Nuke.Common.CI.AppVeyor;
-using Nuke.Common.Execution;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
 using Nuke.Common.Tooling;
@@ -19,7 +18,6 @@
 using static Nuke.Common.Tools.SonarScanner.SonarScannerTasks;
 using static Nuke.Common.Tools.NuGet.NuGetTasks;
 
-[CheckBuildProjectConfigurations]
 [ShutdownDotNetAfterServerBuild]
 class Build : NukeBuild
 {
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageDownload Include="dotnet-sonarscanner" Version="[5.5.3]" />
-    <PackageDownload Include="NuGet.CommandLine" Version="[6.0.0]" />
-    <PackageDownload Include="NUnit.ConsoleRunner" Version="[3.15.0]" />
+    <PackageDownload Include="dotnet-sonarscanner" Version="[5.9.1]" />
+    <PackageDownload Include="NuGet.CommandLine" Version="[6.3.1]" />
+    <PackageDownload Include="NUnit.ConsoleRunner" Version="[3.16.0]" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ReSharper.Structured.Logging/Analyzer/CompileTimeConstantTemplateAnalyzer.cs b/src/ReSharper.Structured.Logging/Analyzer/CompileTimeConstantTemplateAnalyzer.cs
@@ -1,7 +1,6 @@
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Psi.CodeAnnotations;
 using JetBrains.ReSharper.Psi.CSharp.Tree;
-using JetBrains.ReSharper.Psi.Tree;
 
 using ReSharper.Structured.Logging.Caching;
 using ReSharper.Structured.Logging.Extensions;
diff --git a/src/ReSharper.Structured.Logging/Analyzer/ComplexObjectDestructureAnalyzer.cs b/src/ReSharper.Structured.Logging/Analyzer/ComplexObjectDestructureAnalyzer.cs
@@ -109,6 +109,7 @@ private void CheckComplexObjectInTemplate(IInvocationExpression element, IHighli
             }
         }
 
+        // ReSharper disable once CognitiveComplexity
         private static bool CheckIfDestructureNeeded(ICSharpArgument argument)
         {
             bool CheckIfBaseToStringUsed(IType type, bool initialCheck = true)
diff --git a/src/ReSharper.Structured.Logging/Analyzer/ContextualLoggerConstructorAnalyzer.cs b/src/ReSharper.Structured.Logging/Analyzer/ContextualLoggerConstructorAnalyzer.cs
@@ -12,6 +12,7 @@ namespace ReSharper.Structured.Logging.Analyzer
     [ElementProblemAnalyzer(typeof(IConstructorDeclaration))]
     public class ContextualLoggerConstructorAnalyzer : ElementProblemAnalyzer<IConstructorDeclaration>
     {
+        // ReSharper disable once CognitiveComplexity
         protected override void Run(IConstructorDeclaration element, ElementProblemAnalyzerData data, IHighlightingConsumer consumer)
         {
             if (element.Params?.ParameterDeclarations == null)
diff --git a/src/ReSharper.Structured.Logging/Analyzer/CorrectExceptionPassingAnalyzer.cs b/src/ReSharper.Structured.Logging/Analyzer/CorrectExceptionPassingAnalyzer.cs
@@ -22,6 +22,7 @@ public CorrectExceptionPassingAnalyzer(CodeAnnotationsCache codeAnnotationsCache
             _templateParameterNameAttributeProvider = codeAnnotationsCache.GetProvider<TemplateParameterNameAttributeProvider>();
         }
 
+        // ReSharper disable once CognitiveComplexity
         protected override void Run(
             IInvocationExpression element,
             ElementProblemAnalyzerData data,
diff --git a/src/ReSharper.Structured.Logging/Analyzer/PropertiesNamingAnalyzer.cs b/src/ReSharper.Structured.Logging/Analyzer/PropertiesNamingAnalyzer.cs
@@ -100,7 +100,7 @@ private void CheckPropertiesInContext(
         }
 
         var propertyArgument = element.ArgumentList.Arguments[0];
-        var propertyName = propertyArgument.Value.ConstantValue.Value as string;
+        var propertyName = propertyArgument.Value?.ConstantValue.StringValue;
         if (string.IsNullOrEmpty(propertyName))
         {
             return;
diff --git a/src/ReSharper.Structured.Logging/Caching/TemplateParameterNameAttributeProvider.cs b/src/ReSharper.Structured.Logging/Caching/TemplateParameterNameAttributeProvider.cs
@@ -26,10 +26,10 @@ protected override string CalculateInfo(ITypeMember attributesOwner, IEnumerable
             {
                 return templateFormatAttribute.PositionParameters()
                     .FirstOrDefault()
-                    ?.ConstantValue.Value?.ToString();
+                    ?.ConstantValue.StringValue;
             }
 
-            var className = attributesOwner.GetContainingType()?.GetClrName().FullName;
+            var className = attributesOwner.ContainingType?.GetClrName().FullName;
             if (className == "Microsoft.Extensions.Logging.LoggerExtensions")
             {
                 return attributesOwner.ShortName == "BeginScope" ? "messageFormat" : "message";
diff --git a/src/ReSharper.Structured.Logging/Extensions/PsiExtensions.cs b/src/ReSharper.Structured.Logging/Extensions/PsiExtensions.cs
@@ -57,6 +57,7 @@ public static MessageTemplateTokenInformation GetTokenInformation(this ICSharpAr
             return new MessageTemplateTokenInformation(documentRange, tokenArgument);
         }
 
+        // ReSharper disable once CognitiveComplexity
         private static (TextRange, IStringLiteralAlterer) FindTokenTextRange(this ICSharpArgument argument, MessageTemplateToken token)
         {
             if (argument.Value is IAdditiveExpression additiveExpression && additiveExpression.ConstantValue.IsString())
@@ -148,7 +149,7 @@ public static IStringLiteralAlterer TryCreateLastTemplateFragmentExpression(this
                 return null;
             }
 
-            return StringLiteralAltererUtil.TryCreateStringLiteralByExpression(argument.Value);
+            return argument.Value == null ? null : StringLiteralAltererUtil.TryCreateStringLiteralByExpression(argument.Value);
         }
 
         public static bool IsGenericMicrosoftExtensionsLogger([NotNull]this IDeclaredType declared)
diff --git a/src/ReSharper.Structured.Logging/QuickFixes/TemplateIsNotCompileTimeConstantFix.cs b/src/ReSharper.Structured.Logging/QuickFixes/TemplateIsNotCompileTimeConstantFix.cs
@@ -46,6 +46,7 @@ public override bool IsAvailable(IUserDataHolder cache)
             return InvocationExpression.IsValid() && MessageTemplateArgument.Expression is IInterpolatedStringExpression;
         }
 
+        // ReSharper disable once CognitiveComplexity
         protected override Action<ITextControl> ExecutePsiTransaction(ISolution solution, IProgressIndicator progress)
         {
             var interpolatedExpression = (IInterpolatedStringExpression)MessageTemplateArgument.Expression.NotNull();
diff --git a/src/ReSharper.Structured.Logging/Serilog/Parsing/MessageTemplateParser.cs b/src/ReSharper.Structured.Logging/Serilog/Parsing/MessageTemplateParser.cs
@@ -75,6 +75,7 @@ static IEnumerable<MessageTemplateToken> Tokenize(string messageTemplate)
             }
         }
 
+        // ReSharper disable once CognitiveComplexity
         static MessageTemplateToken ParsePropertyToken(int startAt, string messageTemplate, out int next)
         {
             var first = startAt;
@@ -156,6 +157,7 @@ static MessageTemplateToken ParsePropertyToken(int startAt, string messageTempla
                 first);
         }
 
+        // ReSharper disable once CognitiveComplexity
         static bool TrySplitTagContent(string tagContent, out string propertyNameAndDestructuring, out string format, out string alignment)
         {
             var formatDelim = tagContent.IndexOf(':');
@@ -262,7 +264,8 @@ static bool IsValidInFormat(char c)
                  c == '+');
         }
 
-        static TextToken ParseTextToken(int startAt, string messageTemplate, out int next)
+        // ReSharper disable once CognitiveComplexity
+        private static TextToken ParseTextToken(int startAt, string messageTemplate, out int next)
         {
             var first = startAt;
 
diff --git a/src/ReSharper.Structured.Logging/Settings/StructuredLoggingOptionsPage.cs b/src/ReSharper.Structured.Logging/Settings/StructuredLoggingOptionsPage.cs
@@ -1,11 +1,9 @@
-﻿using System;
+using System;
 
 using JetBrains.Application.Settings;
-using JetBrains.Application.Settings.Calculated.Extensions;
 using JetBrains.Application.UI.Options;
 using JetBrains.Application.UI.Options.OptionPages;
 using JetBrains.Application.UI.Options.OptionsDialog;
-using JetBrains.DataFlow;
 using JetBrains.IDE.UI.Extensions;
 using JetBrains.IDE.UI.Options;
 using JetBrains.Lifetimes;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'org.jetbrains.kotlin.jvm' version '1.6.21'`
`3`		`- id 'org.jetbrains.intellij' version '1.9.0'`
	`3`	`+ id 'org.jetbrains.intellij' version '1.11.0'`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`sourceCompatibility = 1.8`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ private void CheckComplexObjectInTemplate(IInvocationExpression element, IHighli`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
	`112`	`+ // ReSharper disable once CognitiveComplexity`
`112`	`113`	`private static bool CheckIfDestructureNeeded(ICSharpArgument argument)`
`113`	`114`	`{`
`114`	`115`	`bool CheckIfBaseToStringUsed(IType type, bool initialCheck = true)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ namespace ReSharper.Structured.Logging.Analyzer`
`12`	`12`	`[ElementProblemAnalyzer(typeof(IConstructorDeclaration))]`
`13`	`13`	`public class ContextualLoggerConstructorAnalyzer : ElementProblemAnalyzer<IConstructorDeclaration>`
`14`	`14`	`{`
	`15`	`+ // ReSharper disable once CognitiveComplexity`
`15`	`16`	`protected override void Run(IConstructorDeclaration element, ElementProblemAnalyzerData data, IHighlightingConsumer consumer)`
`16`	`17`	`{`
`17`	`18`	`if (element.Params?.ParameterDeclarations == null)`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public CorrectExceptionPassingAnalyzer(CodeAnnotationsCache codeAnnotationsCache`
`22`	`22`	`_templateParameterNameAttributeProvider = codeAnnotationsCache.GetProvider<TemplateParameterNameAttributeProvider>();`
`23`	`23`	`}`
`24`	`24`
	`25`	`+ // ReSharper disable once CognitiveComplexity`
`25`	`26`	`protected override void Run(`
`26`	`27`	`IInvocationExpression element,`
`27`	`28`	`ElementProblemAnalyzerData data,`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private void CheckPropertiesInContext(`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`var propertyArgument = element.ArgumentList.Arguments[0];`
`103`		`- var propertyName = propertyArgument.Value.ConstantValue.Value as string;`
	`103`	`+ var propertyName = propertyArgument.Value?.ConstantValue.StringValue;`
`104`	`104`	`if (string.IsNullOrEmpty(propertyName))`
`105`	`105`	`{`
`106`	`106`	`return;`