From 2a981a62a8f7ea28d6cf35ab8c7cfdb2875c1ff5 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Tue, 4 Feb 2025 17:54:53 -0300 Subject: [PATCH] Replace System.Security.Cryptography.Cng version 4.7.0 with 5.0.0 for compatibility with dependencies introduced in PR #1100 (cherry picked from commit fb2826430a08d639436ee6e4161b556eb1395b0b) # Conflicts: # dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj --- .../SecurityAPICommonsNetCore.csproj | 54 +++++++++---------- .../src/DotNet/GamUtilsNet/GamUtilsNet.csproj | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj index 9e90c8b5f..ef5ccd937 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj @@ -10,39 +10,39 @@ NETCORE - + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - + + + diff --git a/dotnet/src/extensions/gam/src/DotNet/GamUtilsNet/GamUtilsNet.csproj b/dotnet/src/extensions/gam/src/DotNet/GamUtilsNet/GamUtilsNet.csproj index 60ca9249c..0447be684 100644 --- a/dotnet/src/extensions/gam/src/DotNet/GamUtilsNet/GamUtilsNet.csproj +++ b/dotnet/src/extensions/gam/src/DotNet/GamUtilsNet/GamUtilsNet.csproj @@ -31,7 +31,7 @@ - +