From b4080b91ae0d5b7048c28aac3a7cc8199470ad5f Mon Sep 17 00:00:00 2001
From: Keith Harvey <keith@keithharvey.com>
Date: Mon, 10 Apr 2023 21:42:35 -0500
Subject: [PATCH] Rider 2023.1 and gradle bump

---
 src/XamlStyler.Extension.Rider/build.gradle        | 12 ++----------
 src/XamlStyler.Extension.Rider/dotnet/Plugin.props |  2 +-
 src/XamlStyler.Extension.Rider/gradle.properties   |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/XamlStyler.Extension.Rider/build.gradle b/src/XamlStyler.Extension.Rider/build.gradle
index b3dde408..279bed30 100644
--- a/src/XamlStyler.Extension.Rider/build.gradle
+++ b/src/XamlStyler.Extension.Rider/build.gradle
@@ -6,10 +6,10 @@ plugins {
 
     // RIDER: May need updating with new Rider releases
     id 'org.jetbrains.kotlin.jvm' version '1.7.22'
-    id 'com.jetbrains.rdgen' version '2023.1.0'
+    id 'com.jetbrains.rdgen' version '2023.2.0'
 
     // RIDER: Will probably need updating with new Rider releases, use latest version number from https://github.com/JetBrains/gradle-intellij-plugin/releases
-    id 'org.jetbrains.intellij' version '1.10.1'
+    id 'org.jetbrains.intellij' version '1.13.3'
 }
 
 ext {
@@ -124,14 +124,6 @@ rdgen {
     }
 }
 
-// Plugin workaround untill 2022.3.1 comes output
-// https://youtrack.jetbrains.com/issue/RIDER-86051
-// Rider: To be removed when updating newer rider targets
-patchPluginXml {
-    sinceBuild = '223.7571'
-    untilBuild = '223.*'
-}
-
 patchPluginXml {
     def changelogText = file("${rootDir}/CHANGELOG.md").text
     def changelogMatches = changelogText =~ /(?s)(-.+?)(?=##|$)/
diff --git a/src/XamlStyler.Extension.Rider/dotnet/Plugin.props b/src/XamlStyler.Extension.Rider/dotnet/Plugin.props
index 6651cff3..bf963c04 100644
--- a/src/XamlStyler.Extension.Rider/dotnet/Plugin.props
+++ b/src/XamlStyler.Extension.Rider/dotnet/Plugin.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- RIDER: To be updated with new Rider release -->
-    <SdkVersion>2022.3.0</SdkVersion>
+    <SdkVersion>2023.1.0</SdkVersion>
     
     <Title>XAML Styler</Title>
     <Description>XAML Styler is an extension that formats XAML source code based on a set of styling rules. This tool can help you/your team maintain a better XAML coding style as well as a much better XAML readability.</Description>
diff --git a/src/XamlStyler.Extension.Rider/gradle.properties b/src/XamlStyler.Extension.Rider/gradle.properties
index 873ff269..e615946b 100644
--- a/src/XamlStyler.Extension.Rider/gradle.properties
+++ b/src/XamlStyler.Extension.Rider/gradle.properties
@@ -18,4 +18,4 @@ BuildConfiguration=Release
 #    2021.2 (stable versions)
 #
 # RIDER: To be updated with new Rider release
-ProductVersion=2022.3-SNAPSHOT
+ProductVersion=2023.1