Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding missing assemblies. #39

Merged
merged 4 commits into from
Sep 18, 2024
Merged

Adding missing assemblies. #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e911758
Adding missing assemblies.
UL-ChrisGlew Sep 18, 2024
434672d
Merge remote-tracking branch 'origin/main' into Maintenance/Fixing-37
UL-ChrisGlew Sep 18, 2024
101c309
Updating Changelog
UL-ChrisGlew Sep 18, 2024
4670375
Reapply "Update dependencies (#35)"
UL-ChrisGlew Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions ...alStudio.ReqnrollConnector.Generic/Reqnroll.VisualStudio.ReqnrollConnector.Generic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 6 additions & 15 deletions Connectors/Reqnroll.VisualStudio.ReqnrollConnector.V1/FakeTestContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
Expand Down
24 changes: 8 additions & 16 deletions ...nroll.VisualStudio.ReqnrollConnector.V1/Reqnroll.VisualStudio.ReqnrollConnector.V1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
6 changes: 2 additions & 4 deletions ...pecFlow.VisualStudio.SpecFlowConnector.Generic/AssemblyLoading/TestAssemblyLoadContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;

namespace SpecFlowConnector.AssemblyLoading;
namespace SpecFlowConnector.AssemblyLoading;

public class TestAssemblyLoadContext : AssemblyLoadContext
{
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 3 additions & 6 deletions ...alStudio.SpecFlowConnector.Generic/SpecFlow.VisualStudio.SpecFlowConnector.Generic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 5 additions & 14 deletions Connectors/SpecFlow.VisualStudio.SpecFlowConnector.V1/FakeTestContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
Expand Down
24 changes: 8 additions & 16 deletions ...cFlow.VisualStudio.SpecFlowConnector.V1/SpecFlow.VisualStudio.SpecFlowConnector.V1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
19 changes: 7 additions & 12 deletions ...cFlow.VisualStudio.SpecFlowConnector.V2/SpecFlow.VisualStudio.SpecFlowConnector.V2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
5 changes: 2 additions & 3 deletions Connectors/SpecFlow.VisualStudio.SpecFlowConnector.V2/TestAssemblyLoadContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#nullable disable
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;

namespace SpecFlow.VisualStudio.SpecFlowConnector;

public class TestAssemblyLoadContext : AssemblyLoadContext
Expand Down Expand Up @@ -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)
Expand Down
25 changes: 9 additions & 16 deletions ...cFlow.VisualStudio.SpecFlowConnector.V3/SpecFlow.VisualStudio.SpecFlowConnector.V3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions Reqnroll.VisualStudio.Package/ImplicitUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Reqnroll.VisualStudio.Package/ProjectSystem/VsIdeScopeLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading