Upgrade R# to 2021.3 (#188)

* Upgrade R# to 2021.3

* tests

* changes

* tidy

* fixes

* refactoring

* cleanup

* icon

* update

* build

* assembly

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "gitversion.tool": {
-      "version": "5.3.7",
+      "version": "5.8.1",
       "commands": [
         "dotnet-gitversion"
       ]

.github/workflows/build.yml

@@ -17,6 +17,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
       - name: Build

build/build.cs

@@ -16,6 +16,11 @@
 var notes = GetReleaseNotes();
 var apiKey = Environment.GetEnvironmentVariable("JETBRAINS_API_KEY");
 
+version.SemVer = "1.0.0";
+version.AssemblySemVer = "1.0.0";
+version.AssemblySemFileVer = "1.0.0";
+version.InformationalVersion = "1.0.0";
+
 Target("clean", () =>
 {
     Run("dotnet", "clean");
@@ -80,8 +85,11 @@
         .Replace("${UntilBuild}", waveVersion + ".*")
         .Replace("${ChangeNotes}", notes);
 
+    var icon = File.ReadAllBytes(Path.Combine("images", "pluginIcon.svg"));
+
     File.WriteAllText(Path.Combine(metaPath, "plugin.xml"), plugin);
     File.WriteAllText(Path.Combine(metaPath, "MANIFEST.MF"), "Manifest-Version: 1.0");
+    File.WriteAllBytes(Path.Combine(metaPath, "pluginIcon.svg"), icon);
 
     ZipFile.CreateFromDirectory(metaPath, jarPath, CompressionLevel.Optimal, true, new UnixUTF8Encoding());
 

build/build.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

install-plugin.ps1

@@ -92,8 +92,8 @@ Function Write-Nuspec {
     <file src="..\src\Machine.Specifications.Runner.ReSharper\bin\Debug\net461\Machine.Specifications.Runner.ReSharper.dll" target="DotFiles" />
     <file src="..\src\Machine.Specifications.Runner.ReSharper\bin\Debug\net461\Machine.Specifications.Runner.Utility.dll" target="DotFiles" />
     
-    <file src="..\src\Machine.Specifications.Runner.ReSharper.Adapters\bin\Debug\net40\Machine.Specifications.Runner.ReSharper.Adapters.net40.dll" target="DotFiles" />
-    <file src="..\src\Machine.Specifications.Runner.ReSharper.Tasks\bin\Debug\net40\Machine.Specifications.Runner.ReSharper.Tasks.net40.dll" target="DotFiles" />
+    <file src="..\src\Machine.Specifications.Runner.ReSharper.Adapters\bin\Debug\net461\Machine.Specifications.Runner.ReSharper.Adapters.net461.dll" target="DotFiles" />
+    <file src="..\src\Machine.Specifications.Runner.ReSharper.Tasks\bin\Debug\net461\Machine.Specifications.Runner.ReSharper.Tasks.net461.dll" target="DotFiles" />
 
     <file src="..\src\Machine.Specifications.Runner.ReSharper.Adapters\bin\Debug\netstandard2.0\Machine.Specifications.Runner.ReSharper.Adapters.netstandard20.dll" target="DotFiles" />
     <file src="..\src\Machine.Specifications.Runner.ReSharper.Tasks\bin\Debug\netstandard2.0\Machine.Specifications.Runner.ReSharper.Tasks.netstandard20.dll" target="DotFiles" />

src/Machine.Specifications.Runner.ReSharper.Adapters/Machine.Specifications.Runner.ReSharper.Adapters.csproj

@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PackageId>Machine.Specifications.Runner.ReSharper.Adapters</PackageId>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
 
-    <AssemblyName Condition="'$(TargetFramework)' == 'net40'">Machine.Specifications.Runner.ReSharper.Adapters.net40</AssemblyName>
+    <AssemblyName Condition="'$(TargetFramework)' == 'net461'">Machine.Specifications.Runner.ReSharper.Adapters.net461</AssemblyName>
     <AssemblyName Condition="'$(TargetFramework)' == 'netstandard2.0'">Machine.Specifications.Runner.ReSharper.Adapters.netstandard20</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ILRepack" Version="2.0.18" PrivateAssets="All" />
-    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.2.1" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.6.1" PrivateAssets="All" />
     <PackageReference Include="Machine.Specifications.Runner.Utility" Version="1.0.2" PrivateAssets="All" />
   </ItemGroup>
 

src/Machine.Specifications.Runner.ReSharper.Adapters/MspecReSharperId.cs

@@ -61,14 +61,23 @@ public static string Self(ContextInfo context, SpecificationInfo behaviorSpecifi
 
         public static MspecReSharperId Create(RemoteTask task)
         {
-            return task switch
+            switch (task)
             {
-                MspecContextRemoteTask context => new MspecReSharperId(context),
-                MspecContextSpecificationRemoteTask specification => new MspecReSharperId(specification),
-                MspecBehaviorRemoteTask behavior => new MspecReSharperId(behavior),
-                MspecBehaviorSpecificationRemoteTask specification => new MspecReSharperId(specification),
-                _ => throw new ArgumentOutOfRangeException(nameof(task))
-            };
+                case MspecContextRemoteTask context:
+                    return new MspecReSharperId(context);
+
+                case MspecContextSpecificationRemoteTask specification:
+                    return new MspecReSharperId(specification);
+
+                case MspecBehaviorRemoteTask behavior:
+                    return new MspecReSharperId(behavior);
+
+                case MspecBehaviorSpecificationRemoteTask specification:
+                    return new MspecReSharperId(specification);
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(task));
+            }
         }
 
         public bool Equals(MspecReSharperId? other)

src/Machine.Specifications.Runner.ReSharper.Adapters/RemoteTaskBuilder.cs

@@ -8,14 +8,23 @@ public static class RemoteTaskBuilder
     {
         public static MspecRemoteTask GetRemoteTask(RemoteTask task)
         {
-            return task switch
+            switch (task)
             {
-                MspecContextRemoteTask context => FromContext(context),
-                MspecContextSpecificationRemoteTask specification => FromContextSpecification(specification),
-                MspecBehaviorRemoteTask behavior => FromBehavior(behavior),
-                MspecBehaviorSpecificationRemoteTask specification => FromBehaviorSpecification(specification),
-                _ => throw new ArgumentOutOfRangeException(nameof(task))
-            };
+                case MspecContextRemoteTask context:
+                    return FromContext(context);
+
+                case MspecContextSpecificationRemoteTask specification:
+                    return FromContextSpecification(specification);
+
+                case MspecBehaviorRemoteTask behavior:
+                    return FromBehavior(behavior);
+
+                case MspecBehaviorSpecificationRemoteTask specification:
+                    return FromBehaviorSpecification(specification);
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(task));
+            }
         }
 
         private static MspecRemoteTask FromContext(MspecContextRemoteTask task)

src/Machine.Specifications.Runner.ReSharper.Tasks/Machine.Specifications.Runner.ReSharper.Tasks.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <PackageId>Machine.Specifications.Runner.ReSharper.Tasks</PackageId>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
 
-    <AssemblyName Condition="'$(TargetFramework)' == 'net40'">Machine.Specifications.Runner.ReSharper.Tasks.net40</AssemblyName>
+    <AssemblyName Condition="'$(TargetFramework)' == 'net461'">Machine.Specifications.Runner.ReSharper.Tasks.net461</AssemblyName>
     <AssemblyName Condition="'$(TargetFramework)' == 'netstandard2.0'">Machine.Specifications.Runner.ReSharper.Tasks.netstandard20</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.2.1" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.6.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/Machine.Specifications.Runner.ReSharper.Tests/AgentManager.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using JetBrains.Application.Components;
 using JetBrains.ReSharper.TestRunner.Abstractions.Isolation;
-using JetBrains.ReSharper.UnitTestFramework.TestRunner;
+using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner;
 
 namespace Machine.Specifications.Runner.ReSharper.Tests
 {

src/Machine.Specifications.Runner.ReSharper.Tests/ExecutionAgent.cs

@@ -4,7 +4,7 @@
 using JetBrains.Lifetimes;
 using JetBrains.ReSharper.TestRunner.Abstractions;
 using JetBrains.ReSharper.TestRunner.Abstractions.Objects;
-using JetBrains.ReSharper.UnitTestFramework.TestRunner;
+using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner;
 using JetBrains.Util;
 
 namespace Machine.Specifications.Runner.ReSharper.Tests
@@ -34,17 +34,17 @@ public Task<int> Shutdown()
 
         public ITestRunnerExecutionContext Context { get; }
 
-        public async Task RunTests(CancellationToken cancelCt, CancellationToken abortCt)
+        public async Task RunTests(CancellationToken cancelCt)
         {
-            abortCt.Register(() => MessageBroker.Abort());
+            cancelCt.Register(() => MessageBroker.Abort());
 
             var taskDepot = Context.Container.GetComponent<ITestRunnerRemoteTaskDepot>();
 
             var loader = Context.Adapter.GetTestAdapterLoader(Context);
             var container = Context.Adapter.GetTestContainer(Context);
 
             var tasks = taskDepot.GetRemoteTasks(Context.Run);
-            
+
             await MessageBroker.Initialize(new RemoteAgentInitializationRequest(loader)).ConfigureAwait(false);
             await MessageBroker.RunTests(new TestRunRequest(container, tasks)).ConfigureAwait(false);
         }

src/Machine.Specifications.Runner.ReSharper.Tests/Machine.Specifications.Runner.ReSharper.Tests.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Lifetimes" Version="2021.2.0" />
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2021.2.2">
+    <PackageReference Include="JetBrains.Lifetimes" Version="2021.3.4" />
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2021.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.2.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.6.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
   </ItemGroup>

src/Machine.Specifications.Runner.ReSharper.Tests/Metadata/MspecMetadataTests.cs

@@ -6,7 +6,7 @@ namespace Machine.Specifications.Runner.ReSharper.Tests.Metadata
 {
     [MspecReferences]
     [TestNetFramework46]
-    public class MspecMetadataTests : MspecMetadataTestBase
+    public class MspecMetadataTests : UnitTestMetadataTestBase
     {
         protected override string RelativeTestDataPath => "Exploration";
 

src/Machine.Specifications.Runner.ReSharper.Tests/Runner/MspecRunnerTests.cs

@@ -6,7 +6,7 @@ namespace Machine.Specifications.Runner.ReSharper.Tests.Runner
 {
     [MspecReferences]
     [TestNetFramework46]
-    public class MspecRunnerTests : MspecTaskRunnerTestBase
+    public class MspecRunnerTests : UnitTestRunnerTestBase
     {
         protected override string RelativeTestDataPath => "Runner";
 

src/Machine.Specifications.Runner.ReSharper.Tests/Source/MspecSourceTests.cs

@@ -5,7 +5,7 @@ namespace Machine.Specifications.Runner.ReSharper.Tests.Source
 {
     [MspecReferences]
     [TestNetFramework46]
-    public class MspecSourceTests : MspecSourceTestBase
+    public class MspecSourceTests : UnitTestSourceTestBase
     {
         protected override string RelativeTestDataPath => "Exploration";
 

src/Machine.Specifications.Runner.ReSharper.Tests/TestAgentManagerHost.cs

@@ -1,7 +1,7 @@
 using JetBrains.Application.Components;
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.TestRunner.Abstractions.Isolation;
-using JetBrains.ReSharper.UnitTestFramework.TestRunner;
+using JetBrains.ReSharper.UnitTestFramework.Execution.TestRunner;
 using Machine.Specifications.Runner.ReSharper.Runner;
 
 namespace Machine.Specifications.Runner.ReSharper.Tests

src/Machine.Specifications.Runner.ReSharper.Tests/TestElementObserverOnFile.cs

@@ -0,0 +1,32 @@
+using JetBrains.ReSharper.UnitTestFramework.Elements;
+using JetBrains.ReSharper.UnitTestFramework.Exploration;
+using JetBrains.Util;
+
+namespace Machine.Specifications.Runner.ReSharper.Tests
+{
+    public class TestElementObserverOnFile : IUnitTestElementObserverOnFile 
+    {
+        private readonly IUnitTestElementObserver inner;
+
+        public TestElementObserverOnFile(IUnitTestElementObserver inner)
+        {
+            this.inner = inner;
+        }
+
+        public IUnitTestElementSource Source => inner.Source;
+
+        public T GetElementById<T>(string testId)
+        {
+            return inner.GetElementById<T>(testId);
+        }
+
+        public void OnUnitTestElement(IUnitTestElement element)
+        {
+            inner.OnUnitTestElement(element);
+        }
+
+        public void OnUnitTestElementDisposition(IUnitTestLikeElement element, TextRange navigationRange, TextRange containingRange)
+        {
+        }
+    }
+}

src/Machine.Specifications.Runner.ReSharper.Tests/UnitTestArtifactResolver.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using JetBrains.ProjectModel;
-using JetBrains.ReSharper.UnitTestFramework.Exploration;
+using JetBrains.ReSharper.UnitTestFramework.Exploration.Artifacts;
 using JetBrains.Util;
 using JetBrains.Util.Dotnet.TargetFrameworkIds;
 
@@ -16,7 +16,7 @@ public bool CanResolveArtifact(IProject project, TargetFrameworkId targetFramewo
 
         public FileSystemPath ResolveArtifact(IProject project, TargetFrameworkId targetFrameworkId)
         {
-            return project.GetSubItems().First().Location;
+            return project.GetSubItems().First().Location.ToNativeFileSystemPath();
         }
     }
 }