From 9af623937e4168e1dd73ff31137ee4ca88d5d035 Mon Sep 17 00:00:00 2001 From: "ARTECH\\sgrampone" Date: Tue, 3 Aug 2021 14:40:57 -0300 Subject: [PATCH 1/2] Upgrade to Net 5.0 and update to 17.5.0 --- .../GeneXusCryptographyNetCore.csproj | 9 +++++---- .../GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj | 9 +++++---- .../GeneXusJWTNetCore/GeneXusJWTNetCore.csproj | 9 +++++---- .../GeneXusSftpNetCore/GeneXusSftpNetCore.csproj | 9 +++++---- .../GeneXusXmlSignatureNetCore.csproj | 9 +++++---- .../SecurityAPICommonsNetCore.csproj | 9 +++++---- .../GeneXusCryptography/GeneXusCryptography.csproj | 1 + dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj | 1 + dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj | 1 + dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj | 1 + .../GeneXusXmlSignature/GeneXusXmlSignature.csproj | 1 + .../SecurityAPICommons/SecurityAPICommons.csproj | 1 + .../SecurityAPITest/SecurityAPITest.csproj | 1 + 13 files changed, 37 insertions(+), 24 deletions(-) diff --git a/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj b/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj index ccdf0ed..0bce03e 100644 --- a/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj +++ b/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj @@ -1,17 +1,18 @@  - netcoreapp3.1 + net5.0 GeneXusCryptographyNetCoreImpl - 17.4.0 + 17.5.0 - + + + NETCORE - diff --git a/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj b/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj index ab652ed..9a1bd7b 100644 --- a/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj +++ b/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj @@ -1,17 +1,18 @@  - netcoreapp3.1 + net5.0 GeneXusFtpsNetCoreImpl - 17.4.0 + 17.5.0 - + + + NETCORE - diff --git a/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj b/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj index d9291f0..2f19448 100644 --- a/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj +++ b/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj @@ -1,17 +1,18 @@  - netcoreapp3.1 + net5.0 GeneXusJWTNetCoreImpl - 17.4.0 + 17.5.0 - + + + NETCORE - diff --git a/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj b/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj index 0d60228..dcbce5f 100644 --- a/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj +++ b/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj @@ -1,17 +1,18 @@  - netcoreapp3.1 + net5.0 GeneXusSftpNetCoreImpl - 17.4.0 + 17.5.0 - + + + NETCORE - diff --git a/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj b/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj index e57e769..edd0042 100644 --- a/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj +++ b/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj @@ -1,17 +1,18 @@  - netcoreapp3.1 + net5.0 GeneXusXMLSignatureNetCoreImpl - 17.4.0 + 17.5.0 - + + + NETCORE - diff --git a/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj b/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj index baec015..1c5b313 100644 --- a/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj +++ b/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj @@ -1,17 +1,18 @@  - netcoreapp3.1 + net5.0 GeneXusSecurityAPICommonsNetCoreImpl - 17.4.0 + 17.5.0 - + + + NETCORE - diff --git a/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj b/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj index 4ce9692..3b061fc 100644 --- a/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj +++ b/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj @@ -3,6 +3,7 @@ net47 GeneXusCryptography GeneXusCryptographyImpl + 17.5.0 diff --git a/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj b/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj index 0d0566c..75a8fed 100644 --- a/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj +++ b/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj @@ -3,6 +3,7 @@ net47 GeneXusFtps GeneXusFtpsImpl + 17.5.0 diff --git a/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj b/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj index bc74cb7..1fadac5 100644 --- a/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj +++ b/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj @@ -3,6 +3,7 @@ net47 GeneXusJWT GeneXusJWTImpl + 17.5.0 App.$(Configuration).config diff --git a/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj b/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj index 72e67d6..71fac7e 100644 --- a/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj +++ b/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj @@ -3,6 +3,7 @@ net47 GeneXusSftp GeneXusSftpClientImpl + 17.5.0 diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj b/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj index 5fa3488..bb9e2a7 100644 --- a/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj +++ b/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj @@ -3,6 +3,7 @@ net47 GeneXusXmlSignature GeneXusXmlSignatureImpl + 17.5.0 diff --git a/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj b/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj index 66f667a..39fdc2c 100644 --- a/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj +++ b/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj @@ -2,6 +2,7 @@ net47 GeneXusSecurityAPICommonsImpl + 17.5.0 diff --git a/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj b/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj index afd969f..393dc0a 100644 --- a/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj +++ b/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj @@ -5,6 +5,7 @@ false SecurityAPITest SecurityAPITest + 17.5.0 From 7619eb326c9c8e298ba13280d5153536140ce7fc Mon Sep 17 00:00:00 2001 From: "ARTECH\\sgrampone" Date: Tue, 3 Aug 2021 15:11:34 -0300 Subject: [PATCH 2/2] Fix dll signature --- SecurityAPIParent.sln | 7 +++++++ .../GeneXusCryptography/GeneXusCryptography.csproj | 11 +++++++++++ .../dotnetframework/GeneXusFtps/GeneXusFtps.csproj | 11 +++++++++++ dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj | 11 +++++++++++ .../dotnetframework/GeneXusSftp/GeneXusSftp.csproj | 11 +++++++++++ .../GeneXusXmlSignature/GeneXusXmlSignature.csproj | 11 +++++++++++ .../SecurityAPICommons/SecurityAPICommons.csproj | 12 +++++++++++- .../SecurityAPITest/SecurityAPITest.csproj | 12 +++++++++++- 8 files changed, 84 insertions(+), 2 deletions(-) diff --git a/SecurityAPIParent.sln b/SecurityAPIParent.sln index a75bb54..6753066 100644 --- a/SecurityAPIParent.sln +++ b/SecurityAPIParent.sln @@ -43,11 +43,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityAPITest", "test\dot EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{88EB1BC4-0D68-4906-AA36-E1EA1F6AFD35}" ProjectSection(SolutionItems) = preProject + dotnet\resources\key.snk = dotnet\resources\key.snk dotnet\resources\Neon.SSH.NET.dll = dotnet\resources\Neon.SSH.NET.dll EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityAPITestNetCore", "test\dotnetcore\SecurityAPITestNetCore\SecurityAPITestNetCore.csproj", "{27D2471A-DA98-4912-A327-AF135550B034}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{7AF6A951-975C-429A-B319-656F473D833A}" + ProjectSection(SolutionItems) = preProject + test\resources\key.snk = test\resources\key.snk + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -134,6 +140,7 @@ Global {9100025A-68E0-4618-B83C-4D626CB89DBB} = {7F5F1DDC-09BE-4567-8CD4-41387AD91BEE} {88EB1BC4-0D68-4906-AA36-E1EA1F6AFD35} = {5CB1725B-3FA5-49B1-A1F8-41EFCACA3CF1} {27D2471A-DA98-4912-A327-AF135550B034} = {89FFECB3-7A69-41F8-88C7-F05193E5CDF4} + {7AF6A951-975C-429A-B319-656F473D833A} = {750343D3-EAA6-433E-A099-71BC6851EA71} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AEB1693D-906F-402A-AD66-A1A9AE2ABBE2} diff --git a/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj b/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj index 3b061fc..fa4c552 100644 --- a/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj +++ b/dotnet/dotnetframework/GeneXusCryptography/GeneXusCryptography.csproj @@ -5,10 +5,21 @@ GeneXusCryptographyImpl 17.5.0 + + true + + + ..\..\resources\key.snk + + + + key.snk + + \ No newline at end of file diff --git a/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj b/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj index 75a8fed..10919e3 100644 --- a/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj +++ b/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps.csproj @@ -5,10 +5,21 @@ GeneXusFtpsImpl 17.5.0 + + true + + + ..\..\resources\key.snk + + + + key.snk + + \ No newline at end of file diff --git a/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj b/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj index 1fadac5..f2f3e49 100644 --- a/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj +++ b/dotnet/dotnetframework/GeneXusJWT/GeneXusJWT.csproj @@ -8,6 +8,12 @@ App.$(Configuration).config + + true + + + ..\..\resources\key.snk + @@ -26,4 +32,9 @@ + + + key.snk + + \ No newline at end of file diff --git a/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj b/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj index 71fac7e..0625f80 100644 --- a/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj +++ b/dotnet/dotnetframework/GeneXusSftp/GeneXusSftp.csproj @@ -5,6 +5,12 @@ GeneXusSftpClientImpl 17.5.0 + + true + + + ..\..\resources\key.snk + ..\..\resources\Neon.SSH.NET.dll @@ -13,4 +19,9 @@ + + + key.snk + + \ No newline at end of file diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj b/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj index bb9e2a7..0364470 100644 --- a/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj +++ b/dotnet/dotnetframework/GeneXusXmlSignature/GeneXusXmlSignature.csproj @@ -5,6 +5,12 @@ GeneXusXmlSignatureImpl 17.5.0 + + true + + + ..\..\resources\key.snk + @@ -13,4 +19,9 @@ + + + key.snk + + \ No newline at end of file diff --git a/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj b/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj index 39fdc2c..6b17aa6 100644 --- a/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj +++ b/dotnet/dotnetframework/SecurityAPICommons/SecurityAPICommons.csproj @@ -4,11 +4,21 @@ GeneXusSecurityAPICommonsImpl 17.5.0 - + + true + + + ..\..\resources\key.snk + + + + key.snk + + \ No newline at end of file diff --git a/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj b/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj index 393dc0a..2fc206e 100644 --- a/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj +++ b/test/dotnetframework/SecurityAPITest/SecurityAPITest.csproj @@ -7,6 +7,12 @@ SecurityAPITest 17.5.0 + + true + + + ..\..\resources\key.snk + @@ -408,5 +414,9 @@ - + + + key.snk + + \ No newline at end of file