misc rider update experiments

mrlacey · May 22, 2024 · 8352043 · 8352043
1 parent 88e76bb
commit 8352043
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 11 deletions.
diff --git a/Rider/CHANGELOG.md b/Rider/CHANGELOG.md
@@ -4,5 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 1.0.1
+- Expanded plugin description.
+
 ## 1.0.0
 - Initial version
diff --git a/Rider/README.md b/Rider/README.md
@@ -3,6 +3,10 @@
 [![Rider](https://img.shields.io/jetbrains/plugin/v/RIDER_PLUGIN_ID.svg?label=Rider&colorB=0A7BBB&style=for-the-badge&logo=rider)](https://plugins.jetbrains.com/plugin/RIDER_PLUGIN_ID)
 <!--[![ReSharper](https://img.shields.io/jetbrains/plugin/v/RESHARPER_PLUGIN_ID.svg?label=ReSharper&colorB=0A7BBB&style=for-the-badge&logo=resharper)](https://plugins.jetbrains.com/plugin/RESHARPER_PLUGIN_ID)-->
 
-A toolkit of utilities to help work with XAML files.
+Tools to accelerate XAML app development.
+
+- Collapse the lines containing xmlns attributes to reduce noise in files.
+- More coming soon....
+
 
 _Slowly porting from the Visual Studio version. ;)_
diff --git a/Rider/gradle.properties b/Rider/gradle.properties
@@ -17,7 +17,7 @@ PublishToken="_PLACEHOLDER_"
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-ProductVersion=2023.1
+ProductVersion=2023.2
 
 # 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

diff --git a/Rider/src/dotnet/Plugin.props b/Rider/src/dotnet/Plugin.props
@@ -3,10 +3,10 @@
   <PropertyGroup>
     <!-- See https://www.nuget.org/packages/JetBrains.ReSharper.SDK -->
     <!-- Keep in sync with ProductVersion in gradle.properties -->
-    <SdkVersion>2023.1.0</SdkVersion>
+    <SdkVersion>2023.2.0</SdkVersion>
 
-    <Title>RapidXaml</Title>
-    <Description>Description</Description>
+    <Title>Rapid XAML</Title>
+    <Description>Tools to accelerate XAML app development.</Description>
 
     <Authors>Author</Authors>
     <Copyright>Copyright $([System.DateTime]::Now.Year) Matt Lacey</Copyright>

diff --git a/Rider/src/dotnet/ReSharperPlugin.RapidXaml.Tests/ReSharperPlugin.RapidXaml.Tests.csproj b/Rider/src/dotnet/ReSharperPlugin.RapidXaml.Tests/ReSharperPlugin.RapidXaml.Tests.csproj
@@ -7,7 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="$(SdkVersion)" />
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2023.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
   </ItemGroup>

diff --git a/Rider/src/dotnet/ReSharperPlugin.RapidXaml/ReSharperPlugin.RapidXaml.Rider.csproj b/Rider/src/dotnet/ReSharperPlugin.RapidXaml/ReSharperPlugin.RapidXaml.Rider.csproj
@@ -9,7 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Rider.SDK" Version="$(SdkVersion)" />
+    <PackageReference Include="JetBrains.Rider.SDK" Version="2023.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/Rider/src/dotnet/ReSharperPlugin.RapidXaml/XamlNamespaceCodeFoldingProcessorFactory.cs b/Rider/src/dotnet/ReSharperPlugin.RapidXaml/XamlNamespaceCodeFoldingProcessorFactory.cs
@@ -1,11 +1,12 @@
 using JetBrains.Annotations;
+using JetBrains.Application.Parts;
 using JetBrains.ReSharper.Daemon.CodeFolding;
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.Xaml;
 
 namespace ReSharperPlugin.RapidXaml;
 
-[Language(typeof(XamlLanguage))]
+[Language(typeof(XamlLanguage), Instantiation.DemandAnyThread)]
 public sealed class XamlNamespaceCodeFoldingProcessorFactory : ICodeFoldingProcessorFactory
 {
     [NotNull]

diff --git a/Rider/src/rider/main/resources/META-INF/plugin.xml b/Rider/src/rider/main/resources/META-INF/plugin.xml
@@ -1,14 +1,18 @@
 <idea-plugin require-restart="true">
   <id>mattlaceyltd.rapidxaml</id>
-  <name>Rapid Xaml</name>
-  <version>1.0.0</version>
+  <name>Rapid XAML</name>
+  <version>1.0.1</version>
   <vendor url="https://mrlacey.com">Mattt Lacey</vendor>
   <idea-version since-build="_PLACEHOLDER_" until-build="_PLACEHOLDER_" />
   <depends>com.intellij.modules.rider</depends>
 
   <description>
 <![CDATA[
-<p>A toolkit of utilities to help work with XAML files.</p>
+<p>Tools to accelerate XAML app development.</p>
+<ul>
+<li>Collapse the lines containing xmlns attributes to reduce noise in files.</li>
+<li>More coming soon....</li>
+</ul>
 ]]>
   </description>