cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-09-11 15:26:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix network tests running on mac

Browse Source 
Tests are still broken due to grpc native dep
This commit is contained in:
Ben Olden-Cooligan 2022-08-04 18:05:33 -07:00
parent 2d1f1c532c
commit 586c452904
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NAPS2.Sdk.Network.Tests/NAPS2.Sdk.Network.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5;net462</TargetFrameworks>
<TargetFrameworks>net6;net462</TargetFrameworks>
<RootNamespace>NAPS2.Remoting.Network.Tests</RootNamespace>
</PropertyGroup>
@ -11,8 +11,9 @@
<ItemGroup>
<ProjectReference Include="..\NAPS2.Sdk.Network\NAPS2.Sdk.Network.csproj" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<ProjectReference Include="..\NAPS2.Sdk.Tests\NAPS2.Sdk.Tests.csproj" />
</ItemGroup>
</Project>

3
NAPS2.Sdk.Network.Tests/ServerDiscoveryTests.cs
View File

@ -1,5 +1,6 @@
using NAPS2.Images.Gdi;
using NAPS2.Scan;
using NAPS2.Sdk.Tests;
using Xunit;
namespace NAPS2.Remoting.Network.Tests;
@ -75,7 +76,7 @@ public class ServerDiscoveryTests
private NetworkScanServer CreateServer(NetworkScanServerOptions options)
{
var scanningContext = new ScanningContext(new GdiImageContext());
var scanningContext = new ScanningContext(TestImageContextFactory.Get());
return new NetworkScanServer(scanningContext, options);
}
}

4
NAPS2.Sdk.Network/NAPS2.Sdk.Network.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5;net462</TargetFrameworks>
<TargetFrameworks>net6;net462</TargetFrameworks>
<Nullable>enable</Nullable>
<RootNamespace>NAPS2.Remoting.Network</RootNamespace>
@ -18,7 +18,7 @@
<PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
<PackageReference Include="Grpc.Core" Version="2.26.0" />
<PackageReference Include="Grpc.Tools" Version="2.26.0" />
<PackageReference Include="Grpc.Tools" Version="2.47.0" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>