From 16499f5ff4b9d93b1c42caf15f43e65956a33762 Mon Sep 17 00:00:00 2001
From: m7clarke <47439144+m7clarke@users.noreply.github.com>
Date: Fri, 20 Aug 2021 00:07:04 +1200
Subject: [PATCH] Upgrade R# SDK to 2021.2.0 (#33)

* Upgrade R# SDK to 2021.2.0

* Gradle product version
---
 .nuke/build.schema.json                                  | 9 ++++++++-
 Directory.Build.props                                    | 6 +++++-
 build/Build.cs                                           | 6 +++++-
 build/_build.csproj                                      | 1 +
 .../Resharper.ConfigurationSense.Rider.csproj            | 6 +++---
 .../Resharper.ConfigurationSense.csproj                  | 6 +++---
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
index d1ad3a7..d164a96 100644
--- a/.nuke/build.schema.json
+++ b/.nuke/build.schema.json
@@ -28,10 +28,13 @@
             "GitHubActions",
             "GitLab",
             "Jenkins",
+            "Rider",
             "SpaceAutomation",
             "TeamCity",
             "Terminal",
-            "TravisCI"
+            "TravisCI",
+            "VisualStudio",
+            "VSCode"
           ]
         },
         "IsRiderHost": {
@@ -41,6 +44,10 @@
           "type": "boolean",
           "description": "Disables displaying the NUKE logo"
         },
+        "Partition": {
+          "type": "string",
+          "description": "Partition to use on CI"
+        },
         "Plan": {
           "type": "boolean",
           "description": "Shows the execution plan (HTML)"
diff --git a/Directory.Build.props b/Directory.Build.props
index 3a3a186..bbcba36 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkVersion>2021.1.1</SdkVersion>
+    <SdkVersion>2021.2.0</SdkVersion>
+  </PropertyGroup>
+  <!-- https://jetbrains.slack.com/archives/CBZ36NH7C/p1628090127002200 -->
+  <PropertyGroup>
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3277</MSBuildWarningsAsMessages>
   </PropertyGroup>
 </Project>
diff --git a/build/Build.cs b/build/Build.cs
index 97e0613..3a81933 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -116,7 +116,11 @@ protected override void OnBuildInitialized()
         .Requires(() => IsRiderHost)
         .Executes(() =>
         {
-            Gradle($"buildPlugin -PPluginVersion={ExtensionVersion} -PProductVersion={SdkVersion} -PDotNetOutputDirectory={OutputDirectory} -PDotNetProjectName={Project.Name}", customLogger:
+            // JetBrains is not very consistent in versioning
+            // https://github.com/olsh/resharper-structured-logging/issues/35#issuecomment-892764206
+            var productVersion = SdkVersion == "2021.2.0" ? "2021.2" : SdkVersion;
+
+            Gradle($"buildPlugin -PPluginVersion={ExtensionVersion} -PProductVersion={productVersion} -PDotNetOutputDirectory={OutputDirectory} -PDotNetProjectName={Project.Name}", customLogger:
                 (_, s) =>
                 {
                     // Gradle writes warnings to stderr
diff --git a/build/_build.csproj b/build/_build.csproj
index a40c94e..744ede0 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -7,6 +7,7 @@
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
     <NukeScriptDirectory>..</NukeScriptDirectory>
+    <NukeTelemetryVersion>1</NukeTelemetryVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.Rider.csproj b/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.Rider.csproj
index d74982a..3576f5d 100644
--- a/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.Rider.csproj
+++ b/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.Rider.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-    <VersionPrefix>2021.1.0</VersionPrefix>
+    <TargetFramework>net472</TargetFramework>
+    <VersionPrefix>2021.2.0</VersionPrefix>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <PropertyGroup>
@@ -11,6 +11,6 @@
     <RootNamespace>Resharper.ConfigurationSense</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.Rider.SDK" Version="$(SdkVersion)" />
+    <PackageReference Include="JetBrains.Rider.SDK" Version="$(SdkVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.csproj b/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.csproj
index 9f0d961..965f173 100644
--- a/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.csproj
+++ b/src/Resharper.ConfigurationSense/Resharper.ConfigurationSense.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-    <VersionPrefix>2021.1.0</VersionPrefix>
+    <TargetFramework>net472</TargetFramework>
+    <VersionPrefix>2021.2.0</VersionPrefix>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK" Version="$(SdkVersion)" />
+    <PackageReference Include="JetBrains.ReSharper.SDK" Version="$(SdkVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>