Update most dependencies (#40)

Danielku15 · Oct 31, 2023 · 404d04e · 404d04e
1 parent eff913f
commit 404d04e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 20 deletions.
diff --git a/SigningServer.Android.ApkSig.Tests/SigningServer.Android.ApkSig.Tests.csproj b/SigningServer.Android.ApkSig.Tests/SigningServer.Android.ApkSig.Tests.csproj
@@ -7,10 +7,10 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
-		<PackageReference Include="FluentAssertions" Version="6.11.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\SigningServer.Android.ApkSig\SigningServer.Android.ApkSig.csproj" />

diff --git a/SigningServer.Android.Runtime.Tests/BouncyAndDotNetCompatibilityTestData.cs b/SigningServer.Android.Runtime.Tests/BouncyAndDotNetCompatibilityTestData.cs
@@ -57,7 +57,10 @@ public static void SetUp()
         DotNetRsaPublicKey = DotNetCryptographyProvider.Instance.CreatePublicKey(rsaDotNet);
         DotNetRsaPrivateKey = DotNetCryptographyProvider.Instance.CreatePrivateKey(rsaDotNet.GetPrivateKey());
 
-        var rsaBouncy = new Pkcs12Store(new MemoryStream(rsaCert), Array.Empty<char>());
+        var storeBuilder = new Pkcs12StoreBuilder();
+
+        var rsaBouncy = storeBuilder.Build();
+        rsaBouncy.Load(new MemoryStream(rsaCert), Array.Empty<char>());
         var alias = rsaBouncy.Aliases.OfType<string>().First();
         BouncyRsaCertificate = rsaBouncy.GetCertificate(alias).Certificate;
         BouncyRsaPublicKey =
@@ -71,7 +74,8 @@ public static void SetUp()
         DotNetDsaPublicKey = DotNetCryptographyProvider.Instance.CreatePublicKey(dsaDotNet);
         DotNetDsaPrivateKey = DotNetCryptographyProvider.Instance.CreatePrivateKey(dsaDotNet.GetPrivateKey());
 
-        var dsaBouncy = new Pkcs12Store(new MemoryStream(dsaCert), Array.Empty<char>());
+        var dsaBouncy = storeBuilder.Build();
+        dsaBouncy.Load(new MemoryStream(dsaCert), Array.Empty<char>());
         alias = dsaBouncy.Aliases.OfType<string>().First();
         BouncyDsaCertificate = dsaBouncy.GetCertificate(alias).Certificate;
         BouncyDsaPublicKey =
@@ -85,7 +89,8 @@ public static void SetUp()
         DotNetECDsaPublicKey = DotNetCryptographyProvider.Instance.CreatePublicKey(ecdsaDotNet);
         DotNetECDsaPrivateKey = DotNetCryptographyProvider.Instance.CreatePrivateKey(ecdsaDotNet.GetPrivateKey());
 
-        var ecdsaBouncy = new Pkcs12Store(new MemoryStream(ecdsaCert), Array.Empty<char>());
+        var ecdsaBouncy = storeBuilder.Build();
+        ecdsaBouncy.Load(new MemoryStream(ecdsaCert), Array.Empty<char>());
         alias = ecdsaBouncy.Aliases.OfType<string>().First();
         BouncyECDsaCertificate = ecdsaBouncy.GetCertificate(alias).Certificate;
         BouncyECDsaPublicKey =

diff --git a/SigningServer.Android.Runtime.Tests/SigningServer.Android.Runtime.Tests.csproj b/SigningServer.Android.Runtime.Tests/SigningServer.Android.Runtime.Tests.csproj
@@ -4,11 +4,11 @@
         <Nullable>disable</Nullable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="BouncyCastle.NetCore" Version="1.9.0"/>
-        <PackageReference Include="FluentAssertions" Version="6.11.0"/>
+        <PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\SigningServer.Android.ApkSig\SigningServer.Android.ApkSig.csproj"/>

diff --git a/SigningServer.Client/SigningServer.Client.csproj b/SigningServer.Client/SigningServer.Client.csproj
@@ -18,8 +18,8 @@
 	<ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageReference Include="NLog" Version="5.2.3" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" />
+    <PackageReference Include="NLog" Version="5.2.5" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.5" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\SigningServer.ClientCore\SigningServer.ClientCore.csproj" />

diff --git a/SigningServer.Server/SigningServer.Server.csproj b/SigningServer.Server/SigningServer.Server.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 	<ItemGroup>
     <PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="7.0.13" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
-		<PackageReference Include="NLog" Version="5.2.3" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" />
+		<PackageReference Include="NLog" Version="5.2.5" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.5" />
 		<PackageReference Include="SharpZipLib" Version="1.4.2" />
 	</ItemGroup>
 	<ItemGroup>

diff --git a/SigningServer.Signing/SigningServer.Signing.csproj b/SigningServer.Signing/SigningServer.Signing.csproj
@@ -3,7 +3,7 @@
     <InternalsVisibleTo Include="SigningServer.Tests" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.9.0" />
+    <PackageReference Include="Azure.Identity" Version="1.10.3" />
     <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.5.1" />
     <PackageReference Include="RSAKeyVaultProvider" Version="2.1.1" />
   </ItemGroup>

diff --git a/SigningServer.StandaloneClient/SigningServer.StandaloneClient.csproj b/SigningServer.StandaloneClient/SigningServer.StandaloneClient.csproj
@@ -18,8 +18,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageReference Include="NLog" Version="5.2.3" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" />
+    <PackageReference Include="NLog" Version="5.2.5" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SigningServer.ClientCore\SigningServer.ClientCore.csproj" />

diff --git a/SigningServer.Tests/SigningServer.Tests.csproj b/SigningServer.Tests/SigningServer.Tests.csproj
@@ -11,11 +11,11 @@
 	</ItemGroup>
 	<ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.13" />
     <PackageReference Include="Moq" Version="4.20.69" />
-		<PackageReference Include="NLog" Version="5.2.3" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-		<PackageReference Include="FluentAssertions" Version="6.11.0" />
+		<PackageReference Include="NLog" Version="5.2.5" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="NUnit" Version="3.13.3" />
 		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
 		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />