Skip to content

Commit

Permalink
Revert "Update dependencies (#35)"
Browse files Browse the repository at this point in the history
This reverts commit 41a363e.
  • Loading branch information
gasparnagy committed Sep 18, 2024
1 parent 555fa7e commit ec8d7e7
Show file tree
Hide file tree
Showing 24 changed files with 148 additions and 99 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
</PropertyGroup>

<ItemGroup>
<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" />
<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" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Data.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;

// ReSharper disable once CheckNamespace
namespace Reqnroll.VisualStudio.ReqnrollConnector.Discovery;

internal class FakeTestContext : TestContext
Expand All @@ -15,27 +14,37 @@ 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 Write(string? message)
public override void BeginTimer(string timerName)
{
throw new NotImplementedException();
}

public override void Write(string? format, params object?[] args)
public override void EndTimer(string timerName)
{
throw new NotImplementedException();
}

public override void WriteLine(string? message)
public override void Write(string message)
{
throw new NotImplementedException();
}

public override void WriteLine(string? format, params object?[] args)
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)
{
throw new NotImplementedException();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="dnlib" Version="4.4.0" />
<PackageReference Include="dnlib" Version="3.3.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Reqnroll.CustomPlugin" Version="1.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
</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 @@ -30,24 +31,31 @@

<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)-&gt;'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'" Importance="high" />
<Message
Text="Copying: @(_FilesToCopy)->'$(_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>
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace SpecFlowConnector.AssemblyLoading;
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;

namespace SpecFlowConnector.AssemblyLoading;

public class TestAssemblyLoadContext : AssemblyLoadContext
{
Expand Down Expand Up @@ -43,7 +45,7 @@ private RuntimeFallbacks GetRuntimeFallbacks()
? _dependencyContext.RuntimeGraph
: DependencyContext.Default.RuntimeGraph;

var rid = Environment.OSVersion.Platform.ToString();
var rid = RuntimeEnvironment.GetRuntimeIdentifier();
var fallbackRid = GetFallbackRid();
var fallbackGraph = ridGraph.FirstOrDefault(g => g.Runtime == rid)
?? ridGraph.FirstOrDefault(g => g.Runtime == fallbackRid)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="dnlib" Version="4.4.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
<PackageReference Include="dnlib" Version="3.3.5" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="SpecFlow.CustomPlugin" Version="3.9.40" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<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" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Data.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;

// ReSharper disable once CheckNamespace
namespace SpecFlow.VisualStudio.SpecFlowConnector.Discovery;

internal class FakeTestContext : TestContext
Expand All @@ -20,22 +19,32 @@ public override void AddResultFile(string fileName)
throw new NotImplementedException();
}

public override void Write(string? message)
public override void BeginTimer(string timerName)
{
throw new NotImplementedException();
}

public override void Write(string format, params object?[] args)
public override void EndTimer(string timerName)
{
throw new NotImplementedException();
}

public override void WriteLine(string? message)
public override void Write(string message)
{
throw new NotImplementedException();
}

public override void WriteLine(string format, params object?[] args)
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)
{
throw new NotImplementedException();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="dnlib" Version="4.4.0" />
<PackageReference Include="dnlib" Version="3.3.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SpecFlow.CustomPlugin" Version="3.9.40" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
</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 @@ -30,24 +31,31 @@

<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)-&gt;'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'" Importance="high" />
<Message
Text="Copying: @(_FilesToCopy)->'$(_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>
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,31 @@
</PropertyGroup>

<ItemGroup>
<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="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="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)-&gt;'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'" Importance="high" />
<Message
Text="Copying: @(_FilesToCopy)->'$(_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>
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#nullable disable
using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;

namespace SpecFlow.VisualStudio.SpecFlowConnector;

public class TestAssemblyLoadContext : AssemblyLoadContext
Expand Down Expand Up @@ -57,8 +59,7 @@ private RuntimeFallbacks GetRuntimeFallbacks()
? _dependencyContext.RuntimeGraph
: DependencyContext.Default.RuntimeGraph;

//var rid = RuntimeEnvironment.GetRuntimeIdentifier();
var rid = Environment.OSVersion.Platform.ToString();
var rid = RuntimeEnvironment.GetRuntimeIdentifier();
var fallbackRid = GetFallbackRid();
var fallbackGraph = ridGraph.FirstOrDefault(g => g.Runtime == rid)
?? ridGraph.FirstOrDefault(g => g.Runtime == fallbackRid)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,40 @@
</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="4.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
<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="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)-&gt;'$(_OutputCopyLocation)\%(RecursiveDir)%(Filename)%(Extension)'" Importance="high" />
<Message
Text="Copying: @(_FilesToCopy)->'$(_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: 0 additions & 1 deletion Reqnroll.VisualStudio.Package/ImplicitUsings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
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
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net481</TargetFramework>
<UseWPF>true</UseWPF>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\reqnroll.snk</AssemblyOriginatorKeyFile>
<AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
Expand Down Expand Up @@ -58,7 +57,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="NuGet.CommandLine" Version="6.11.0">
<PackageReference Include="NuGet.CommandLine" Version="6.9.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading

0 comments on commit ec8d7e7

Please sign in to comment.