Update to R# 2021.2 (#174)

* Update to R# 2020.2 * update everything * tests * tidy * tests * try again * try 3 * disable * logging * a * debug * debug * debug * test * try again * refactor * ignore reason
machine · Aug 5, 2021 · 5bf967a · 5bf967a
1 parent edcb0ba
commit 5bf967a
Show file tree

Hide file tree

Showing 54 changed files with 149 additions and 1,263 deletions.
diff --git a/Machine.Specifications.Runner.ReSharper.sln b/Machine.Specifications.Runner.ReSharper.sln
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Machine.Specifications.Runn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Machine.Specifications.Runner.ReSharper.Tasks", "src\Machine.Specifications.Runner.ReSharper.Tasks\Machine.Specifications.Runner.ReSharper.Tasks.csproj", "{8788CA0C-44A2-40EF-9859-076313FE884E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Machine.Specifications.Runner.ReSharper.Runner", "src\Machine.Specifications.Runner.ReSharper.Runner\Machine.Specifications.Runner.ReSharper.Runner.csproj", "{83CB88DD-51E2-4B88-ACCD-AFA2D7062B4F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Machine.Specifications.Runner.ReSharper.Tests", "src\Machine.Specifications.Runner.ReSharper.Tests\Machine.Specifications.Runner.ReSharper.Tests.csproj", "{64E9C141-E05B-4CBD-B8FC-75AF0EBAF907}"
 EndProject
 Global
@@ -43,10 +41,6 @@ Global
 		{8788CA0C-44A2-40EF-9859-076313FE884E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8788CA0C-44A2-40EF-9859-076313FE884E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8788CA0C-44A2-40EF-9859-076313FE884E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83CB88DD-51E2-4B88-ACCD-AFA2D7062B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83CB88DD-51E2-4B88-ACCD-AFA2D7062B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83CB88DD-51E2-4B88-ACCD-AFA2D7062B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83CB88DD-51E2-4B88-ACCD-AFA2D7062B4F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{64E9C141-E05B-4CBD-B8FC-75AF0EBAF907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{64E9C141-E05B-4CBD-B8FC-75AF0EBAF907}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{64E9C141-E05B-4CBD-B8FC-75AF0EBAF907}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/install-plugin.ps1 b/install-plugin.ps1
@@ -91,7 +91,6 @@ Function Write-Nuspec {
   <files>
     <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.ReSharper.Tasks.dll" target="DotFiles" />
-    <file src="..\src\Machine.Specifications.Runner.ReSharper\bin\Debug\net461\Machine.Specifications.Runner.ReSharper.Runner.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" />
@@ -208,6 +207,5 @@ $hostIdentifier = "$($installPath.Parent.Name)_$($installPath.Name.Split('_')[-1
 Write-User-Settings $hostIdentifier "$PSScriptRoot\src\Machine.Specifications.Runner.ReSharper\Machine.Specifications.Runner.ReSharper.csproj.user"
 Write-User-Settings $hostIdentifier "$PSScriptRoot\src\Machine.Specifications.Runner.ReSharper.Adapters\Machine.Specifications.Runner.ReSharper.Adapters.csproj.user"
 Write-User-Settings $hostIdentifier "$PSScriptRoot\src\Machine.Specifications.Runner.ReSharper.Tasks\Machine.Specifications.Runner.ReSharper.Tasks.csproj.user"
-Write-User-Settings $hostIdentifier "$PSScriptRoot\src\Machine.Specifications.Runner.ReSharper.Runner\Machine.Specifications.Runner.ReSharper.Runner.csproj.user"
 
 Write-Output "Installed plugin to hive"
diff --git a/...cations.Runner.ReSharper.Adapters/Machine.Specifications.Runner.ReSharper.Adapters.csproj b/...cations.Runner.ReSharper.Adapters/Machine.Specifications.Runner.ReSharper.Adapters.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="ILRepack" Version="2.0.18" PrivateAssets="All" />
-    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="1.3.1" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.ReSharper.TestRunner.Abstractions" Version="2.2.1" PrivateAssets="All" />
     <PackageReference Include="Machine.Specifications.Runner.Utility" Version="1.0.2" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/Machine.Specifications.Runner.ReSharper.Runner/AssemblyLoaderExtensions.cs b/src/Machine.Specifications.Runner.ReSharper.Runner/AssemblyLoaderExtensions.cs
diff --git a/src/Machine.Specifications.Runner.ReSharper.Runner/ExceptionResultExtensions.cs b/src/Machine.Specifications.Runner.ReSharper.Runner/ExceptionResultExtensions.cs
diff --git a/src/Machine.Specifications.Runner.ReSharper.Runner/HashCode.cs b/src/Machine.Specifications.Runner.ReSharper.Runner/HashCode.cs
diff --git a/...cifications.Runner.ReSharper.Runner/Machine.Specifications.Runner.ReSharper.Runner.csproj b/...cifications.Runner.ReSharper.Runner/Machine.Specifications.Runner.ReSharper.Runner.csproj
diff --git a/src/Machine.Specifications.Runner.ReSharper.Runner/MspecTaskRunner.cs b/src/Machine.Specifications.Runner.ReSharper.Runner/MspecTaskRunner.cs
diff --git a/src/Machine.Specifications.Runner.ReSharper.Runner/RunContext.cs b/src/Machine.Specifications.Runner.ReSharper.Runner/RunContext.cs
diff --git a/src/Machine.Specifications.Runner.ReSharper.Runner/Tasks/MspecAssemblyRunnerTask.cs b/src/Machine.Specifications.Runner.ReSharper.Runner/Tasks/MspecAssemblyRunnerTask.cs