Update to support Rider 2023.3

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2023.3.2
+ * Fix to work with Rider 2023.3
+
 ## 2023.3.1
  * Fixed a rare crash when the plugin was completely unable to find Rimworld
  * Fixed automatic Rimworld detection when Rimworld is installed through Steam on the C: drive

build.gradle

@@ -196,4 +196,10 @@ publishPlugin {
             workingDir rootDir
         }
     }
+}
+
+tasks {
+    patchPluginXml {
+        untilBuild.set(provider { null })
+    }
 }

buildPlugin.ps1

@@ -1,5 +1,5 @@
 Param(
-    $Version = "2023.3.1"
+    $Version = "2023.3.2"
 )
 
 Set-StrictMode -Version Latest

gradle.properties

@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.RimworldDev
 DotnetSolution=ReSharperPlugin.RimworldDev.sln
 RiderPluginId=com.jetbrains.rider.plugins.rimworlddev
-PluginVersion=2023.3.1
+PluginVersion=2023.3.2
 
 BuildConfiguration=Release
 
@@ -14,7 +14,7 @@ PublishToken="_PLACEHOLDER_"
 #   Release:  2020.2
 #   Nightly:  2020.3-SNAPSHOT
 #   EAP:      2020.3-EAP2-SNAPSHOT
-ProductVersion=2023.2
+ProductVersion=2023.3
 
 # 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/dotnet/Plugin.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <SdkVersion>2023.1.2</SdkVersion>
+    <SdkVersion>2023.3.1</SdkVersion>
 
     <Title>Rimworld Development Environment</Title>
     <Description>Bring the intelligence of your IDE to Rimworld XML files. Use information backed by Rimworlds DLL file to autocomplete your XML, Ctrl+Click into the C# that your XML gets translated into and see what options you have when adding items in your mods!</Description>

src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj

@@ -6,8 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK" Version="$(SdkVersion)" PrivateAssets="all">
-      <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2023.3.1" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />

src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.Rider.csproj

@@ -21,10 +21,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
-    <PackageReference Include="JetBrains.Lifetimes" Version="2023.3.1" />
-    <PackageReference Include="JetBrains.RdFramework" Version="2023.3.1" />
-    <PackageReference Include="JetBrains.Rider.SDK" Version="2023.2.1">
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+    <PackageReference Include="JetBrains.Lifetimes" Version="2023.3.3" />
+    <PackageReference Include="JetBrains.RdFramework" Version="2023.3.3" />
+    <PackageReference Include="JetBrains.Rider.SDK" Version="2023.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/dotnet/ReSharperPlugin.RimworldDev/RimworldXmlProject/Project/RimworldProjectProperties.cs

@@ -85,14 +85,15 @@ public static IProjectProperties CreateProjectProperties(
     {
         return new RimworldProjectProperties<CSharpProjectConfiguration>(Guid.Parse("{F2A71F9B-5D33-465A-A702-920D77279781}"), ProjectLanguage.CSHARP);
     }
-    
-    public IProjectProperties Read(UnsafeReader reader)
+
+    public IProjectProperties Read(UnsafeReader reader, IStringIntern stringIntern)
     {
-        ProjectLanguage presentableName = ProjectLanguage.ParsePresentableName(reader.ReadString());
-        RimworldProjectProperties<CSharpProjectConfiguration> projectProperties =
+        var presentableName = ProjectLanguage.ParsePresentableName(reader.ReadString());
+        var projectProperties =
             new RimworldProjectProperties<CSharpProjectConfiguration>(this.FactoryGuid, presentableName);
-        projectProperties.ReadProjectProperties(reader);
-        return projectProperties;}
+        projectProperties.ReadProjectProperties(reader, stringIntern);
+        return projectProperties;    
+    }
 
     public Guid FactoryGuid => Guid.Parse("{F2A71F9B-5D33-465A-A702-920D77279781}");
 }

src/dotnet/ReSharperPlugin.RimworldDev/TypeDeclaration/XmlTagDeclaration.cs

@@ -100,22 +100,22 @@ public TReturn AcceptVisitor<TContext, TReturn>(IXmlTreeVisitor<TContext, TRetur
 
     public IList<T> GetNestedTags<T>(string xpath) where T : class, IXmlTag => owner.GetNestedTags<T>(xpath);
 
-    public TXmlTag AddTagBefore<TXmlTag>(TXmlTag tag, IXmlTag anchor) where TXmlTag : IXmlTag =>
+    public TXmlTag AddTagBefore<TXmlTag>(TXmlTag tag, IXmlTag anchor) where TXmlTag : class, IXmlTag =>
         owner.AddTagBefore(tag, anchor);
 
-    public TXmlTag AddTagAfter<TXmlTag>(TXmlTag tag, IXmlTag anchor) where TXmlTag : IXmlTag =>
-        owner.AddTagAfter(tag, anchor);
+    public TXmlTag AddTagAfter<TXmlTag>(TXmlTag tag, IXmlTag anchor) where TXmlTag : class, IXmlTag =>
+    owner.AddTagAfter(tag, anchor);
 
     public void RemoveTag(IXmlTag tag) => owner.RemoveTag(tag);
 
     public TreeNodeCollection<IXmlTag> InnerTags => owner.InnerTags;
 
     public TXmlAttribute AddAttributeBefore<TXmlAttribute>(TXmlAttribute attribute, IXmlAttribute anchor)
-        where TXmlAttribute : IXmlAttribute =>
+        where TXmlAttribute : class, IXmlAttribute =>
         owner.AddAttributeBefore(attribute, anchor);
 
     public TXmlAttribute AddAttributeAfter<TXmlAttribute>(TXmlAttribute attribute, IXmlAttribute anchor)
-        where TXmlAttribute : IXmlAttribute =>
+        where TXmlAttribute : class, IXmlAttribute =>
         owner.AddAttributeAfter(attribute, anchor);
 
     public void RemoveAttribute(IXmlAttribute attribute) => owner.RemoveAttribute(attribute);

src/rider/main/resources/META-INF/plugin.xml

@@ -1,9 +1,9 @@
 <idea-plugin require-restart="true">
   <id>com.jetbrains.rider.plugins.rimworlddev</id>
   <name>Rimworld Development Environment</name>
-  <version>2023.3red.1</version>
+  <version>2023.3.2</version>
   <vendor url="https://github.com/Garethp/Rider-RimworldDevelopment">Garethp</vendor>
-  <idea-version since-build="231" />
+  <idea-version since-build="233" />
   <depends>com.intellij.modules.rider</depends>
   <depends>com.intellij.resharper.unity</depends>
 
@@ -18,10 +18,7 @@ in your mods!</p>
   <change-notes>
 <![CDATA[
 <p><ul>
-<li>Fixed a rare crash when the plugin was completely unable to locate Rimworld</li>
-<li>Fixed automatic Rimworld detection when Rimworld is installed through Steam on the C: drive</li>
-<li>Fixed some false positives on error checking in XML</li>
-<li>Added more mod folders to the XML Project that gets added automatically</li>
+<li>Updated to work with Rider 2023.3</li>
 </ul></p>
 ]]>
   </change-notes>