Adding missing assemblies. (#39)

* Adding missing assemblies. * Updating Changelog * Reapply "Update dependencies (#35)" This reverts commit ec8d7e7.
reqnroll · Sep 18, 2024 · 22e7e29 · 22e7e29
1 parent ac02259
commit 22e7e29
Show file tree

Hide file tree

Showing 25 changed files with 103 additions and 150 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,9 @@
 
 ## Bug fixes:
 
-## Improvements:
+* Bug Fix: Fix 'Reqnroll Extension v2024.3.152 does not work on Visual Studio 17.11.4 (#37)' by including missing assemblies.
 
-*Contributors of this release (in alphabetical order): * 
+*Contributors of this release (in alphabetical order): @UL-ChrisGlew* 
 
 # v2024.4.154 - 2024-09-18
 

diff --git a/...alStudio.ReqnrollConnector.Generic/Reqnroll.VisualStudio.ReqnrollConnector.Generic.csproj b/...alStudio.ReqnrollConnector.Generic/Reqnroll.VisualStudio.ReqnrollConnector.Generic.csproj
@@ -12,10 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="3.3.5" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
+    <PackageReference Include="dnlib" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Connectors/Reqnroll.VisualStudio.ReqnrollConnector.V1/FakeTestContext.cs b/Connectors/Reqnroll.VisualStudio.ReqnrollConnector.V1/FakeTestContext.cs
@@ -4,6 +4,7 @@
 using System.Data.Common;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+// ReSharper disable once CheckNamespace
 namespace Reqnroll.VisualStudio.ReqnrollConnector.Discovery;
 
 internal class FakeTestContext : TestContext
@@ -14,37 +15,27 @@ internal class FakeTestContext : TestContext
 
     public override DbConnection DataConnection => throw new NotImplementedException();
 
-    public override void AddResultFile(string fileName)
+    public override void AddResultFile(string? fileName)
     {
         throw new NotImplementedException();
     }
 
-    public override void BeginTimer(string timerName)
+    public override void Write(string? message)
     {
         throw new NotImplementedException();
     }
 
-    public override void EndTimer(string timerName)
+    public override void Write(string? format, params object?[] args)
     {
         throw new NotImplementedException();
     }
 
-    public override void Write(string message)
+    public override void WriteLine(string? message)
     {
         throw new NotImplementedException();
     }
 
-    public override void Write(string format, params object[] args)
-    {
-        throw new NotImplementedException();
-    }
-
-    public override void WriteLine(string message)
-    {
-        throw new NotImplementedException();
-    }
-
-    public override void WriteLine(string format, params object[] args)
+    public override void WriteLine(string? format, params object?[] args)
     {
         throw new NotImplementedException();
     }

diff --git a/...nroll.VisualStudio.ReqnrollConnector.V1/Reqnroll.VisualStudio.ReqnrollConnector.V1.csproj b/...nroll.VisualStudio.ReqnrollConnector.V1/Reqnroll.VisualStudio.ReqnrollConnector.V1.csproj
@@ -13,15 +13,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="3.3.5" />
+    <PackageReference Include="dnlib" Version="4.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Reqnroll.CustomPlugin" Version="1.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\Reqnroll.VisualStudio.ReqnrollConnector.Models\Reqnroll.VisualStudio.ReqnrollConnector.Models.csproj" />
+    <ProjectReference Include="..\Reqnroll.VisualStudio.ReqnrollConnector.Models\Reqnroll.VisualStudio.ReqnrollConnector.Models.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -31,31 +30,24 @@
 
   <Import Project="..\..\Reqnroll.VisualStudio.Common\Reqnroll.VisualStudio.Common.projitems" Label="Shared" />
 
-  <Import Project="..\Reqnroll.VisualStudio.ReqnrollConnector\Reqnroll.VisualStudio.ReqnrollConnector.projitems"
-          Label="Shared" />
+  <Import Project="..\Reqnroll.VisualStudio.ReqnrollConnector\Reqnroll.VisualStudio.ReqnrollConnector.projitems" Label="Shared" />
 
   <Target Name="CustomAfterBuild" AfterTargets="Build" Condition="$(configuration)=='Debug'">
     <Message Text="$(OutputPath)" Importance="high" />
 
     <ItemGroup>
-      <_FilesToCopy Include="$(OutputPath)\*"
-                    Exclude="$(OutputPath)\TechTalk.*;$(OutputPath)\System.*;$(OutputPath)\Gherkin.*;$(OutputPath)\*.exe.config" />
+      <_FilesToCopy Include="$(OutputPath)\*" Exclude="$(OutputPath)\TechTalk.*;$(OutputPath)\System.*;$(OutputPath)\Gherkin.*;$(OutputPath)\*.exe.config" />
     </ItemGroup>
     <Message Text="$(configuration) _FilesToCopy: @(_FilesToCopy)" Importance="high" />
 
-    <Message
-      Text="DestFiles:&#xD;&#xA;        @(_FilesToCopy->'$(_OutputCopyLocation)\V1\%(RecursiveDir)%(Filename)%(Extension)')"
-      Importance="high" />
+    <Message Text="DestFiles:&#xD;&#xA;        @(_FilesToCopy->'$(_OutputCopyLocation)\V1\%(RecursiveDir)%(Filename)%(Extension)')" Importance="high" />
 
-    <Message
-      Text="Copying: @(_FilesToCopy)->'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'"
-      Importance="high" />
+    <Message Text="Copying: @(_FilesToCopy)-&gt;'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'" Importance="high" />
 
     <!-- We do not clean the output location before copying, because normal build does not produce
 	     x86 binaries, so we just keep what it is there. For a clean build or to test x86 connector, 
 		 run the Connectors\build.ps1 first. -->
 
-    <Copy SourceFiles="@(_FilesToCopy)"
-          DestinationFiles="$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(_FilesToCopy)" DestinationFiles="$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)" />
   </Target>
 </Project>
diff --git a/...pecFlow.VisualStudio.SpecFlowConnector.Generic/AssemblyLoading/TestAssemblyLoadContext.cs b/...pecFlow.VisualStudio.SpecFlowConnector.Generic/AssemblyLoading/TestAssemblyLoadContext.cs
@@ -1,6 +1,4 @@
-using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
-
-namespace SpecFlowConnector.AssemblyLoading;
+namespace SpecFlowConnector.AssemblyLoading;
 
 public class TestAssemblyLoadContext : AssemblyLoadContext
 {
@@ -45,7 +43,7 @@ private RuntimeFallbacks GetRuntimeFallbacks()
             ? _dependencyContext.RuntimeGraph
             : DependencyContext.Default.RuntimeGraph;
 
-        var rid = RuntimeEnvironment.GetRuntimeIdentifier();
+        var rid = Environment.OSVersion.Platform.ToString();
         var fallbackRid = GetFallbackRid();
         var fallbackGraph = ridGraph.FirstOrDefault(g => g.Runtime == rid)
                             ?? ridGraph.FirstOrDefault(g => g.Runtime == fallbackRid)

diff --git a/...alStudio.SpecFlowConnector.Generic/SpecFlow.VisualStudio.SpecFlowConnector.Generic.csproj b/...alStudio.SpecFlowConnector.Generic/SpecFlow.VisualStudio.SpecFlowConnector.Generic.csproj
@@ -12,13 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="3.3.5" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+    <PackageReference Include="dnlib" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
     <PackageReference Include="SpecFlow.CustomPlugin" Version="3.9.40" />
-    <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Connectors/SpecFlow.VisualStudio.SpecFlowConnector.V1/FakeTestContext.cs b/Connectors/SpecFlow.VisualStudio.SpecFlowConnector.V1/FakeTestContext.cs
@@ -4,6 +4,7 @@
 using System.Data.Common;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+// ReSharper disable once CheckNamespace
 namespace SpecFlow.VisualStudio.SpecFlowConnector.Discovery;
 
 internal class FakeTestContext : TestContext
@@ -19,32 +20,22 @@ public override void AddResultFile(string fileName)
         throw new NotImplementedException();
     }
 
-    public override void BeginTimer(string timerName)
+    public override void Write(string? message)
     {
         throw new NotImplementedException();
     }
 
-    public override void EndTimer(string timerName)
+    public override void Write(string format, params object?[] args)
     {
         throw new NotImplementedException();
     }
 
-    public override void Write(string message)
+    public override void WriteLine(string? message)
     {
         throw new NotImplementedException();
     }
 
-    public override void Write(string format, params object[] args)
-    {
-        throw new NotImplementedException();
-    }
-
-    public override void WriteLine(string message)
-    {
-        throw new NotImplementedException();
-    }
-
-    public override void WriteLine(string format, params object[] args)
+    public override void WriteLine(string format, params object?[] args)
     {
         throw new NotImplementedException();
     }

diff --git a/...cFlow.VisualStudio.SpecFlowConnector.V1/SpecFlow.VisualStudio.SpecFlowConnector.V1.csproj b/...cFlow.VisualStudio.SpecFlowConnector.V1/SpecFlow.VisualStudio.SpecFlowConnector.V1.csproj
@@ -13,15 +13,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="3.3.5" />
+    <PackageReference Include="dnlib" Version="4.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SpecFlow.CustomPlugin" Version="3.9.40" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\SpecFlow.VisualStudio.SpecFlowConnector.Models\SpecFlow.VisualStudio.SpecFlowConnector.Models.csproj" />
+    <ProjectReference Include="..\SpecFlow.VisualStudio.SpecFlowConnector.Models\SpecFlow.VisualStudio.SpecFlowConnector.Models.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -31,31 +30,24 @@
 
   <Import Project="..\SpecFlow.VisualStudio.Common\SpecFlow.VisualStudio.Common.projitems" Label="Shared" />
 
-  <Import Project="..\SpecFlow.VisualStudio.SpecFlowConnector\SpecFlow.VisualStudio.SpecFlowConnector.projitems"
-          Label="Shared" />
+  <Import Project="..\SpecFlow.VisualStudio.SpecFlowConnector\SpecFlow.VisualStudio.SpecFlowConnector.projitems" Label="Shared" />
 
   <Target Name="CustomAfterBuild" AfterTargets="Build" Condition="$(configuration)=='Debug'">
     <Message Text="$(OutputPath)" Importance="high" />
 
     <ItemGroup>
-      <_FilesToCopy Include="$(OutputPath)\*"
-                    Exclude="$(OutputPath)\TechTalk.*;$(OutputPath)\System.*;$(OutputPath)\Gherkin.*;$(OutputPath)\*.exe.config" />
+      <_FilesToCopy Include="$(OutputPath)\*" Exclude="$(OutputPath)\TechTalk.*;$(OutputPath)\System.*;$(OutputPath)\Gherkin.*;$(OutputPath)\*.exe.config" />
     </ItemGroup>
     <Message Text="$(configuration) _FilesToCopy: @(_FilesToCopy)" Importance="high" />
 
-    <Message
-      Text="DestFiles:&#xD;&#xA;        @(_FilesToCopy->'$(_OutputCopyLocation)\V1\%(RecursiveDir)%(Filename)%(Extension)')"
-      Importance="high" />
+    <Message Text="DestFiles:&#xD;&#xA;        @(_FilesToCopy->'$(_OutputCopyLocation)\V1\%(RecursiveDir)%(Filename)%(Extension)')" Importance="high" />
 
-    <Message
-      Text="Copying: @(_FilesToCopy)->'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'"
-      Importance="high" />
+    <Message Text="Copying: @(_FilesToCopy)-&gt;'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'" Importance="high" />
 
     <!-- We do not clean the output location before copying, because normal build does not produce
 	     x86 binaries, so we just keep what it is there. For a clean build or to test x86 connector, 
 		 run the Connectors\build.ps1 first. -->
 
-    <Copy SourceFiles="@(_FilesToCopy)"
-          DestinationFiles="$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(_FilesToCopy)" DestinationFiles="$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)" />
   </Target>
 </Project>
diff --git a/...cFlow.VisualStudio.SpecFlowConnector.V2/SpecFlow.VisualStudio.SpecFlowConnector.V2.csproj b/...cFlow.VisualStudio.SpecFlowConnector.V2/SpecFlow.VisualStudio.SpecFlowConnector.V2.csproj
@@ -13,31 +13,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="3.3.5" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.5.0" />
-    <ProjectReference
-      Include="..\SpecFlow.VisualStudio.SpecFlowConnector.Models\SpecFlow.VisualStudio.SpecFlowConnector.Models.csproj" />
+    <PackageReference Include="dnlib" Version="4.4.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
+    <ProjectReference Include="..\SpecFlow.VisualStudio.SpecFlowConnector.Models\SpecFlow.VisualStudio.SpecFlowConnector.Models.csproj" />
     <PackageReference Include="SpecFlow.CustomPlugin" Version="3.9.40" />
   </ItemGroup>
 
   <Import Project="..\SpecFlow.VisualStudio.Common\SpecFlow.VisualStudio.Common.projitems" Label="Shared" />
-  <Import Project="..\SpecFlow.VisualStudio.SpecFlowConnector\SpecFlow.VisualStudio.SpecFlowConnector.projitems"
-          Label="Shared" />
+  <Import Project="..\SpecFlow.VisualStudio.SpecFlowConnector\SpecFlow.VisualStudio.SpecFlowConnector.projitems" Label="Shared" />
 
   <Target Name="CustomAfterBuild" AfterTargets="Build" Condition="$(configuration)=='Debug'">
 
     <ItemGroup>
       <_FilesToCopy Include="$(OutputPath)\*" />
     </ItemGroup>
 
-    <Message
-      Text="Copying: @(_FilesToCopy)->'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'"
-      Importance="high" />
+    <Message Text="Copying: @(_FilesToCopy)-&gt;'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'" Importance="high" />
 
     <RemoveDir Directories="$(_OutputCopyLocation)" />
 
-    <Copy SourceFiles="@(_FilesToCopy)"
-          DestinationFiles="$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(_FilesToCopy)" DestinationFiles="$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)" />
   </Target>
 </Project>
diff --git a/Connectors/SpecFlow.VisualStudio.SpecFlowConnector.V2/TestAssemblyLoadContext.cs b/Connectors/SpecFlow.VisualStudio.SpecFlowConnector.V2/TestAssemblyLoadContext.cs
@@ -1,6 +1,4 @@
 #nullable disable
-using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
-
 namespace SpecFlow.VisualStudio.SpecFlowConnector;
 
 public class TestAssemblyLoadContext : AssemblyLoadContext
@@ -59,7 +57,8 @@ private RuntimeFallbacks GetRuntimeFallbacks()
             ? _dependencyContext.RuntimeGraph
             : DependencyContext.Default.RuntimeGraph;
 
-        var rid = RuntimeEnvironment.GetRuntimeIdentifier();
+        //var rid = RuntimeEnvironment.GetRuntimeIdentifier();
+        var rid = Environment.OSVersion.Platform.ToString();
         var fallbackRid = GetFallbackRid();
         var fallbackGraph = ridGraph.FirstOrDefault(g => g.Runtime == rid)
                             ?? ridGraph.FirstOrDefault(g => g.Runtime == fallbackRid)

diff --git a/...cFlow.VisualStudio.SpecFlowConnector.V3/SpecFlow.VisualStudio.SpecFlowConnector.V3.csproj b/...cFlow.VisualStudio.SpecFlowConnector.V3/SpecFlow.VisualStudio.SpecFlowConnector.V3.csproj
@@ -13,40 +13,33 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\SpecFlow.VisualStudio.SpecFlowConnector.V2\Discovery\DiscoveryProcessor.cs"
-             Link="Discovery\DiscoveryProcessor.cs" />
-    <Compile Include="..\SpecFlow.VisualStudio.SpecFlowConnector.V2\TestAssemblyLoadContext.cs"
-             Link="TestAssemblyLoadContext.cs" />
+    <Compile Include="..\SpecFlow.VisualStudio.SpecFlowConnector.V2\Discovery\DiscoveryProcessor.cs" Link="Discovery\DiscoveryProcessor.cs" />
+    <Compile Include="..\SpecFlow.VisualStudio.SpecFlowConnector.V2\TestAssemblyLoadContext.cs" Link="TestAssemblyLoadContext.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="3.3.5" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.5.0" />
+    <PackageReference Include="dnlib" Version="4.4.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
     <PackageReference Include="SpecFlow.CustomPlugin" Version="3.9.40" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\SpecFlow.VisualStudio.SpecFlowConnector.Models\SpecFlow.VisualStudio.SpecFlowConnector.Models.csproj" />
+    <ProjectReference Include="..\SpecFlow.VisualStudio.SpecFlowConnector.Models\SpecFlow.VisualStudio.SpecFlowConnector.Models.csproj" />
   </ItemGroup>
 
   <Import Project="..\SpecFlow.VisualStudio.Common\SpecFlow.VisualStudio.Common.projitems" Label="Shared" />
-  <Import Project="..\SpecFlow.VisualStudio.SpecFlowConnector\SpecFlow.VisualStudio.SpecFlowConnector.projitems"
-          Label="Shared" />
+  <Import Project="..\SpecFlow.VisualStudio.SpecFlowConnector\SpecFlow.VisualStudio.SpecFlowConnector.projitems" Label="Shared" />
   <Target Name="CustomAfterBuild" AfterTargets="Build" Condition="$(configuration)=='Debug'">
 
     <ItemGroup>
       <_FilesToCopy Include="$(OutputPath)\*" />
     </ItemGroup>
 
-    <Message
-      Text="Copying: @(_FilesToCopy)->'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'"
-      Importance="high" />
+    <Message Text="Copying: @(_FilesToCopy)-&gt;'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'" Importance="high" />
 
     <RemoveDir Directories="$(_OutputCopyLocation)" />
 
-    <Copy SourceFiles="@(_FilesToCopy)"
-          DestinationFiles="$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(_FilesToCopy)" DestinationFiles="$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)" />
   </Target>
 </Project>
diff --git a/Reqnroll.VisualStudio.Package/ImplicitUsings.cs b/Reqnroll.VisualStudio.Package/ImplicitUsings.cs
@@ -34,6 +34,7 @@
 global using System.Collections.Immutable;
 global using System.ComponentModel.Composition;
 global using System.Diagnostics;
+global using System.IO;
 global using System.IO.Abstractions;
 global using System.Reflection;
 global using System.Runtime.CompilerServices;

diff --git a/Reqnroll.VisualStudio.Package/ProjectSystem/VsIdeScopeLoader.cs b/Reqnroll.VisualStudio.Package/ProjectSystem/VsIdeScopeLoader.cs
@@ -105,7 +105,7 @@ private void MonitorLoadProjectSystem()
 
     public bool IsSolutionLoaded => VsIdeScope.IsSolutionLoaded;
 
-    public IProjectScope GetProject(ITextBuffer textBuffer) => VsIdeScope.GetProject(textBuffer);
+    public IProjectScope? GetProject(ITextBuffer textBuffer) => VsIdeScope.GetProject(textBuffer);
 
     public IDeveroomLogger Logger => VsIdeScope.Logger;
     public IMonitoringService MonitoringService => VsIdeScope.MonitoringService;