Update to rider 2024.1-eap9

Socolin · Mar 22, 2024 · f21c795 · f21c795
1 parent 9fbd7cb
commit f21c795
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ 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).
 
+## 2024.1.0 - 2024-03-21
+- Rider 2023.3-EAP9-SNAPSHOT
+
 ## 1.11.0 - 2023.11-22
 - Rider 2023.3-EAP8-SNAPSHOT
 

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.8.22'
     id 'org.jetbrains.intellij' version '1.13.3'     // https://github.com/JetBrains/gradle-intellij-plugin/releases
-    id 'com.jetbrains.rdgen' version '2023.3.2'      // https://github.com/JetBrains/rd/releases
+    id 'com.jetbrains.rdgen' version '2024.1.1'       // https://github.com/JetBrains/rd/releases
 }
 
 ext {

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.NSubstituteComplete
 DotnetSolution=NSubstituteComplete.sln
 RiderPluginId=nsubstitutecomplete
-PluginVersion=1.11.1
+PluginVersion=2024.0.1
 
 BuildConfiguration=Release
 PublishToken="_PLACE_HOLDER_"
@@ -13,7 +13,7 @@ PublishToken="_PLACE_HOLDER_"
 #    2020.1.0-SNAPSHOT
 #    2020.1.0-EAP2-SNAPSHOT
 #    2020.1.0
-ProductVersion=2023.3-EAP8-SNAPSHOT
+ProductVersion=2024.1-EAP9-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

diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+    <packageSources>
+        <clear />
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+</configuration>
diff --git a/src/dotnet/Plugin.props b/src/dotnet/Plugin.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <SdkVersion>2023.3.0-eap08</SdkVersion>
+    <SdkVersion>2024.1.0-eap09</SdkVersion>
 
     <Title>NSubstituteComplete</Title>
     <Description>Provide quick fixes and smart autocomplete when using NSubstitute</Description>

diff --git a/src/dotnet/ReSharperPlugin.NSubstituteComplete.Tests/test/data/nuget.config b/src/dotnet/ReSharperPlugin.NSubstituteComplete.Tests/test/data/nuget.config
@@ -18,4 +18,10 @@
     <!-- Automatically check for missing packages during build in Visual Studio -->
     <add key="automatic" value="False" />
   </packageRestore>
+    <packageSourceMapping>
+        <packageSource key="nuget.org">
+            <package pattern="*" />
+        </packageSource>
+    </packageSourceMapping>
 </configuration>
+
diff --git a/src/dotnet/ReSharperPlugin.NSubstituteComplete/Options/MockAliasesModel.cs b/src/dotnet/ReSharperPlugin.NSubstituteComplete/Options/MockAliasesModel.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
-using JetBrains.Application.Settings;
 using JetBrains.Application.UI.Options;
 using JetBrains.IDE.UI.Extensions;
 using JetBrains.Lifetimes;
-using JetBrains.ReSharper.UnitTestFramework.Settings;
 using JetBrains.ReSharper.UnitTestFramework.UI.Options.ViewModel;
 using JetBrains.Threading;
-using JetBrains.Util.Media;
 
 namespace ReSharperPlugin.NSubstituteComplete.Options
 {

diff --git a/src/dotnet/ReSharperPlugin.NSubstituteComplete/Options/NSubstituteCompleteOptionPage.cs b/src/dotnet/ReSharperPlugin.NSubstituteComplete/Options/NSubstituteCompleteOptionPage.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using JetBrains.Annotations;
 using JetBrains.Application.Threading;
@@ -22,7 +21,6 @@ namespace ReSharperPlugin.NSubstituteComplete.Options
         null,
         ParentId = UnitTestingPages.General,
         NestingType = OptionPageNestingType.Inline,
-        IsAlignedWithParent = true,
         Sequence = 0.1d)]
     public class NSubstituteCompleteOptionPage : BeSimpleOptionsPage
     {