Add ReSharper and Rider 2024.2 support

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   BuildConfiguration: Release
-  BuildVersion: 2.23.0.${{ github.run_number }}
+  BuildVersion: 2.24.0.${{ github.run_number }}
 
 jobs:
   build:
@@ -15,31 +15,48 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Run Build.ps1
-        run: >
-          ./Build/Build.ps1
-          -Configuration "${{ env.BuildConfiguration }}"
-          -Version "${{ env.BuildVersion }}"
-          -BranchName "${{ github.ref_name }}"
-          -CoverageBadgeUploadToken "${{ secrets.COVERAGE_BADGE_UPLOAD_TOKEN }}"
-
-      - name: Upload Packages artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: Packages
-          path: |
-            Build/Output/*.nupkg
-            Build/Output/*.zip
-
-      - name: Upload TestOutput artifacts
-        uses: actions/upload-artifact@v4
-        if: ${{ always() }}
-        with:
-          name: TestOutput
-          path: |
-            Build/Output/TestResults/**
-            Build/Output/TestCoverage/**
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-nuget-
+
+    - uses: actions/cache@v4
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+
+    - name: Run Build.ps1
+      run: >
+        ./Build/Build.ps1
+        -Configuration "${{ env.BuildConfiguration }}"
+        -Version "${{ env.BuildVersion }}"
+        -BranchName "${{ github.ref_name }}"
+        -CoverageBadgeUploadToken "${{ secrets.COVERAGE_BADGE_UPLOAD_TOKEN }}"
+
+    - name: Upload Packages artifacts
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: Packages
+        path: |
+          Build/Output/*.nupkg
+          Build/Output/*.zip
+
+    - name: Upload TestOutput artifacts
+      uses: actions/upload-artifact@v4
+      if: ${{ always() }}
+      with:
+        name: TestOutput
+        path: |
+          Build/Output/TestResults/**
+          Build/Output/TestCoverage/**

History.md

@@ -1,3 +1,6 @@
+### 2.24.0 ###
+- ReSharper and Rider 2024.3 support
+
 ### 2.23.0 ###
 - ReSharper and Rider 2024.2 support
 

Src/PluginAndTests.props

@@ -10,8 +10,7 @@
     <ReSharperVersionYY>$([System.Text.RegularExpressions.Regex]::Match($(ReSharperVersionIdentifier), $(_ReSharperVersionIdentifierRegex)).Groups[2].Value)</ReSharperVersionYY>
     <ReSharperVersionMinor>$([System.Text.RegularExpressions.Regex]::Match($(ReSharperVersionIdentifier), $(_ReSharperVersionIdentifierRegex)).Groups[3].Value)</ReSharperVersionMinor>
 
-    <!-- Workaround, drop with 2024.3: -->
-    <SdkNuGetPackageVersion>$(ReSharperVersionYYYY).$(ReSharperVersionMinor).2</SdkNuGetPackageVersion>
+    <SdkNuGetPackageVersion>$(ReSharperVersionYYYY).$(ReSharperVersionMinor).*-*</SdkNuGetPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>

Src/RiderPlugin/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("java")
     alias(libs.plugins.kotlinJvm)
-    id("org.jetbrains.intellij.platform") version "2.0.1"   // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+    id("org.jetbrains.intellij.platform") version "2.0.0-beta5"   // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
     id("me.filippov.gradle.jvm.wrapper") version "0.14.0"   // https://plugins.gradle.org/plugin/me.filippov.gradle.jvm.wrapper
 }
 

Src/RiderPlugin/gradle.properties

@@ -1,12 +1,12 @@
 RiderPluginProjectName=rider-XmlDocInspections
 
 ResharperPluginProjectName=XmlDocInspections.Plugin
-ReSharperVersionIdentifier=RD20242
+ReSharperVersionIdentifier=RD20243
 PluginVersion=0.0.0.1
 BuildConfiguration=Debug
 
-# https://www.jetbrains.com/intellij-repository/releases
-ProductVersion=2024.2
+# https://www.jetbrains.com/intellij-repository/releases or https://www.jetbrains.com/intellij-repository/snapshots
+ProductVersion=2024.3-SNAPSHOT
 
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
 # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default

Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RD20242.csproj → Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RD20243.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RD20242.csproj" />
+    <ProjectReference Include="..\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RD20243.csproj" />
   </ItemGroup>
 
 </Project>

Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RS20242.csproj → Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RS20243.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RS20242.csproj" />
+    <ProjectReference Include="..\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RS20243.csproj" />
   </ItemGroup>
 
 </Project>

Src/XmlDocInspections.Plugin.Tests/test/data/Highlighting/BasicTests/PartialClassWithDocsInOneFile_B.cs.gold

@@ -1,6 +1,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable UnusedMember.Local
 // ReSharper disable UnusedType.Global
+// ReSharper disable RedundantPartialMethodEmptyImplementation
 
 namespace XmlDocInspections.Sample.Highlighting
 {

Src/XmlDocInspections.Plugin.Tests/test/data/Highlighting/BasicTests/PartialClassWithoutDocs_B.cs.gold

@@ -1,6 +1,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable UnusedMember.Local
 // ReSharper disable UnusedType.Global
+// ReSharper disable RedundantPartialMethodEmptyImplementation
 
 namespace XmlDocInspections.Sample.Highlighting
 {

Src/XmlDocInspections.Plugin.Tests/test/data/Highlighting/PartialClassWithDocsInOneFile_B.cs

@@ -1,6 +1,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable UnusedMember.Local
 // ReSharper disable UnusedType.Global
+// ReSharper disable RedundantPartialMethodEmptyImplementation
 
 namespace XmlDocInspections.Sample.Highlighting
 {

Src/XmlDocInspections.Plugin.Tests/test/data/Highlighting/PartialClassWithoutDocs_B.cs

@@ -1,6 +1,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable UnusedMember.Local
 // ReSharper disable UnusedType.Global
+// ReSharper disable RedundantPartialMethodEmptyImplementation
 
 namespace XmlDocInspections.Sample.Highlighting
 {

Src/XmlDocInspections.Plugin/Highlighting/XmlDocInspectionsQuickFixRegistrarComponent.cs

@@ -1,14 +1,15 @@
 using System;
 using System.Collections.Generic;
 using JetBrains.Application;
+using JetBrains.Application.Parts;
 using JetBrains.Lifetimes;
 using JetBrains.ReSharper.Feature.Services.QuickFixes;
 using JetBrains.ReSharper.Intentions.CSharp.QuickFixes;
 using JetBrains.ReSharper.Psi.CSharp.Tree;
 
 namespace XmlDocInspections.Plugin.Highlighting
 {
-    [ShellComponent]
+    [ShellComponent(Instantiation.DemandAnyThreadSafe)]
     internal class XmlDocInspectionsQuickFixRegistrarComponent : IQuickFixesProvider
     {
         public IEnumerable<Type> Dependencies => Array.Empty<Type>();

Src/XmlDocInspections.Plugin/XmlDocInspectionsSettingsCache.cs

@@ -1,18 +1,19 @@
 using System;
 using System.Linq;
+using JetBrains.Application;
 using JetBrains.Application.DataContext;
+using JetBrains.Application.Parts;
 using JetBrains.Application.Settings;
 using JetBrains.Application.Settings.Extentions;
 using JetBrains.Diagnostics;
 using JetBrains.Lifetimes;
 using JetBrains.Metadata.Reader.Impl;
-using JetBrains.ProjectModel;
 using JetBrains.ProjectModel.Settings.Cache;
 using XmlDocInspections.Plugin.Settings;
 
 namespace XmlDocInspections.Plugin
 {
-    [SolutionComponent]
+    [ShellComponent(Instantiation.DemandAnyThreadSafe)] // TODO: Check this out
     public class XmlDocInspectionsSettingsCache : ICachedSettingsReader<CachedXmlDocInspectionsSettings>
     {
         private readonly Lifetime _lifetime;

XmlDocInspections.sln

@@ -9,13 +9,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SolutionItems", "SolutionIt
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Sample", "Src\XmlDocInspections.Plugin.Tests\test\data\XmlDocInspections.Sample.csproj", "{4AF4FFEC-2FAC-426A-B8B2-06F4D9F52392}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.RS20242", "Src\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RS20242.csproj", "{B911381A-0D32-4D8C-A47A-D1E684FD7589}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.RS20243", "Src\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RS20243.csproj", "{B911381A-0D32-4D8C-A47A-D1E684FD7589}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.Tests.RS20242", "Src\XmlDocInspections.Plugin.Tests\XmlDocInspections.Plugin.Tests.RS20242.csproj", "{E3DD348A-4F6B-4660-9D3F-18BFC5F2FDB1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.Tests.RS20243", "Src\XmlDocInspections.Plugin.Tests\XmlDocInspections.Plugin.Tests.RS20243.csproj", "{E3DD348A-4F6B-4660-9D3F-18BFC5F2FDB1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.RD20242", "Src\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RD20242.csproj", "{68FD44BA-7BD7-432C-B70F-8EA851A4FD06}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.RD20243", "Src\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RD20243.csproj", "{68FD44BA-7BD7-432C-B70F-8EA851A4FD06}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.Tests.RD20242", "Src\XmlDocInspections.Plugin.Tests\XmlDocInspections.Plugin.Tests.RD20242.csproj", "{F0AC23E0-5905-4A51-8FCE-96F87D8CF8B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.Tests.RD20243", "Src\XmlDocInspections.Plugin.Tests\XmlDocInspections.Plugin.Tests.RD20243.csproj", "{F0AC23E0-5905-4A51-8FCE-96F87D8CF8B3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Sample.AspNetCore", "Src\XmlDocInspections.Plugin.Tests\test\data\Special\AspNetCore\XmlDocInspections.Sample.AspNetCore.csproj", "{83BBF7BC-8BBA-4C4F-8143-DD3D7CDE68B1}"
 EndProject