Update to R# 2024.2 (#339)

robertcoltheart · web-flow · commit 3c8c2e46a745 · 2024-09-03T09:11:07.000+10:00
* Update to R# 2024.2

* tidy

* readme
diff --git a/src/Machine.Specifications.Runner.ReSharper.Adapters/Machine.Specifications.Runner.ReSharper.Adapters.csproj b/src/Machine.Specifications.Runner.ReSharper.Adapters/Machine.Specifications.Runner.ReSharper.Adapters.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ILRepack" Version="2.0.30" PrivateAssets="All" />
-    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="[2.14.1,)" PrivateAssets="All" />
+    <PackageReference Include="ILRepack" Version="2.0.34" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="[2.16.1,)" PrivateAssets="All" />
     <PackageReference Include="Machine.Specifications.Runner.Utility" Version="1.0.2" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/Machine.Specifications.Runner.ReSharper.Tasks/Machine.Specifications.Runner.ReSharper.Tasks.csproj b/src/Machine.Specifications.Runner.ReSharper.Tasks/Machine.Specifications.Runner.ReSharper.Tasks.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="[2.14.1,)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="[2.16.1,)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Machine.Specifications.Runner.ReSharper.Tests/Machine.Specifications.Runner.ReSharper.Tests.csproj b/src/Machine.Specifications.Runner.ReSharper.Tests/Machine.Specifications.Runner.ReSharper.Tests.csproj
@@ -11,15 +11,15 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Lifetimes" Version="[2024.1.0,)" />
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2024.1.0">
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2024.2.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="[2.14.1,)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="[2.16.1,)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="NUnit" Version="[3.13.2,)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Machine.Specifications.Runner.ReSharper.Tests/TestFramework/Execution/EmptyPreparedProcess.cs b/src/Machine.Specifications.Runner.ReSharper.Tests/TestFramework/Execution/EmptyPreparedProcess.cs
@@ -1,9 +1,10 @@
 ﻿using System;
 using JetBrains.Util;
+using JetBrains.Util.Processes;
 
 namespace Machine.Specifications.Runner.ReSharper.Tests.TestFramework.Execution;
 
-public class EmptyPreparedProcess : IPreparedProcess
+public class EmptyPreparedProcess : IPreparedProcessWithCachedOutput
 {
     public int ProcessId => 0;
 
diff --git a/src/Machine.Specifications.Runner.ReSharper.Tests/TestFramework/Execution/ExecutionAgent.cs b/src/Machine.Specifications.Runner.ReSharper.Tests/TestFramework/Execution/ExecutionAgent.cs
@@ -6,7 +6,8 @@
 using JetBrains.ReSharper.TestRunner.Abstractions.Objects;
 using JetBrains.ReSharper.UnitTestFramework;
 using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner;
-using JetBrains.Util;
+using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner.Activation;
+using JetBrains.Util.Processes;
 
 namespace Machine.Specifications.Runner.ReSharper.Tests.TestFramework.Execution;
 
@@ -27,14 +28,18 @@ public Task<int> Shutdown()
 
     public Lifetime Lifetime { get; } = Lifetime.Eternal;
 
-    public IPreparedProcess Process { get; } = new EmptyPreparedProcess();
+    public IPreparedProcessWithCachedOutput Process { get; } = new EmptyPreparedProcess();
 
     public IMessageBroker MessageBroker { get; }
 
     public object ActivationOptions { get; } = new();
 
     public ITestRunnerExecutionContext Context { get; }
 
+    public IRemoteAgentSerializers Serializers { get; }
+
+    public ITestRunnerMessageHandlerRegistry MessageHandlers { get; }
+
     public async Task RunTests(CancellationToken cancelCt, CancellationToken abortCt)
     {
         cancelCt.Register(() => MessageBroker.Abort());
@@ -66,4 +71,8 @@ private void ReportUnitTestElements(ITestRunnerRemoteTaskDepot depot)
             }
         }
     }
+
+    public void Dispose()
+    {
+    }
 }
diff --git a/src/Machine.Specifications.Runner.ReSharper.Tests/TestFramework/UnitTestSessionConductor.cs b/src/Machine.Specifications.Runner.ReSharper.Tests/TestFramework/UnitTestSessionConductor.cs
@@ -3,7 +3,6 @@
 using JetBrains.Application.UI.ActionSystem.ActionBar;
 using JetBrains.Application.UI.Components;
 using JetBrains.Application.UI.Components.Theming;
-using JetBrains.Application.UI.ToolWindowManagement;
 using JetBrains.Lifetimes;
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Psi.Caches;
@@ -23,6 +22,7 @@
 using JetBrains.ReSharper.UnitTestFramework.UI.ViewModels.TreeModel.Nodes;
 using System.Collections.Generic;
 using JetBrains.Application.Components;
+using System.Threading.Tasks;
 
 namespace Machine.Specifications.Runner.ReSharper.Tests.TestFramework;
 
@@ -41,16 +41,15 @@ public UnitTestSessionConductor(
         IActionManager actionManager,
         IActionBarManager actionBarManager,
         IPersistentIndexManager persistentIndexManager,
-        ToolWindowManager toolWindowManager,
         IUnitTestSessionRepository sessionRepository,
         IEnumerable<IUnitTestSessionManagerPreviewPanelFactory> previewPanelFactories,
         ILogger logger)
-        : base(serializer, lifetime, solution, theming, application, settings, actionManager, actionBarManager, persistentIndexManager, toolWindowManager, sessionRepository, logger)
+        : base(serializer, lifetime, solution, theming, application, settings, actionManager, actionBarManager, persistentIndexManager, sessionRepository, logger)
     {
         this.previewPanelFactories = previewPanelFactories;
     }
 
-    public override IUnitTestSessionTreeViewModel OpenSession(IUnitTestSession session, bool activate = true)
+    public override Task<IUnitTestSessionTreeViewModel> OpenSession(IUnitTestSession session, bool activate = true)
     {
         EnsureSessionsAreOpened();
 
@@ -61,11 +60,12 @@ public override IUnitTestSessionTreeViewModel OpenSession(IUnitTestSession sessi
             ActiveSession.Value = viewModel;
         }
 
-        return viewModel;
+        return Task.FromResult(viewModel);
     }
 
-    public override void CloseSession(IUnitTestSession session)
+    public override Task CloseSession(IUnitTestSession session)
     {
+        return Task.CompletedTask;
     }
 
     private IUnitTestSessionTreeViewModel CreateViewModel(IUnitTestSession session)
diff --git a/src/Machine.Specifications.Runner.ReSharper.Tests/TestFramework/UnitTestSourceTestBase.cs b/src/Machine.Specifications.Runner.ReSharper.Tests/TestFramework/UnitTestSourceTestBase.cs
@@ -37,7 +37,7 @@ protected override void DoTest(Lifetime lifetime, IProject project)
 
         var observer = new TestElementObserverOnFile(transaction.Observer, file!.GetSourceFile());
 
-        fileExplorer.ProcessFile(file, observer, InterruptableReadActivity.Empty);
+        fileExplorer.ProcessFile(file, observer, () => false);
 
         DumpElements(transaction.Elements, projectFile.Name + ".source");
     }
diff --git a/src/Machine.Specifications.Runner.ReSharper/Machine.Specifications.Runner.ReSharper.csproj b/src/Machine.Specifications.Runner.ReSharper/Machine.Specifications.Runner.ReSharper.csproj
@@ -19,7 +19,7 @@
     <Authors>Machine</Authors>
     <Owners>Machine</Owners>
     <PackageTags>test;unit;testing;context;specification;bdd;tdd;mspec;runner;resharper</PackageTags>
-    <PackageReleaseNotes>Adds support for R# and Rider 2024.1</PackageReleaseNotes>
+    <PackageReleaseNotes>Adds support for R# and Rider 2024.2</PackageReleaseNotes>
     <PackageIcon>Machine.png</PackageIcon>
     <PackageIconUrl>http://github.com/machine/machine.specifications.runner.resharper/raw/master/images/icon.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/machine/machine.specifications.runner.resharper</RepositoryUrl>
@@ -28,13 +28,13 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <SdkVersion>2024.1.0</SdkVersion>
+    <SdkVersion>2024.2.0</SdkVersion>
     <WaveVersionBase>$(SdkVersion.Substring(2,2))$(SdkVersion.Substring(5,1))</WaveVersionBase>
     <WaveVersion>$(WaveVersionBase).0.0</WaveVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2024.1.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2024.2.3" PrivateAssets="All" />
     <PackageReference Include="Machine.Specifications.Runner.Utility" Version="1.0.2" PrivateAssets="All" />
     <PackageReference Include="Wave" Version="[$(WaveVersion)]" />
   </ItemGroup>
diff --git a/src/Machine.Specifications.Runner.ReSharper/MspecTestRunnerOrchestrator.cs b/src/Machine.Specifications.Runner.ReSharper/MspecTestRunnerOrchestrator.cs
@@ -23,7 +23,7 @@ public class MspecTestRunnerOrchestrator : ITestRunnerAdapter
 
     public TestAdapterLoader GetTestAdapterLoader(ITestRunnerContext context)
     {
-        var framework = context.RuntimeEnvironment.TargetFrameworkId.IsNetCoreSdk()
+        var framework = context.RuntimeDescriptor.TargetFrameworkId.IsNetCoreSdk()
             ? "netstandard20"
             : "net461";
 
diff --git a/src/Machine.Specifications.Runner.ReSharper/Runner/MspecTestRunnerRunStrategy.cs b/src/Machine.Specifications.Runner.ReSharper/Runner/MspecTestRunnerRunStrategy.cs
@@ -1,5 +1,4 @@
 ﻿using JetBrains.ProjectModel;
-using JetBrains.ProjectModel.DotNetCore;
 using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner;
 using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner.DataCollection;
 using JetBrains.ReSharper.UnitTestFramework.Exploration.Artifacts;
@@ -12,11 +11,9 @@ public class MspecTestRunnerRunStrategy : TestRunnerRunStrategy
     public MspecTestRunnerRunStrategy(
         IDataCollectorFactory dataCollectorFactory,
         IAgentManagerHost agentManagerHost,
-        ITestRunnerHostSource testRunnerHostSource,
         MspecTestRunnerOrchestrator adapter,
-        IUnitTestProjectArtifactResolver artifactResolver,
-        DotNetCoreLaunchSettingsJsonProfileProvider launchSettingsProvider)
-        : base(dataCollectorFactory, agentManagerHost.AgentManager, testRunnerHostSource, adapter, artifactResolver, launchSettingsProvider)
+        IUnitTestProjectArtifactResolver artifactResolver)
+        : base(dataCollectorFactory, agentManagerHost.AgentManager, adapter, artifactResolver)
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using JetBrains.Util;`
	`3`	`+using JetBrains.Util.Processes;`
`3`	`4`
`4`	`5`	`namespace Machine.Specifications.Runner.ReSharper.Tests.TestFramework.Execution;`
`5`	`6`
`6`		`-public class EmptyPreparedProcess : IPreparedProcess`
	`7`	`+public class EmptyPreparedProcess : IPreparedProcessWithCachedOutput`
`7`	`8`	`{`
`8`	`9`	`public int ProcessId => 0;`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`using JetBrains.ReSharper.TestRunner.Abstractions.Objects;`
`7`	`7`	`using JetBrains.ReSharper.UnitTestFramework;`
`8`	`8`	`using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner;`
`9`		`-using JetBrains.Util;`
	`9`	`+using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner.Activation;`
	`10`	`+using JetBrains.Util.Processes;`
`10`	`11`
`11`	`12`	`namespace Machine.Specifications.Runner.ReSharper.Tests.TestFramework.Execution;`
`12`	`13`
`@@ -27,14 +28,18 @@ public Task<int> Shutdown()`
`27`	`28`
`28`	`29`	`public Lifetime Lifetime { get; } = Lifetime.Eternal;`
`29`	`30`
`30`		`- public IPreparedProcess Process { get; } = new EmptyPreparedProcess();`
	`31`	`+ public IPreparedProcessWithCachedOutput Process { get; } = new EmptyPreparedProcess();`
`31`	`32`
`32`	`33`	`public IMessageBroker MessageBroker { get; }`
`33`	`34`
`34`	`35`	`public object ActivationOptions { get; } = new();`
`35`	`36`
`36`	`37`	`public ITestRunnerExecutionContext Context { get; }`
`37`	`38`
	`39`	`+ public IRemoteAgentSerializers Serializers { get; }`
	`40`	`+`
	`41`	`+ public ITestRunnerMessageHandlerRegistry MessageHandlers { get; }`
	`42`	`+`
`38`	`43`	`public async Task RunTests(CancellationToken cancelCt, CancellationToken abortCt)`
`39`	`44`	`{`
`40`	`45`	`cancelCt.Register(() => MessageBroker.Abort());`
`@@ -66,4 +71,8 @@ private void ReportUnitTestElements(ITestRunnerRemoteTaskDepot depot)`
`66`	`71`	`}`
`67`	`72`	`}`
`68`	`73`	`}`
	`74`	`+`
	`75`	`+ public void Dispose()`
	`76`	`+ {`
	`77`	`+ }`
`69`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected override void DoTest(Lifetime lifetime, IProject project)`
`37`	`37`
`38`	`38`	`var observer = new TestElementObserverOnFile(transaction.Observer, file!.GetSourceFile());`
`39`	`39`
`40`		`- fileExplorer.ProcessFile(file, observer, InterruptableReadActivity.Empty);`
	`40`	`+ fileExplorer.ProcessFile(file, observer, () => false);`
`41`	`41`
`42`	`42`	`DumpElements(transaction.Elements, projectFile.Name + ".source");`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class MspecTestRunnerOrchestrator : ITestRunnerAdapter`
`23`	`23`
`24`	`24`	`public TestAdapterLoader GetTestAdapterLoader(ITestRunnerContext context)`
`25`	`25`	`{`
`26`		`- var framework = context.RuntimeEnvironment.TargetFrameworkId.IsNetCoreSdk()`
	`26`	`+ var framework = context.RuntimeDescriptor.TargetFrameworkId.IsNetCoreSdk()`
`27`	`27`	`? "netstandard20"`
`28`	`28`	`: "net461";`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using JetBrains.ProjectModel;`
`2`		`-using JetBrains.ProjectModel.DotNetCore;`
`3`	`2`	`using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner;`
`4`	`3`	`using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner.DataCollection;`
`5`	`4`	`using JetBrains.ReSharper.UnitTestFramework.Exploration.Artifacts;`
`@@ -12,11 +11,9 @@ public class MspecTestRunnerRunStrategy : TestRunnerRunStrategy`
`12`	`11`	`public MspecTestRunnerRunStrategy(`
`13`	`12`	`IDataCollectorFactory dataCollectorFactory,`
`14`	`13`	`IAgentManagerHost agentManagerHost,`
`15`		`- ITestRunnerHostSource testRunnerHostSource,`
`16`	`14`	`MspecTestRunnerOrchestrator adapter,`
`17`		`- IUnitTestProjectArtifactResolver artifactResolver,`
`18`		`- DotNetCoreLaunchSettingsJsonProfileProvider launchSettingsProvider)`
`19`		`- : base(dataCollectorFactory, agentManagerHost.AgentManager, testRunnerHostSource, adapter, artifactResolver, launchSettingsProvider)`
	`15`	`+ IUnitTestProjectArtifactResolver artifactResolver)`
	`16`	`+ : base(dataCollectorFactory, agentManagerHost.AgentManager, adapter, artifactResolver)`
`20`	`17`	`{`
`21`	`18`	`}`
`22`	`19`	`}`