Fix warnings

cyanfish · Sep 5, 2024 · 21d5db8 · 21d5db8
1 parent fb5a0c9
commit 21d5db8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/NAPS2.Escl/NAPS2.Escl.csproj b/NAPS2.Escl/NAPS2.Escl.csproj
@@ -21,6 +21,7 @@
          <PackageReference Include="Polyfill" Version="4.9.0" PrivateAssets="all" />
         <PackageReference Include="StandardSocketsHttpHandler" Version="2.2.0.8" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
+        <PackageReference Include="System.Private.Uri" Version="4.3.2" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     </ItemGroup>
 

diff --git a/NAPS2.Sdk.Tests/Remoting/FallbackScanServerTests.cs b/NAPS2.Sdk.Tests/Remoting/FallbackScanServerTests.cs
@@ -10,7 +10,7 @@
 namespace NAPS2.Sdk.Tests.Remoting;
 
 public class FallbackScanServerTests(ITestOutputHelper testOutputHelper) : ScanServerTestsBase(testOutputHelper,
-    EsclSecurityPolicy.None, new X509Certificate2(BinaryResources.testcert))
+    EsclSecurityPolicy.None, X509CertificateLoader.LoadPkcs12(BinaryResources.testcert, null))
 {
     [Fact(Timeout = TIMEOUT)]
     public async Task ScanFallbackFromHttpsToHttp()

diff --git a/NAPS2.Sdk.Tests/Remoting/ManualIpScanServerTests.cs b/NAPS2.Sdk.Tests/Remoting/ManualIpScanServerTests.cs
@@ -7,8 +7,8 @@
 
 namespace NAPS2.Sdk.Tests.Remoting;
 
-public class ManualIpScanServerTests(ITestOutputHelper testOutputHelper)
-    : ScanServerTestsBase(testOutputHelper, EsclSecurityPolicy.None, new X509Certificate2(BinaryResources.testcert))
+public class ManualIpScanServerTests(ITestOutputHelper testOutputHelper) : ScanServerTestsBase(testOutputHelper,
+    EsclSecurityPolicy.None, X509CertificateLoader.LoadPkcs12(BinaryResources.testcert, null))
 {
     [Fact(Timeout = TIMEOUT)]
     public async Task ScanHttpIpv4()

diff --git a/NAPS2.Sdk.Tests/Remoting/TlsScanServerTests.cs b/NAPS2.Sdk.Tests/Remoting/TlsScanServerTests.cs
@@ -10,7 +10,7 @@
 namespace NAPS2.Sdk.Tests.Remoting;
 
 public class TlsScanServerTests(ITestOutputHelper testOutputHelper) : ScanServerTestsBase(testOutputHelper,
-    EsclSecurityPolicy.RequireHttps, new X509Certificate2(BinaryResources.testcert))
+    EsclSecurityPolicy.RequireHttps, X509CertificateLoader.LoadPkcs12(BinaryResources.testcert, null))
 {
     [Fact(Timeout = TIMEOUT)]
     public async Task FindDevice()