From 2845033c7f1c4e3f48899861330d3015faaf786f Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Mon, 29 May 2023 16:01:31 -0300 Subject: [PATCH 01/29] Build for TargetFramework 7.0 --- .../DynService.Core/DynService.Core.csproj | 2 +- .../DynService.Dynamo/DynService.DynamoDB.csproj | 2 +- .../GxCryptography/EncryptionProvider.cs | 4 +++- .../GxCryptography/GxCryptography.csproj | 4 ++-- .../GxCryptographyCommon.csproj | 2 +- dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj | 2 +- .../DynService/Cosmos/DynService.CosmosDB.csproj | 2 +- .../DynService/OData/DynServiceOData.csproj | 2 +- .../dotnetcore/GxClasses.Web/GxClasses.Web.csproj | 2 +- dotnet/src/dotnetcore/GxClasses/GxClasses.csproj | 2 +- .../GXDataInitialization.csproj | 2 +- dotnet/src/dotnetcore/GxExcel/GxExcel.csproj | 2 +- dotnet/src/dotnetcore/GxMail/GxMail.csproj | 2 +- dotnet/src/dotnetcore/GxMaps/GxMaps.csproj | 2 +- .../GxNetCoreStartup/GxNetCoreStartup.csproj | 2 +- .../GxPdfReportsCS/GxPdfReportsCS.csproj | 2 +- dotnet/src/dotnetcore/GxSearch/GxSearch.csproj | 2 +- dotnet/src/dotnetcore/GxXsl/GxXsl.csproj | 2 +- .../Projects/StoreManager/StoreManager.csproj | 2 +- .../Providers/Cache/GxMemcached/GxMemcached.csproj | 2 +- .../Providers/Cache/GxRedis/GxRedis.csproj | 2 +- .../Messaging/GXAmazonSQS/GXAmazonSQS.csproj | 2 +- .../Messaging/GXAzureQueue/GXAzureQueue.csproj | 2 +- .../GXAzureServiceBus/GXAzureServiceBus.csproj | 2 +- .../GXMessageBroker/GXMessageBroker.csproj | 2 +- .../Providers/Messaging/GXQueue/GXQueue.csproj | 2 +- .../OpenTelemetry/GeneXus.OpenTelemetry.csproj | 14 +++++++------- .../GeneXus.OpenTelemetry.AWS.AspNet.csproj | 2 +- .../GeneXus.OpenTelemetry.Lightstep.AspNet.csproj | 2 +- .../Providers/Storage/GXAmazonS3/GXAmazonS3.csproj | 2 +- .../Storage/GXAzureStorage/GXAzureStorage.csproj | 2 +- .../Storage/GXGoogleCloud/GXGoogleCloud.csproj | 2 +- dotnet/src/dotnetcore/Reor/Reor.csproj | 2 +- .../GxClasses/Core/GXUtilsCommon.cs | 2 ++ .../Cryptography/Hashing/HashAlgorithmProvider.cs | 2 ++ .../Hashing/HashedKeyAlgorithmProvider.cs | 3 +++ .../Signing/Standards/PKCS1Signature.cs | 9 +++++++-- .../GeneXus.Deploy.AzureFunctions.Handlers.csproj | 2 +- .../AzureFunctionsTest/AzureFunctionsTest.csproj | 2 +- .../GeneXus.Programs.Common.csproj | 2 +- .../test/amyprocedurehandler/amyprochandler.csproj | 2 +- .../test/apiattractions/apiattractions.csproj | 2 +- .../GeneXusCryptographyNetCore.csproj | 2 +- .../GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj | 2 +- .../GeneXusJWTNetCore/GeneXusJWTNetCore.csproj | 2 +- .../GeneXusSftpNetCore/GeneXusSftpNetCore.csproj | 2 +- .../GeneXusXmlSignatureNetCore.csproj | 2 +- .../SecurityAPICommonsNetCore.csproj | 2 +- .../GeneXusFtps/GeneXusFtps/FtpsClient.cs | 2 ++ .../SecurityAPITestNetCore.csproj | 2 +- .../commons/SecurityAPITestObject.cs | 2 ++ .../test/TestMockDBAccess/TestMockDBAccess.csproj | 2 +- .../DotNetCoreUnitTest/DotNetCoreUnitTest.csproj | 2 +- .../DotNetCoreWebUnitTest.csproj | 2 +- dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj | 2 +- .../ProjectHealthTest/ProjectHealthTest.csproj | 8 ++++---- 56 files changed, 80 insertions(+), 62 deletions(-) diff --git a/dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj b/dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj index 6d8118577..3f228fc6e 100644 --- a/dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj +++ b/dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj @@ -1,6 +1,6 @@ - net462;net6.0 + net462;net6.0;net7.0 GeneXus.Data.NTier GeneXus.Data.DynService.Core CA1812 diff --git a/dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj b/dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj index 0cbb8aec8..c4e6ebf9a 100644 --- a/dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj +++ b/dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj @@ -1,6 +1,6 @@ - net462;net6.0 + net462;net6.0;net7.0 GeneXus.Data.NTier GeneXus.Data.DynService.DynamoDB false diff --git a/dotnet/src/dotnetcommon/GxCryptography/EncryptionProvider.cs b/dotnet/src/dotnetcommon/GxCryptography/EncryptionProvider.cs index c17a4064e..549cd8bcd 100644 --- a/dotnet/src/dotnetcommon/GxCryptography/EncryptionProvider.cs +++ b/dotnet/src/dotnetcommon/GxCryptography/EncryptionProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography; using System.IO; @@ -58,7 +58,9 @@ public NativeSymmetricEncryption(string algorithm, int keySize) _symAlg = Aes.Create(); break; default: +#pragma warning disable SYSLIB0045 // Type or member is obsolete _symAlg = SymmetricAlgorithm.Create(algorithm); +#pragma warning restore SYSLIB0045 // Type or member is obsolete break; } if (_symAlg != null) diff --git a/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj b/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj index b5ffc6cc1..3a82a2cc5 100644 --- a/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj +++ b/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj @@ -1,8 +1,8 @@ - net462;net6.0 + net462;net6.0;net7.0 GxCryptography - 618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023 + 618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023;SYSLIB0022 GxCryptography Data Access GeneXus.Cryptography diff --git a/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj b/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj index 4b040e8f1..c0cba2322 100644 --- a/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj +++ b/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj @@ -1,6 +1,6 @@ - net462;net6.0 + net462;net6.0;net7.0 GxCryptographyCommon 618;1607;1698 GxCryptographyCommon diff --git a/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj b/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj index a46827308..ef20404dd 100644 --- a/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj +++ b/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj @@ -1,6 +1,6 @@ - net462;net6.0 + net462;net6.0;net7.0 GeneXus.Encryption GxEncrypt Encrypt64 Decrypt64 diff --git a/dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj b/dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj index 120fad8f9..e26a4ced0 100644 --- a/dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj +++ b/dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 GeneXus.Data.NTier GeneXus.Data.DynService.CosmosDB false diff --git a/dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj b/dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj index 6626d65c7..50f2d9c1c 100644 --- a/dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj +++ b/dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 NETCORE DynService OData GeneXus.DynService.OData.Core diff --git a/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj b/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj index 1ea6ee0cf..6597bab10 100644 --- a/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj +++ b/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 NETCORE; GXGeolocation GXHttpServices WebSocket GeneXus.Classes.Web.Core diff --git a/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj b/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj index 139e9264e..489fc01d5 100644 --- a/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj +++ b/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 Library NETCORE;NODATIME Data Access diff --git a/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj b/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj index 7c41acaec..63e17c92f 100644 --- a/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj +++ b/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 Exe DataInitialization GeneXus.DataInitialization.Core diff --git a/dotnet/src/dotnetcore/GxExcel/GxExcel.csproj b/dotnet/src/dotnetcore/GxExcel/GxExcel.csproj index 15df73743..3ded22be6 100644 --- a/dotnet/src/dotnetcore/GxExcel/GxExcel.csproj +++ b/dotnet/src/dotnetcore/GxExcel/GxExcel.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 NETCORE GxExcelI EPPlus Lite diff --git a/dotnet/src/dotnetcore/GxMail/GxMail.csproj b/dotnet/src/dotnetcore/GxMail/GxMail.csproj index 0b7d837ce..0bbc8952c 100644 --- a/dotnet/src/dotnetcore/GxMail/GxMail.csproj +++ b/dotnet/src/dotnetcore/GxMail/GxMail.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 1701;1702;NU1701 NETCORE SMTP Exchange POP3 diff --git a/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj b/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj index 128f906e0..2bf5dfb11 100644 --- a/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj +++ b/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 1701;1702;NU1701 NETCORE Maps diff --git a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj index 7f52c1879..1087adeac 100644 --- a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj +++ b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 GxNetCoreStartup GeneXus.NetCoreStartup true diff --git a/dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj b/dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj index 6f996b82c..479bb07a2 100644 --- a/dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj +++ b/dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 1701;1702;NU1701 NETCORE Itext PDF Report diff --git a/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj b/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj index 826d61a8b..2356c7702 100644 --- a/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj +++ b/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 1701;1702;NU1701;NU1603;CS0618 NETCORE Lucene Search diff --git a/dotnet/src/dotnetcore/GxXsl/GxXsl.csproj b/dotnet/src/dotnetcore/GxXsl/GxXsl.csproj index ece24ed17..5b966714f 100644 --- a/dotnet/src/dotnetcore/GxXsl/GxXsl.csproj +++ b/dotnet/src/dotnetcore/GxXsl/GxXsl.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 GxXsl GxXsl XML xsl apply diff --git a/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj b/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj index fba3e8425..84ec8be3a 100644 --- a/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj +++ b/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0;net7.0 GeneXus.SD.Store.StoreManager GeneXus.SD.Store StoreManager diff --git a/dotnet/src/dotnetcore/Providers/Cache/GxMemcached/GxMemcached.csproj b/dotnet/src/dotnetcore/Providers/Cache/GxMemcached/GxMemcached.csproj index 46337bb8a..748296768 100644 --- a/dotnet/src/dotnetcore/Providers/Cache/GxMemcached/GxMemcached.csproj +++ b/dotnet/src/dotnetcore/Providers/Cache/GxMemcached/GxMemcached.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 Memcached GeneXus.Memcached.Core NETCORE diff --git a/dotnet/src/dotnetcore/Providers/Cache/GxRedis/GxRedis.csproj b/dotnet/src/dotnetcore/Providers/Cache/GxRedis/GxRedis.csproj index d83ab1b7f..d5a93fe0d 100644 --- a/dotnet/src/dotnetcore/Providers/Cache/GxRedis/GxRedis.csproj +++ b/dotnet/src/dotnetcore/Providers/Cache/GxRedis/GxRedis.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 Redis GeneXus.Redis.Core diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/GXAmazonSQS.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/GXAmazonSQS.csproj index 53ad7604c..ef77ac699 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/GXAmazonSQS.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/GXAmazonSQS.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXus.AWS.Queue AWS SQS Queue Messaging diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureQueue/GXAzureQueue.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureQueue/GXAzureQueue.csproj index a9fc132d3..f701dc1b0 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureQueue/GXAzureQueue.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureQueue/GXAzureQueue.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXus.Azure.Queue Azure Queue Messaging diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureServiceBus/GXAzureServiceBus.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureServiceBus/GXAzureServiceBus.csproj index ac8137a4a..6ed2e49f7 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureServiceBus/GXAzureServiceBus.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureServiceBus/GXAzureServiceBus.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXus.Azure.ServiceBus Azure ServiceBus Messaging diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/GXMessageBroker.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/GXMessageBroker.csproj index a1fc0121d..f6ce91709 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/GXMessageBroker.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/GXMessageBroker.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXus.Message.MessageBroker Broker Messaging TRACE;DEBUG;NETCORE diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXQueue/GXQueue.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXQueue/GXQueue.csproj index b41e066ac..84f5d851e 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXQueue/GXQueue.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXQueue/GXQueue.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 TRACE;DEBUG;NETCORE GeneXus.Message.Queue diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj index fba026b94..9f7f8c06d 100644 --- a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj +++ b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0;net7.0 enable enable GeneXus.OpenTelemetry @@ -10,14 +10,14 @@ - - - + + + - - - + + + diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj index 094dfbd46..d25bfdd65 100644 --- a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj +++ b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0;net7.0 NETCORE; Properties false diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj index 7d62fab6e..c139de5b6 100644 --- a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj +++ b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0;net7.0 NETCORE; Properties false diff --git a/dotnet/src/dotnetcore/Providers/Storage/GXAmazonS3/GXAmazonS3.csproj b/dotnet/src/dotnetcore/Providers/Storage/GXAmazonS3/GXAmazonS3.csproj index 2f83482a0..0bc807c85 100644 --- a/dotnet/src/dotnetcore/Providers/Storage/GXAmazonS3/GXAmazonS3.csproj +++ b/dotnet/src/dotnetcore/Providers/Storage/GXAmazonS3/GXAmazonS3.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 TRACE;DEBUG;NETCORE Properties false diff --git a/dotnet/src/dotnetcore/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj b/dotnet/src/dotnetcore/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj index 2e414d14e..86faaae84 100644 --- a/dotnet/src/dotnetcore/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj +++ b/dotnet/src/dotnetcore/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 TRACE;DEBUG;NETCORE Properties false diff --git a/dotnet/src/dotnetcore/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj b/dotnet/src/dotnetcore/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj index f036cd022..c58d6e014 100644 --- a/dotnet/src/dotnetcore/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj +++ b/dotnet/src/dotnetcore/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 TRACE;DEBUG;NETCORE Properties false diff --git a/dotnet/src/dotnetcore/Reor/Reor.csproj b/dotnet/src/dotnetcore/Reor/Reor.csproj index f02fc7005..cddceacb8 100644 --- a/dotnet/src/dotnetcore/Reor/Reor.csproj +++ b/dotnet/src/dotnetcore/Reor/Reor.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 Exe Reorg GeneXus.Reorganization.Core diff --git a/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs b/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs index a9f4944a3..d55194740 100644 --- a/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs +++ b/dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs @@ -3585,7 +3585,9 @@ public static string GetBasePath() #endif public static string GetStartupDirectory() { +#pragma warning disable SYSLIB0044 string dir = Assembly.GetCallingAssembly().GetName().CodeBase; +#pragma warning restore SYSLIB0012 Uri uri = new Uri(dir); return Path.GetDirectoryName(uri.LocalPath); } diff --git a/dotnet/src/dotnetframework/GxClasses/Cryptography/Hashing/HashAlgorithmProvider.cs b/dotnet/src/dotnetframework/GxClasses/Cryptography/Hashing/HashAlgorithmProvider.cs index b7b999077..5bb9a6247 100644 --- a/dotnet/src/dotnetframework/GxClasses/Cryptography/Hashing/HashAlgorithmProvider.cs +++ b/dotnet/src/dotnetframework/GxClasses/Cryptography/Hashing/HashAlgorithmProvider.cs @@ -42,7 +42,9 @@ public HashAlgorithmProvider(string algorithm) _hash = new SHA512CryptoServiceProvider(); break; default: +#pragma warning disable SYSLIB0045 // Type or member is obsolete _hash = HashAlgorithm.Create(algorithm); +#pragma warning restore SYSLIB0045 // Type or member is obsolete break; } diff --git a/dotnet/src/dotnetframework/GxClasses/Cryptography/Hashing/HashedKeyAlgorithmProvider.cs b/dotnet/src/dotnetframework/GxClasses/Cryptography/Hashing/HashedKeyAlgorithmProvider.cs index f9b8e916b..1449f4953 100644 --- a/dotnet/src/dotnetframework/GxClasses/Cryptography/Hashing/HashedKeyAlgorithmProvider.cs +++ b/dotnet/src/dotnetframework/GxClasses/Cryptography/Hashing/HashedKeyAlgorithmProvider.cs @@ -14,7 +14,10 @@ public HashedKeyAlgorithmProvider(string algorithm) { if (GXUtil.IsWindowsPlatform) { +#pragma warning disable SYSLIB0045 // Type or member is obsolete _keyedHash = KeyedHashAlgorithm.Create(algorithm); +#pragma warning restore SYSLIB0045 // Type or member is obsolete + } if (_keyedHash == null) { diff --git a/dotnet/src/dotnetframework/GxClasses/Cryptography/Signing/Standards/PKCS1Signature.cs b/dotnet/src/dotnetframework/GxClasses/Cryptography/Signing/Standards/PKCS1Signature.cs index 23b4c6629..e4bb4e65c 100644 --- a/dotnet/src/dotnetframework/GxClasses/Cryptography/Signing/Standards/PKCS1Signature.cs +++ b/dotnet/src/dotnetframework/GxClasses/Cryptography/Signing/Standards/PKCS1Signature.cs @@ -77,7 +77,9 @@ private string SignRSA(string signed, byte[] data) throw new AlgorithmNotSupportedException("Private Key does not support RSA Sign Algorithm"); } +#pragma warning disable SYSLIB0045 // Type or member is obsolete HashAlgorithm ha = HashAlgorithm.Create(_hashAlgorithm); +#pragma warning restore SYSLIB0045 // Type or member is obsolete byte[] signature = null; try { @@ -118,8 +120,9 @@ private string SignDSA(string signed, string oid, byte[] data) throw new AlgorithmNotSupportedException("Private Key does not support DSA Sign Algorithm"); } - +#pragma warning disable SYSLIB0045 // Type or member is obsolete HashAlgorithm ha = System.Security.Cryptography.HashAlgorithm.Create(_hashAlgorithm); +#pragma warning restore SYSLIB0045 // Type or member is obsolete byte[] hash = ha.ComputeHash(data); byte[] signature = dsa.SignHash(hash, oid); @@ -134,8 +137,10 @@ public bool Verify(string signatureB64, string text) { try { +#pragma warning disable SYSLIB0045 // Type or member is obsolete HashAlgorithm ha = GXUtil.IsWindowsPlatform ? HashAlgorithm.Create(_hashAlgorithm) : null; - string oid = CryptoConfig.MapNameToOID(_hashAlgorithm); +#pragma warning restore SYSLIB0045 // Type or member is obsolete + string oid = CryptoConfig.MapNameToOID(_hashAlgorithm); if (ha != null && !string.IsNullOrEmpty(oid)) { byte[] textData = Constants.DEFAULT_ENCODING.GetBytes(text); diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj index e1e5c4df7..43c043530 100644 --- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj +++ b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 Exe v4 false diff --git a/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj b/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj index f3d9485b2..636f5cc94 100644 --- a/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj +++ b/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 false diff --git a/dotnet/src/extensions/Azure/test/GeneXus.Programs.Common/GeneXus.Programs.Common.csproj b/dotnet/src/extensions/Azure/test/GeneXus.Programs.Common/GeneXus.Programs.Common.csproj index c445f203f..e7f767de7 100644 --- a/dotnet/src/extensions/Azure/test/GeneXus.Programs.Common/GeneXus.Programs.Common.csproj +++ b/dotnet/src/extensions/Azure/test/GeneXus.Programs.Common/GeneXus.Programs.Common.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 false diff --git a/dotnet/src/extensions/Azure/test/amyprocedurehandler/amyprochandler.csproj b/dotnet/src/extensions/Azure/test/amyprocedurehandler/amyprochandler.csproj index 7819ae015..493212389 100644 --- a/dotnet/src/extensions/Azure/test/amyprocedurehandler/amyprochandler.csproj +++ b/dotnet/src/extensions/Azure/test/amyprocedurehandler/amyprochandler.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 amyprochandler false diff --git a/dotnet/src/extensions/Azure/test/apiattractions/apiattractions.csproj b/dotnet/src/extensions/Azure/test/apiattractions/apiattractions.csproj index bb8cc1893..9f5a24fe1 100644 --- a/dotnet/src/extensions/Azure/test/apiattractions/apiattractions.csproj +++ b/dotnet/src/extensions/Azure/test/apiattractions/apiattractions.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 enable enable false diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj index a578b162d..0aadf600a 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXusCryptographyNetCoreImpl 17.4.0 GeneXus.SecurityApi.Cryptography.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj index 71e11b8dc..40183616f 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXusFtpsNetCoreImpl 17.4.0 GeneXus.SecurityApi.Ftps.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj index f211b6d98..d10dedb77 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXusJWTNetCoreImpl 17.4.0 GeneXus.SecurityApi.Jwt.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj index c65bd27a4..b239eec08 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXusSftpNetCoreImpl 17.4.0 GeneXus.SecurityApi.Sftp.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj index 37d202758..665e06bf4 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 GeneXusXMLSignatureNetCoreImpl 17.4.0 GeneXus.SecurityApi.XmlSignature.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj index 28c91eaaa..110b097cf 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0;net7.0 GeneXusSecurityAPICommonsNetCoreImpl 17.4.0 CA1031, CA1801, SYSLIB0027 diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps/FtpsClient.cs b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps/FtpsClient.cs index 99a798359..daa9b0d81 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps/FtpsClient.cs +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetframework/GeneXusFtps/GeneXusFtps/FtpsClient.cs @@ -353,6 +353,7 @@ private FtpDataType SetEncoding(FtpsOptions options) private SslProtocols SetProtocol(FtpsOptions options) { +#pragma warning disable SYSLIB0039 // Type or member is obsolete #pragma warning disable CA5397 // Do not use deprecated SslProtocols values switch (options.GetFtpsProtocol()) { @@ -372,6 +373,7 @@ private SslProtocols SetProtocol(FtpsOptions options) return SslProtocols.Tls; } #pragma warning restore CA5397 // Do not use deprecated SslProtocols values +#pragma warning restore SYSLIB0039 // Type or member is obsolete } private bool IsSameDir(String path1, String path2) diff --git a/dotnet/src/extensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj b/dotnet/src/extensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj index e76f072c8..20f0ec227 100644 --- a/dotnet/src/extensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 false CS0618,CA1707 false diff --git a/dotnet/src/extensions/SecurityAPI/test/dotnetframework/SecurityAPITest/SecurityAPICommons/commons/SecurityAPITestObject.cs b/dotnet/src/extensions/SecurityAPI/test/dotnetframework/SecurityAPITest/SecurityAPICommons/commons/SecurityAPITestObject.cs index 0b058627b..1c30ff47a 100644 --- a/dotnet/src/extensions/SecurityAPI/test/dotnetframework/SecurityAPITest/SecurityAPICommons/commons/SecurityAPITestObject.cs +++ b/dotnet/src/extensions/SecurityAPI/test/dotnetframework/SecurityAPITest/SecurityAPICommons/commons/SecurityAPITestObject.cs @@ -29,7 +29,9 @@ public string TestContextParameter(string key) { static string GetStartupDirectory() { +#pragma warning disable SYSLIB0044 string dir = Assembly.GetCallingAssembly().GetName().CodeBase; +#pragma warning restore SYSLIB0044 Uri uri = new Uri(dir); return Path.GetDirectoryName(uri.LocalPath); } diff --git a/dotnet/src/extensions/mocking/test/TestMockDBAccess/TestMockDBAccess.csproj b/dotnet/src/extensions/mocking/test/TestMockDBAccess/TestMockDBAccess.csproj index f0403360c..7d49564e6 100644 --- a/dotnet/src/extensions/mocking/test/TestMockDBAccess/TestMockDBAccess.csproj +++ b/dotnet/src/extensions/mocking/test/TestMockDBAccess/TestMockDBAccess.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 false diff --git a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj index 1b2383d69..a47f523a2 100644 --- a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj +++ b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 CS8032;1701;1702;NU1701 Major diff --git a/dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj b/dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj index 75b8a1aaa..5f3462a92 100644 --- a/dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj +++ b/dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 CS8032;1701;1702;NU1701 Major diff --git a/dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj b/dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj index d80d27bf7..a2fd0d8bf 100644 --- a/dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj +++ b/dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 diff --git a/dotnet/test/ProjectHealthTest/ProjectHealthTest.csproj b/dotnet/test/ProjectHealthTest/ProjectHealthTest.csproj index 011bd7245..7e16c07b5 100644 --- a/dotnet/test/ProjectHealthTest/ProjectHealthTest.csproj +++ b/dotnet/test/ProjectHealthTest/ProjectHealthTest.csproj @@ -1,13 +1,13 @@ - net6.0 + net6.0;net7.0 - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all From c0d21a08ad9ecce357d3d6c84b6150c6160ba2fe Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Mon, 29 May 2023 17:44:21 -0300 Subject: [PATCH 02/29] Install .NET7 for Build.yml and External-Storage-Tests.yml --- .github/workflows/Build.yml | 6 ++++++ .github/workflows/External-Storage-Tests.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 04663dd9c..88575e35b 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -45,6 +45,12 @@ jobs: dotnet-version: '6.0.x' include-prerelease: false + - name: Install .NET 7 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '7.0.x' + include-prerelease: false + - name: Calculate environment variables id: buildVariables run: | diff --git a/.github/workflows/External-Storage-Tests.yml b/.github/workflows/External-Storage-Tests.yml index 5fae5df91..83a7e7785 100644 --- a/.github/workflows/External-Storage-Tests.yml +++ b/.github/workflows/External-Storage-Tests.yml @@ -32,6 +32,12 @@ jobs: uses: actions/setup-dotnet@v2 with: dotnet-version: '6.0.x' + + - name: Install .NET 7 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '7.0.x' + include-prerelease: false - name: Restore packages run: dotnet restore $Env:SolutionFile From 0743bfe4c6caa6165181517f52fe5bc9707394f0 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 30 May 2023 09:39:18 -0300 Subject: [PATCH 03/29] Fix packaging error for duplicated content files. error NU5118: Warning As Error: File '\dotnet\src\dotnetcore\Reor\bin\Release\net7.0\Reor.deps.json' is not added because the package already contains file 'contentFiles\any\any\Reor.deps.json --- .../GxDataInitialization/GXDataInitialization.csproj | 4 ++-- .../src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj | 4 ++-- dotnet/src/dotnetcore/Reor/Reor.csproj | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj b/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj index 63e17c92f..98fbb6a43 100644 --- a/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj +++ b/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj @@ -19,11 +19,11 @@ - contentFiles/any/any + contentFiles/any/$(TargetFramework) true - contentFiles/any/any + contentFiles/any/$(TargetFramework) true diff --git a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj index f204a67f4..46492bd4a 100644 --- a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj +++ b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj @@ -32,11 +32,11 @@ - contentFiles/any/any + contentFiles/any/$(TargetFramework) true - contentFiles/any/any + contentFiles/any/$(TargetFramework) true diff --git a/dotnet/src/dotnetcore/Reor/Reor.csproj b/dotnet/src/dotnetcore/Reor/Reor.csproj index cddceacb8..3a7357128 100644 --- a/dotnet/src/dotnetcore/Reor/Reor.csproj +++ b/dotnet/src/dotnetcore/Reor/Reor.csproj @@ -19,11 +19,11 @@ - contentFiles/any/any + contentFiles/any/$(TargetFramework) true - contentFiles/any/any + contentFiles/any/$(TargetFramework) true From bdfd2a09cbe290fc481788c1421f30499844bc5b Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 30 May 2023 13:38:35 -0300 Subject: [PATCH 04/29] Continue building Azure Functions only for .NET 6.0. --- .../Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj index 43c043530..e1e5c4df7 100644 --- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj +++ b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0 Exe v4 false From 5d724997fbc397ca281517c001315e6abddf8d09 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 27 Jun 2023 13:02:56 -0300 Subject: [PATCH 05/29] Retarget Net7 to Net8. --- .../DynService.Core/DynService.Core.csproj | 2 +- .../DynService.Dynamo/DynService.DynamoDB.csproj | 2 +- .../GxCryptography/GxCryptography.csproj | 2 +- .../GxCryptographyCommon.csproj | 2 +- .../src/dotnetcommon/GxEncrypt/GxEncrypt.csproj | 2 +- .../DynService/Cosmos/DynService.CosmosDB.csproj | 2 +- .../DynService/OData/DynServiceOData.csproj | 2 +- .../dotnetcore/GxClasses.Web/GxClasses.Web.csproj | 2 +- dotnet/src/dotnetcore/GxClasses/GxClasses.csproj | 2 +- .../GXDataInitialization.csproj | 2 +- dotnet/src/dotnetcore/GxExcel/GxExcel.csproj | 2 +- dotnet/src/dotnetcore/GxMail/GxMail.csproj | 2 +- dotnet/src/dotnetcore/GxMaps/GxMaps.csproj | 2 +- .../GxNetCoreStartup/GxNetCoreStartup.csproj | 2 +- .../GxPdfReportsCS/GxPdfReportsCS.csproj | 2 +- dotnet/src/dotnetcore/GxSearch/GxSearch.csproj | 2 +- dotnet/src/dotnetcore/GxXsl/GxXsl.csproj | 2 +- .../Projects/StoreManager/StoreManager.csproj | 2 +- .../Cache/GxMemcached/GxMemcached.csproj | 2 +- .../Providers/Cache/GxRedis/GxRedis.csproj | 2 +- .../Messaging/GXAmazonSQS/GXAmazonSQS.csproj | 2 +- .../Messaging/GXAzureQueue/GXAzureQueue.csproj | 2 +- .../GXAzureServiceBus/GXAzureServiceBus.csproj | 2 +- .../GXMessageBroker/GXMessageBroker.csproj | 2 +- .../Providers/Messaging/GXQueue/GXQueue.csproj | 2 +- .../OpenTelemetry/GeneXus.OpenTelemetry.csproj | 2 +- .../GeneXus.OpenTelemetry.AWS.AspNet.csproj | 2 +- .../GeneXus.OpenTelemetry.Lightstep.AspNet.csproj | 2 +- .../Storage/GXAmazonS3/GXAmazonS3.csproj | 2 +- .../Storage/GXAzureStorage/GXAzureStorage.csproj | 2 +- .../Storage/GXGoogleCloud/GXGoogleCloud.csproj | 2 +- dotnet/src/dotnetcore/Reor/Reor.csproj | 2 +- .../GeneXus.Deploy.AzureFunctions.Handlers.csproj | 4 ++-- .../AzureFunctionsTest/AzureFunctionsTest.csproj | 2 +- .../GeneXus.Programs.Common.csproj | 2 +- .../amyprocedurehandler/amyprochandler.csproj | 2 +- .../test/apiattractions/apiattractions.csproj | 2 +- .../GeneXusCryptographyNetCore.csproj | 2 +- .../GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj | 2 +- .../GeneXusJWTNetCore/GeneXusJWTNetCore.csproj | 2 +- .../GeneXusSftpNetCore/GeneXusSftpNetCore.csproj | 2 +- .../GeneXusXmlSignatureNetCore.csproj | 2 +- .../SecurityAPICommonsNetCore.csproj | 2 +- .../SecurityAPITestNetCore.csproj | 2 +- .../test/TestMockDBAccess/TestMockDBAccess.csproj | 2 +- .../DotNetCoreUnitTest/DotNetCoreUnitTest.csproj | 2 +- dotnet/test/DotNetCoreUnitTest/Serialization.cs | 15 ++++++--------- .../DotNetCoreWebUnitTest.csproj | 2 +- .../test/DotNetRedisTest/DotNetRedisTest.csproj | 2 +- .../ProjectHealthTest/ProjectHealthTest.csproj | 2 +- 50 files changed, 56 insertions(+), 59 deletions(-) diff --git a/dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj b/dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj index 3f228fc6e..dde00ac2a 100644 --- a/dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj +++ b/dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj @@ -1,6 +1,6 @@ - net462;net6.0;net7.0 + net462;net6.0;net8.0 GeneXus.Data.NTier GeneXus.Data.DynService.Core CA1812 diff --git a/dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj b/dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj index c4e6ebf9a..58d869618 100644 --- a/dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj +++ b/dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj @@ -1,6 +1,6 @@ - net462;net6.0;net7.0 + net462;net6.0;net8.0 GeneXus.Data.NTier GeneXus.Data.DynService.DynamoDB false diff --git a/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj b/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj index 3a82a2cc5..fef7ad094 100644 --- a/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj +++ b/dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj @@ -1,6 +1,6 @@ - net462;net6.0;net7.0 + net462;net6.0;net8.0 GxCryptography 618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023;SYSLIB0022 GxCryptography diff --git a/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj b/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj index c0cba2322..d6db9c1ef 100644 --- a/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj +++ b/dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj @@ -1,6 +1,6 @@ - net462;net6.0;net7.0 + net462;net6.0;net8.0 GxCryptographyCommon 618;1607;1698 GxCryptographyCommon diff --git a/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj b/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj index ef20404dd..51a0560d6 100644 --- a/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj +++ b/dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj @@ -1,6 +1,6 @@ - net462;net6.0;net7.0 + net462;net6.0;net8.0 GeneXus.Encryption GxEncrypt Encrypt64 Decrypt64 diff --git a/dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj b/dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj index e26a4ced0..f32570607 100644 --- a/dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj +++ b/dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXus.Data.NTier GeneXus.Data.DynService.CosmosDB false diff --git a/dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj b/dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj index 50f2d9c1c..e2e6ffb3c 100644 --- a/dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj +++ b/dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 NETCORE DynService OData GeneXus.DynService.OData.Core diff --git a/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj b/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj index 6597bab10..60fc01860 100644 --- a/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj +++ b/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 NETCORE; GXGeolocation GXHttpServices WebSocket GeneXus.Classes.Web.Core diff --git a/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj b/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj index 489fc01d5..95a9b2796 100644 --- a/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj +++ b/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 Library NETCORE;NODATIME Data Access diff --git a/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj b/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj index 98fbb6a43..886477ee5 100644 --- a/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj +++ b/dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 Exe DataInitialization GeneXus.DataInitialization.Core diff --git a/dotnet/src/dotnetcore/GxExcel/GxExcel.csproj b/dotnet/src/dotnetcore/GxExcel/GxExcel.csproj index 3ded22be6..cd8f8201f 100644 --- a/dotnet/src/dotnetcore/GxExcel/GxExcel.csproj +++ b/dotnet/src/dotnetcore/GxExcel/GxExcel.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 NETCORE GxExcelI EPPlus Lite diff --git a/dotnet/src/dotnetcore/GxMail/GxMail.csproj b/dotnet/src/dotnetcore/GxMail/GxMail.csproj index 0bbc8952c..7d18d62a4 100644 --- a/dotnet/src/dotnetcore/GxMail/GxMail.csproj +++ b/dotnet/src/dotnetcore/GxMail/GxMail.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 1701;1702;NU1701 NETCORE SMTP Exchange POP3 diff --git a/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj b/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj index 2bf5dfb11..0005478d1 100644 --- a/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj +++ b/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 1701;1702;NU1701 NETCORE Maps diff --git a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj index 46492bd4a..0d9bbd43d 100644 --- a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj +++ b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 GxNetCoreStartup GeneXus.NetCoreStartup true diff --git a/dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj b/dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj index 479bb07a2..f48ac3a13 100644 --- a/dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj +++ b/dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 1701;1702;NU1701 NETCORE Itext PDF Report diff --git a/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj b/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj index 2356c7702..4e9923396 100644 --- a/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj +++ b/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 1701;1702;NU1701;NU1603;CS0618 NETCORE Lucene Search diff --git a/dotnet/src/dotnetcore/GxXsl/GxXsl.csproj b/dotnet/src/dotnetcore/GxXsl/GxXsl.csproj index 5b966714f..d3f5fde98 100644 --- a/dotnet/src/dotnetcore/GxXsl/GxXsl.csproj +++ b/dotnet/src/dotnetcore/GxXsl/GxXsl.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 GxXsl GxXsl XML xsl apply diff --git a/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj b/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj index 84ec8be3a..ea1cea81b 100644 --- a/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj +++ b/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net8.0 GeneXus.SD.Store.StoreManager GeneXus.SD.Store StoreManager diff --git a/dotnet/src/dotnetcore/Providers/Cache/GxMemcached/GxMemcached.csproj b/dotnet/src/dotnetcore/Providers/Cache/GxMemcached/GxMemcached.csproj index 748296768..486d7f8d0 100644 --- a/dotnet/src/dotnetcore/Providers/Cache/GxMemcached/GxMemcached.csproj +++ b/dotnet/src/dotnetcore/Providers/Cache/GxMemcached/GxMemcached.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 Memcached GeneXus.Memcached.Core NETCORE diff --git a/dotnet/src/dotnetcore/Providers/Cache/GxRedis/GxRedis.csproj b/dotnet/src/dotnetcore/Providers/Cache/GxRedis/GxRedis.csproj index d5a93fe0d..a2668014c 100644 --- a/dotnet/src/dotnetcore/Providers/Cache/GxRedis/GxRedis.csproj +++ b/dotnet/src/dotnetcore/Providers/Cache/GxRedis/GxRedis.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 Redis GeneXus.Redis.Core diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/GXAmazonSQS.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/GXAmazonSQS.csproj index ef77ac699..525f3c3c1 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/GXAmazonSQS.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/GXAmazonSQS.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXus.AWS.Queue AWS SQS Queue Messaging diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureQueue/GXAzureQueue.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureQueue/GXAzureQueue.csproj index f701dc1b0..f7362abef 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureQueue/GXAzureQueue.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureQueue/GXAzureQueue.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXus.Azure.Queue Azure Queue Messaging diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureServiceBus/GXAzureServiceBus.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureServiceBus/GXAzureServiceBus.csproj index 6ed2e49f7..657c098fc 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureServiceBus/GXAzureServiceBus.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureServiceBus/GXAzureServiceBus.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXus.Azure.ServiceBus Azure ServiceBus Messaging diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/GXMessageBroker.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/GXMessageBroker.csproj index f6ce91709..2cc2f4242 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/GXMessageBroker.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXMessageBroker/GXMessageBroker.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXus.Message.MessageBroker Broker Messaging TRACE;DEBUG;NETCORE diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXQueue/GXQueue.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXQueue/GXQueue.csproj index 84f5d851e..40cd0128b 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXQueue/GXQueue.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXQueue/GXQueue.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 TRACE;DEBUG;NETCORE GeneXus.Message.Queue diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj index 5822ddd50..6c23dac29 100644 --- a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj +++ b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 enable enable GeneXus.OpenTelemetry diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj index 2f2ff9fba..1fb368fc7 100644 --- a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj +++ b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 NETCORE; Properties false diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj index 1c51dc401..6114b9112 100644 --- a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj +++ b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 NETCORE; Properties false diff --git a/dotnet/src/dotnetcore/Providers/Storage/GXAmazonS3/GXAmazonS3.csproj b/dotnet/src/dotnetcore/Providers/Storage/GXAmazonS3/GXAmazonS3.csproj index 0bc807c85..2e1e3ce13 100644 --- a/dotnet/src/dotnetcore/Providers/Storage/GXAmazonS3/GXAmazonS3.csproj +++ b/dotnet/src/dotnetcore/Providers/Storage/GXAmazonS3/GXAmazonS3.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 TRACE;DEBUG;NETCORE Properties false diff --git a/dotnet/src/dotnetcore/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj b/dotnet/src/dotnetcore/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj index 86faaae84..099f6efb1 100644 --- a/dotnet/src/dotnetcore/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj +++ b/dotnet/src/dotnetcore/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 TRACE;DEBUG;NETCORE Properties false diff --git a/dotnet/src/dotnetcore/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj b/dotnet/src/dotnetcore/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj index c58d6e014..0c3bfd68c 100644 --- a/dotnet/src/dotnetcore/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj +++ b/dotnet/src/dotnetcore/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 TRACE;DEBUG;NETCORE Properties false diff --git a/dotnet/src/dotnetcore/Reor/Reor.csproj b/dotnet/src/dotnetcore/Reor/Reor.csproj index 3a7357128..59e7feedf 100644 --- a/dotnet/src/dotnetcore/Reor/Reor.csproj +++ b/dotnet/src/dotnetcore/Reor/Reor.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 Exe Reorg GeneXus.Reorganization.Core diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj index e1e5c4df7..f095cb093 100644 --- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj +++ b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj @@ -48,9 +48,9 @@ - + true - ./lib/net6.0/ + ./lib/$(TargetFramework)/ true diff --git a/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj b/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj index 636f5cc94..de0387c91 100644 --- a/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj +++ b/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 false diff --git a/dotnet/src/extensions/Azure/test/GeneXus.Programs.Common/GeneXus.Programs.Common.csproj b/dotnet/src/extensions/Azure/test/GeneXus.Programs.Common/GeneXus.Programs.Common.csproj index e7f767de7..f9024993a 100644 --- a/dotnet/src/extensions/Azure/test/GeneXus.Programs.Common/GeneXus.Programs.Common.csproj +++ b/dotnet/src/extensions/Azure/test/GeneXus.Programs.Common/GeneXus.Programs.Common.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 false diff --git a/dotnet/src/extensions/Azure/test/amyprocedurehandler/amyprochandler.csproj b/dotnet/src/extensions/Azure/test/amyprocedurehandler/amyprochandler.csproj index 493212389..9119547f2 100644 --- a/dotnet/src/extensions/Azure/test/amyprocedurehandler/amyprochandler.csproj +++ b/dotnet/src/extensions/Azure/test/amyprocedurehandler/amyprochandler.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 amyprochandler false diff --git a/dotnet/src/extensions/Azure/test/apiattractions/apiattractions.csproj b/dotnet/src/extensions/Azure/test/apiattractions/apiattractions.csproj index 9f5a24fe1..5454ea407 100644 --- a/dotnet/src/extensions/Azure/test/apiattractions/apiattractions.csproj +++ b/dotnet/src/extensions/Azure/test/apiattractions/apiattractions.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 enable enable false diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj index 0aadf600a..15ab5514c 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusCryptographyNetCore/GeneXusCryptographyNetCore.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXusCryptographyNetCoreImpl 17.4.0 GeneXus.SecurityApi.Cryptography.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj index 40183616f..7aebe6d39 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusFtpsNetCore/GeneXusFtpsNetCore.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXusFtpsNetCoreImpl 17.4.0 GeneXus.SecurityApi.Ftps.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj index d10dedb77..2d6b92d43 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusJWTNetCore/GeneXusJWTNetCore.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXusJWTNetCoreImpl 17.4.0 GeneXus.SecurityApi.Jwt.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj index b239eec08..a3a002ff1 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusSftpNetCore/GeneXusSftpNetCore.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXusSftpNetCoreImpl 17.4.0 GeneXus.SecurityApi.Sftp.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj index 665e06bf4..fddff7894 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/GeneXusXmlSignatureNetCore/GeneXusXmlSignatureNetCore.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 GeneXusXMLSignatureNetCoreImpl 17.4.0 GeneXus.SecurityApi.XmlSignature.Core diff --git a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj index 110b097cf..19c982d4c 100644 --- a/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/dotnet/dotnetcore/SecurityAPICommonsNetCore/SecurityAPICommonsNetCore.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net8.0 GeneXusSecurityAPICommonsNetCoreImpl 17.4.0 CA1031, CA1801, SYSLIB0027 diff --git a/dotnet/src/extensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj b/dotnet/src/extensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj index 20f0ec227..406f574c3 100644 --- a/dotnet/src/extensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj +++ b/dotnet/src/extensions/SecurityAPI/test/dotnetcore/SecurityAPITestNetCore/SecurityAPITestNetCore.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 false CS0618,CA1707 false diff --git a/dotnet/src/extensions/mocking/test/TestMockDBAccess/TestMockDBAccess.csproj b/dotnet/src/extensions/mocking/test/TestMockDBAccess/TestMockDBAccess.csproj index 7d49564e6..5d7e2f3f0 100644 --- a/dotnet/src/extensions/mocking/test/TestMockDBAccess/TestMockDBAccess.csproj +++ b/dotnet/src/extensions/mocking/test/TestMockDBAccess/TestMockDBAccess.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 false diff --git a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj index a47f523a2..b33480c2d 100644 --- a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj +++ b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 CS8032;1701;1702;NU1701 Major diff --git a/dotnet/test/DotNetCoreUnitTest/Serialization.cs b/dotnet/test/DotNetCoreUnitTest/Serialization.cs index 79b5872d5..e4b8fb591 100644 --- a/dotnet/test/DotNetCoreUnitTest/Serialization.cs +++ b/dotnet/test/DotNetCoreUnitTest/Serialization.cs @@ -19,15 +19,15 @@ public class CoreSerializationTest public async Task TestSessionRenew() { var httpContext = new DefaultHttpContext() { Session = new MockHttpSession() }; - var authMiddleware = new MyAuthMiddleware(next: (innerHttpContext) => Task.FromResult(0)); + var authMiddleware = new MyAuthMiddleware(); await authMiddleware.Invoke(httpContext); } [Fact] public async Task TestSessionCookieContainer() { - var httpContext = new DefaultHttpContext() { Session = new MockHttpSession() }; - var authMiddleware = new MyAuthMiddleware(next: (innerHttpContext) => Task.FromResult(0)); + DefaultHttpContext httpContext = new DefaultHttpContext() { Session = new MockHttpSession() }; + MyAuthMiddleware authMiddleware = new MyAuthMiddleware(); await authMiddleware.SessionCookieContainerSerialization(httpContext); } @@ -35,11 +35,8 @@ public async Task TestSessionCookieContainer() } public class MyAuthMiddleware { - private readonly RequestDelegate _next; - - public MyAuthMiddleware(RequestDelegate next) + public MyAuthMiddleware() { - _next = next; } public async Task SessionCookieContainerSerialization(HttpContext context) { @@ -55,7 +52,7 @@ public async Task SessionCookieContainerSerialization(HttpContext context) gxcontext.UpdateSessionCookieContainer(); container = gxcontext.GetCookieContainer(url, true); Assert.Equal(1, container.Count); - await _next(context); + await Task.CompletedTask; } public async Task Invoke(HttpContext context) @@ -76,7 +73,7 @@ public async Task Invoke(HttpContext context) throw; } Assert.Equal(InternalKeyAjaxEncryptionKey, gxcontext.ReadSessionKey(CryptoImpl.AJAX_ENCRYPTION_KEY)); - await _next(context); + await Task.CompletedTask; } } public class MockHttpSession : ISession diff --git a/dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj b/dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj index 5f3462a92..be563028e 100644 --- a/dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj +++ b/dotnet/test/DotNetCoreWebUnitTest/DotNetCoreWebUnitTest.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0 + net6.0;net8.0 CS8032;1701;1702;NU1701 Major diff --git a/dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj b/dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj index 9c51210af..c71055ece 100644 --- a/dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj +++ b/dotnet/test/DotNetRedisTest/DotNetRedisTest.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 diff --git a/dotnet/test/ProjectHealthTest/ProjectHealthTest.csproj b/dotnet/test/ProjectHealthTest/ProjectHealthTest.csproj index 7e16c07b5..a7952c809 100644 --- a/dotnet/test/ProjectHealthTest/ProjectHealthTest.csproj +++ b/dotnet/test/ProjectHealthTest/ProjectHealthTest.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net8.0 From 4e7377abbd12956cc57fe025219368e5131c9130 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 27 Jun 2023 13:19:29 -0300 Subject: [PATCH 06/29] Update requirements. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2b52c8372..9324fe365 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,8 @@ This repository contains projects for .NET and .NET Framework. It is organized a # How to build ## Requirements -- Visual Studio 2022 -- .NET 6 +- Visual Studio 2022 (17.6.1 if using .NET 8 up to preview 3 or 17.7 if using .NET 8 last preview). +- .NET 6 & .NET 8 - .NET Framework 4.7 DevPack # Instructions From 6801414b06b34ca74de48030bc0e7e2b30a49595 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 27 Jun 2023 13:37:15 -0300 Subject: [PATCH 07/29] Include NET8 SDK on github workflow. --- .github/workflows/Build.yml | 8 ++++---- .github/workflows/External-Storage-Tests.yml | 8 ++++---- .github/workflows/veracode.yml | 5 +++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 88575e35b..28058f7d5 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -45,11 +45,11 @@ jobs: dotnet-version: '6.0.x' include-prerelease: false - - name: Install .NET 7 - uses: actions/setup-dotnet@v2 + - name: Install .NET 8 + uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.0.x' - include-prerelease: false + dotnet-version: '8.x' + include-prerelease: true - name: Calculate environment variables id: buildVariables diff --git a/.github/workflows/External-Storage-Tests.yml b/.github/workflows/External-Storage-Tests.yml index 83a7e7785..fbdafdbba 100644 --- a/.github/workflows/External-Storage-Tests.yml +++ b/.github/workflows/External-Storage-Tests.yml @@ -33,11 +33,11 @@ jobs: with: dotnet-version: '6.0.x' - - name: Install .NET 7 - uses: actions/setup-dotnet@v2 + - name: Install .NET 8 + uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.0.x' - include-prerelease: false + dotnet-version: '8.x' + include-prerelease: true - name: Restore packages run: dotnet restore $Env:SolutionFile diff --git a/.github/workflows/veracode.yml b/.github/workflows/veracode.yml index 0f41536ad..9ebfb887d 100644 --- a/.github/workflows/veracode.yml +++ b/.github/workflows/veracode.yml @@ -50,6 +50,11 @@ jobs: dotnet-version: '6.0.x' include-prerelease: false + - name: Install .NET 8 + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '8.x' + include-prerelease: true - name: Build run: | From 403e473e39568008c9c42262b11c5f71f0675dc9 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 27 Jun 2023 14:26:49 -0300 Subject: [PATCH 08/29] Fix error SYSLIB0051 Exception.Exception(SerializationInfo, StreamingContext) is obsolete --- .../GxClasses/ErrorHandling/GxNotImplementedException.cs | 4 ---- dotnet/src/dotnetframework/GxClasses/Printer/GxPrinter.cs | 5 ----- 2 files changed, 9 deletions(-) diff --git a/dotnet/src/dotnetframework/GxClasses/ErrorHandling/GxNotImplementedException.cs b/dotnet/src/dotnetframework/GxClasses/ErrorHandling/GxNotImplementedException.cs index 5a872a533..6d0c4c3f3 100644 --- a/dotnet/src/dotnetframework/GxClasses/ErrorHandling/GxNotImplementedException.cs +++ b/dotnet/src/dotnetframework/GxClasses/ErrorHandling/GxNotImplementedException.cs @@ -8,10 +8,6 @@ namespace GeneXus.Data [Serializable()] public class GxNotImplementedException : Exception { - public GxNotImplementedException(SerializationInfo info, StreamingContext ctx) : base(info, ctx) - { - - } public GxNotImplementedException(string message) : base(message) { diff --git a/dotnet/src/dotnetframework/GxClasses/Printer/GxPrinter.cs b/dotnet/src/dotnetframework/GxClasses/Printer/GxPrinter.cs index 45b9b3989..9ef4e6aad 100644 --- a/dotnet/src/dotnetframework/GxClasses/Printer/GxPrinter.cs +++ b/dotnet/src/dotnetframework/GxClasses/Printer/GxPrinter.cs @@ -2147,11 +2147,6 @@ public void setOutputStream(object o) { } [Serializable()] public class ProcessInterruptedException: Exception { - public ProcessInterruptedException(SerializationInfo info, StreamingContext ctx) - : base(info, ctx) - { - - } public ProcessInterruptedException() { From a1f5fb63a9098500e1d1215fc64d8103121bafba Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 27 Jun 2023 15:09:21 -0300 Subject: [PATCH 09/29] Fix error SYSLIB0051 Exception.Exception(SerializationInfo, StreamingContext) is obsolete --- .../GxClasses/ErrorHandling/GxADODataException.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dotnet/src/dotnetframework/GxClasses/ErrorHandling/GxADODataException.cs b/dotnet/src/dotnetframework/GxClasses/ErrorHandling/GxADODataException.cs index 117c4ae61..1e6b26800 100644 --- a/dotnet/src/dotnetframework/GxClasses/ErrorHandling/GxADODataException.cs +++ b/dotnet/src/dotnetframework/GxClasses/ErrorHandling/GxADODataException.cs @@ -21,10 +21,6 @@ namespace GeneXus.Data [Serializable()] public class GxADODataException : Exception { - public GxADODataException(SerializationInfo info,StreamingContext ctx):base(info,ctx) - { - - } public GxADODataException(string mes, Exception ex) : base(mes, ex) { if (ex != null) From 0991d354ca2671b7a52c5a05cf3efeaed03e315f Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 27 Jun 2023 16:19:43 -0300 Subject: [PATCH 10/29] Update dotnet version for the Fortify scan. --- .github/workflows/fortify-net-framework.yml | 6 ++++++ .github/workflows/fortify.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/fortify-net-framework.yml b/.github/workflows/fortify-net-framework.yml index 0c37aa982..441f74b44 100644 --- a/.github/workflows/fortify-net-framework.yml +++ b/.github/workflows/fortify-net-framework.yml @@ -38,6 +38,12 @@ jobs: with: vs-version: 10.0 + - name: Install .NET 8 + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '8.x' + include-prerelease: true + - name: Create temporal solution run: | $fortifysolution = "FortifySolution" diff --git a/.github/workflows/fortify.yml b/.github/workflows/fortify.yml index 4da890cd9..aa776f990 100644 --- a/.github/workflows/fortify.yml +++ b/.github/workflows/fortify.yml @@ -38,6 +38,12 @@ jobs: with: vs-version: 10.0 + - name: Install .NET 8 + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '8.x' + include-prerelease: true + - name: Create temporal solution run: | $fortifysolution = "FortifySolution" From 4dbc43e70fdabde5779dd6c21b8ab186431eee92 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 27 Jun 2023 20:08:33 -0300 Subject: [PATCH 11/29] Prepare project for multi target build. --- ...eXus.Deploy.AzureFunctions.Handlers.csproj | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj index f095cb093..119f6c778 100644 --- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj +++ b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj @@ -6,6 +6,7 @@ false GeneXus.Deploy.AzureFunctions.Handlers 1701;1702;NU1701 + $(TargetsForTfmSpecificContentInPackage);CustomContentTarget portable @@ -47,16 +48,19 @@ Never - - - true - ./lib/$(TargetFramework)/ - - - true - ./src/ - - + + + + ./lib/$(TargetFramework)/ + true + + + ./src/ + true + + + + From 39b60d312ee23ef04a8acedf564d20b8ae55558a Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Wed, 28 Jun 2023 08:26:55 -0300 Subject: [PATCH 12/29] Fix preview version of dotnet 8 in fortify scan. Try to fix error NETSDK1045: The current .NET SDK does not support targeting .NET 8.0. Either target .NET 7.0 or lower, or use a version of the .NET SDK that supports .NET 8.0 when packaging code with msbuild 17.6.3.22601 --- .github/workflows/fortify-net-framework.yml | 3 +-- .github/workflows/fortify.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fortify-net-framework.yml b/.github/workflows/fortify-net-framework.yml index 441f74b44..b8f378ede 100644 --- a/.github/workflows/fortify-net-framework.yml +++ b/.github/workflows/fortify-net-framework.yml @@ -41,8 +41,7 @@ jobs: - name: Install .NET 8 uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.x' - include-prerelease: true + dotnet-version: '8.0.100-preview.3.23178.7' - name: Create temporal solution run: | diff --git a/.github/workflows/fortify.yml b/.github/workflows/fortify.yml index aa776f990..6bdaf2d9f 100644 --- a/.github/workflows/fortify.yml +++ b/.github/workflows/fortify.yml @@ -41,8 +41,7 @@ jobs: - name: Install .NET 8 uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.x' - include-prerelease: true + dotnet-version: '8.0.100-preview.3.23178.7' - name: Create temporal solution run: | From 5bd64f428416a5cf8744ee3259ee3ecf4631e333 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Wed, 28 Jun 2023 10:12:03 -0300 Subject: [PATCH 13/29] Change msbuild build tool by dotnet msbuild. --- .github/workflows/fortify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fortify.yml b/.github/workflows/fortify.yml index 6bdaf2d9f..b909c8220 100644 --- a/.github/workflows/fortify.yml +++ b/.github/workflows/fortify.yml @@ -59,7 +59,7 @@ jobs: - name: Download Fortify ScanCentral Client uses: fortify/gha-setup-scancentral-client@v1 - name: Package Code + Dependencies - run: scancentral package -bt msbuild -bf ./dotnet/FortifySolution.sln -o package.zip + run: scancentral package -bt "dotnet msbuild" -bf ./dotnet/FortifySolution.sln -o package.zip - name: Show package contents run: unzip -v package.zip From 6eec0b4c9fc17d9c9e968f7825ab69e70d24d649 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Wed, 28 Jun 2023 10:16:39 -0300 Subject: [PATCH 14/29] Upgrade msbuild version. --- .github/workflows/fortify.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/fortify.yml b/.github/workflows/fortify.yml index b909c8220..946f6482d 100644 --- a/.github/workflows/fortify.yml +++ b/.github/workflows/fortify.yml @@ -27,17 +27,17 @@ jobs: with: repository: '' + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.1 + with: + vs-prerelease: true + # Java 8 required by ScanCentral Client and FoD Uploader(Univeral CI Tool) - name: Setup Java uses: actions/setup-java@v1 with: java-version: 1.8 - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1 - with: - vs-version: 10.0 - + - name: Install .NET 8 uses: actions/setup-dotnet@v3 with: @@ -59,7 +59,7 @@ jobs: - name: Download Fortify ScanCentral Client uses: fortify/gha-setup-scancentral-client@v1 - name: Package Code + Dependencies - run: scancentral package -bt "dotnet msbuild" -bf ./dotnet/FortifySolution.sln -o package.zip + run: scancentral package -bt msbuild -bf ./dotnet/FortifySolution.sln -o package.zip - name: Show package contents run: unzip -v package.zip From 2a20e46f1b08d70afe3c3a1ad4fadfe7d6688cfc Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Wed, 28 Jun 2023 11:11:47 -0300 Subject: [PATCH 15/29] Specify a preview version in global.json to allow building with 8.0 preview irrespective of the checkbox "Use previews of the .NET Core SDK" on visual studio. --- dotnet/global.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 dotnet/global.json diff --git a/dotnet/global.json b/dotnet/global.json new file mode 100644 index 000000000..20dc84cd1 --- /dev/null +++ b/dotnet/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "allowPrerelease": true + } +} \ No newline at end of file From b4eaea5307447b1ee33f61bdf3fa6aafac955673 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Wed, 28 Jun 2023 11:48:22 -0300 Subject: [PATCH 16/29] Upgrade msbuild for fortify-net-framework.yml --- .github/workflows/fortify-net-framework.yml | 12 ++++++------ dotnet/global.json => global.json | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename dotnet/global.json => global.json (100%) diff --git a/.github/workflows/fortify-net-framework.yml b/.github/workflows/fortify-net-framework.yml index b8f378ede..d1c37d84c 100644 --- a/.github/workflows/fortify-net-framework.yml +++ b/.github/workflows/fortify-net-framework.yml @@ -27,17 +27,17 @@ jobs: with: repository: '' + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.1 + with: + vs-prerelease: true + # Java 8 required by ScanCentral Client and FoD Uploader(Univeral CI Tool) - name: Setup Java uses: actions/setup-java@v1 with: java-version: 1.8 - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1 - with: - vs-version: 10.0 - + - name: Install .NET 8 uses: actions/setup-dotnet@v3 with: diff --git a/dotnet/global.json b/global.json similarity index 100% rename from dotnet/global.json rename to global.json From 40300b4ba22ecb467322e38c26f61d5c8463cf46 Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Fri, 30 Jun 2023 21:16:56 -0300 Subject: [PATCH 17/29] Add Jayrock for net8.0 --- dotnet/src/dotnetcore/libs/net8.0/Jayrock.dll | Bin 0 -> 30720 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dotnet/src/dotnetcore/libs/net8.0/Jayrock.dll diff --git a/dotnet/src/dotnetcore/libs/net8.0/Jayrock.dll b/dotnet/src/dotnetcore/libs/net8.0/Jayrock.dll new file mode 100644 index 0000000000000000000000000000000000000000..fd1736afd37fd77285a16b5f092da19b42c8fb54 GIT binary patch literal 30720 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 literal 0 HcmV?d00001 From 6a76003a99056d3e6772bec7b7b3261708da01ce Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Fri, 30 Jun 2023 21:22:31 -0300 Subject: [PATCH 18/29] Add jayrock lib for net8.0 --- .../GxClasses.Web/GxClasses.Web.csproj | 16 ++++++++------ .../src/dotnetcore/GxClasses/GxClasses.csproj | 18 +++++++++------- dotnet/src/dotnetcore/GxMaps/GxMaps.csproj | 21 ++++++++++++------- .../GxNetCoreStartup/GxNetCoreStartup.csproj | 7 ++++++- .../src/dotnetcore/GxSearch/GxSearch.csproj | 18 +++++++++------- .../Projects/StoreManager/StoreManager.csproj | 9 ++++++-- 6 files changed, 58 insertions(+), 31 deletions(-) diff --git a/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj b/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj index 60fc01860..6bb56361a 100644 --- a/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj +++ b/dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj @@ -44,11 +44,15 @@ - - - False - ..\libs\Jayrock.dll - - + + + False + ..\libs\net8.0\Jayrock.dll + + + False + ..\libs\Jayrock.dll + + \ No newline at end of file diff --git a/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj b/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj index 95a9b2796..f39e1c83e 100644 --- a/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj +++ b/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj @@ -180,11 +180,15 @@ - - - - False - ..\libs\Jayrock.dll - - + + + + False + ..\libs\net8.0\Jayrock.dll + + + False + ..\libs\Jayrock.dll + + \ No newline at end of file diff --git a/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj b/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj index 0005478d1..bf243af4a 100644 --- a/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj +++ b/dotnet/src/dotnetcore/GxMaps/GxMaps.csproj @@ -11,12 +11,17 @@ - - - - False - ..\libs\Jayrock.dll - - + + + + False + ..\libs\net8.0\Jayrock.dll + + + False + ..\libs\Jayrock.dll + + + - \ No newline at end of file + \ No newline at end of file diff --git a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj index 0d9bbd43d..377d49758 100644 --- a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj +++ b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj @@ -23,12 +23,17 @@ - + + False + ..\libs\net8.0\Jayrock.dll + + False ..\libs\Jayrock.dll + diff --git a/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj b/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj index 4e9923396..80be81951 100644 --- a/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj +++ b/dotnet/src/dotnetcore/GxSearch/GxSearch.csproj @@ -29,13 +29,17 @@ - - - - False - ..\libs\Jayrock.dll - - + + + + False + ..\libs\net8.0\Jayrock.dll + + + False + ..\libs\Jayrock.dll + + \ No newline at end of file diff --git a/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj b/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj index ea1cea81b..64129d3dd 100644 --- a/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj +++ b/dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj @@ -1,4 +1,4 @@ - + net6.0;net8.0 @@ -37,9 +37,14 @@ - + + False + ..\..\libs\net8.0\Jayrock.dll + + False ..\..\libs\Jayrock.dll + From 890f55733dade36f0ffaccba1a086ec48f273b9c Mon Sep 17 00:00:00 2001 From: cmurialdo Date: Tue, 4 Jul 2023 10:59:34 -0300 Subject: [PATCH 19/29] Temporary include jayrock library for .NET8 package. --- dotnet/src/dotnetcore/GxClasses/GxClasses.csproj | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj b/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj index f39e1c83e..8c644ec9c 100644 --- a/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj +++ b/dotnet/src/dotnetcore/GxClasses/GxClasses.csproj @@ -8,6 +8,7 @@ GeneXus.Classes.Core true 618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023 + $(TargetsForTfmSpecificContentInPackage);CustomContentTarget @@ -189,6 +190,16 @@ False ..\libs\Jayrock.dll + True + + + + lib/$(TargetFramework) + true + + + + \ No newline at end of file From 13148faff0b6b795b02b3d06773e76e7937bbac6 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Thu, 24 Aug 2023 14:00:02 -0300 Subject: [PATCH 20/29] Fix Startup warning: The WebRootPath was not found. --- dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs b/dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs index a5d8ceed3..72ea97ac0 100644 --- a/dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs +++ b/dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs @@ -76,6 +76,7 @@ public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) .ConfigureLogging(logging => logging.AddConsole()) .UseStartup() + .UseWebRoot(Startup.LocalPath) .UseContentRoot(Startup.LocalPath) .Build(); @@ -89,6 +90,7 @@ static IWebHost BuildWebHostPort(string[] args, string port, string schema) .ConfigureLogging(logging => logging.AddConsole()) .UseUrls($"{schema}://*:{port}") .UseStartup() + .UseWebRoot(Startup.LocalPath) .UseContentRoot(Startup.LocalPath) .Build(); } From 8e2aab5511f0143e736046681710209bb8a4a285 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Thu, 12 Oct 2023 09:04:44 -0300 Subject: [PATCH 21/29] Set the .NET version to 8 RC1 for packages --- .github/workflows/Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 28058f7d5..7cf9aa6d9 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -48,7 +48,7 @@ jobs: - name: Install .NET 8 uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.x' + dotnet-version: '8.0.0-rc.1.x' include-prerelease: true - name: Calculate environment variables From 30d3c9292876bb68f24a6cd7fb2f090c46158ff0 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Thu, 12 Oct 2023 09:14:52 -0300 Subject: [PATCH 22/29] Fix version of RC1. --- .github/workflows/Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 7cf9aa6d9..e6d0c9c27 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -48,7 +48,7 @@ jobs: - name: Install .NET 8 uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.0-rc.1.x' + dotnet-version: '8.0.100-rc.1.23455.8' include-prerelease: true - name: Calculate environment variables From 93527a1b8067e8059e827fd48e6cf4966f4cca16 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Thu, 12 Oct 2023 09:16:18 -0300 Subject: [PATCH 23/29] Fix version. Remove Warning Unexpected input(s) 'include-prerelease' --- .github/workflows/Build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index e6d0c9c27..7466e8623 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -48,8 +48,7 @@ jobs: - name: Install .NET 8 uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.1.23455.8' - include-prerelease: true + dotnet-version: '8.0.100-rc.1.23455.8' - name: Calculate environment variables id: buildVariables From 70637039880fba54708ccd088d2a48b06837a85c Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Tue, 17 Oct 2023 18:48:15 -0300 Subject: [PATCH 24/29] Add the target framework 'net8.0' to projects that haven't been configured with it yet. --- dotnet/src/dotnetcore/GxOffice/GxOffice.csproj | 2 +- .../Messaging/GXAzureEventGrid/GXAzureEventGrid.csproj | 2 +- .../Providers/Messaging/GXEventRouter/GXEventRouter.csproj | 2 +- .../GeneXus.OpenTelemetry.Azure.AppInsights.csproj | 2 +- .../DotNetCoreAttackMitigationTest.csproj | 2 +- .../DotNetCoreOpenTelemetryTest.csproj | 2 +- dotnet/test/DotNetPdfTest/DotNetPDFUnitTest.csproj | 2 +- dotnet/test/TestApp/TestApp.csproj | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dotnet/src/dotnetcore/GxOffice/GxOffice.csproj b/dotnet/src/dotnetcore/GxOffice/GxOffice.csproj index 4a31a7b68..1b1ee2e35 100644 --- a/dotnet/src/dotnetcore/GxOffice/GxOffice.csproj +++ b/dotnet/src/dotnetcore/GxOffice/GxOffice.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net8.0 NETCORE Genexus.Office GxOffice diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureEventGrid/GXAzureEventGrid.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureEventGrid/GXAzureEventGrid.csproj index e50e530ad..a2476084c 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXAzureEventGrid/GXAzureEventGrid.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXAzureEventGrid/GXAzureEventGrid.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 GeneXus.Azure.EventGrid Azure EventGrid Messaging diff --git a/dotnet/src/dotnetcore/Providers/Messaging/GXEventRouter/GXEventRouter.csproj b/dotnet/src/dotnetcore/Providers/Messaging/GXEventRouter/GXEventRouter.csproj index d1e59a220..c2c2ccf43 100644 --- a/dotnet/src/dotnetcore/Providers/Messaging/GXEventRouter/GXEventRouter.csproj +++ b/dotnet/src/dotnetcore/Providers/Messaging/GXEventRouter/GXEventRouter.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 GeneXus.Message.EventRouter Event Bus Messaging Router TRACE;DEBUG;NETCORE diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/GeneXus.OpenTelemetry.Azure.AppInsights.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/GeneXus.OpenTelemetry.Azure.AppInsights.csproj index 26bbe19b1..1d8e37833 100644 --- a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/GeneXus.OpenTelemetry.Azure.AppInsights.csproj +++ b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/GeneXus.OpenTelemetry.Azure.AppInsights.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net8.0 NETCORE; Properties false diff --git a/dotnet/test/DotNetCoreAttackMitigationTest/DotNetCoreAttackMitigationTest.csproj b/dotnet/test/DotNetCoreAttackMitigationTest/DotNetCoreAttackMitigationTest.csproj index 659f45156..fa3f01cd2 100644 --- a/dotnet/test/DotNetCoreAttackMitigationTest/DotNetCoreAttackMitigationTest.csproj +++ b/dotnet/test/DotNetCoreAttackMitigationTest/DotNetCoreAttackMitigationTest.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net8.0 CS8032;1701;1702;NU1701 Major diff --git a/dotnet/test/DotNetCoreOpenTelemetryTest/DotNetCoreOpenTelemetryTest.csproj b/dotnet/test/DotNetCoreOpenTelemetryTest/DotNetCoreOpenTelemetryTest.csproj index 15d8fc2c6..03f844c27 100644 --- a/dotnet/test/DotNetCoreOpenTelemetryTest/DotNetCoreOpenTelemetryTest.csproj +++ b/dotnet/test/DotNetCoreOpenTelemetryTest/DotNetCoreOpenTelemetryTest.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net8.0 CS8032;1701;1702;NU1701 Major diff --git a/dotnet/test/DotNetPdfTest/DotNetPDFUnitTest.csproj b/dotnet/test/DotNetPdfTest/DotNetPDFUnitTest.csproj index c3f0531d3..43cbea27f 100644 --- a/dotnet/test/DotNetPdfTest/DotNetPDFUnitTest.csproj +++ b/dotnet/test/DotNetPdfTest/DotNetPDFUnitTest.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net8.0 CS8032;1701;1702;NU1701 Major diff --git a/dotnet/test/TestApp/TestApp.csproj b/dotnet/test/TestApp/TestApp.csproj index 6a0556c0d..59dd234ee 100644 --- a/dotnet/test/TestApp/TestApp.csproj +++ b/dotnet/test/TestApp/TestApp.csproj @@ -2,7 +2,7 @@ Library - net6.0 + net6.0;net8.0 enable enable $(ProjectDir)..\DotNetCoreOpenTelemetryTest\bin\$(Configuration) From 1844f8b08d4cce1e5cb37ed9b9715898c788c3d4 Mon Sep 17 00:00:00 2001 From: sjuarezgx Date: Wed, 18 Oct 2023 10:48:35 -0300 Subject: [PATCH 25/29] Add NET 8 support for Azure functions --- .../GeneXus.Deploy.AzureFunctions.Handlers.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj index dfda2bba2..762629fc5 100644 --- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj +++ b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net8.0 Exe v4 false @@ -27,7 +27,7 @@ - + @@ -64,8 +64,8 @@ - - + + From 9a05bd507b4b6f27e4effb8a30125e23413cac28 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Wed, 18 Oct 2023 15:13:12 -0300 Subject: [PATCH 26/29] Remove the target framework 6.0 from AzureFunctionsTest.csproj since it doesn't support building for multiple targets --- .../Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj b/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj index de0387c91..188055085 100644 --- a/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj +++ b/dotnet/src/extensions/Azure/test/AzureFunctionsTest/AzureFunctionsTest.csproj @@ -1,7 +1,7 @@ - net6.0;net8.0 + net8.0 false From c5081f84962de4204869386ae5d0d5ad60d3e096 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Wed, 18 Oct 2023 15:26:10 -0300 Subject: [PATCH 27/29] Remove hardcoded GeneXus.Deploy.AzureFunctions.Handlers.runtimeconfig.json with aspnet core 6.0 and take it from output directory. --- .../GeneXus.Deploy.AzureFunctions.Handlers.csproj | 2 +- ...loy.AzureFunctions.Handlers.runtimeconfig.json | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.runtimeconfig.json diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj index 762629fc5..e5ba4a8ae 100644 --- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj +++ b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj @@ -95,7 +95,7 @@ - + ./lib/$(TargetFramework)/ true diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.runtimeconfig.json b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.runtimeconfig.json deleted file mode 100644 index 7c147f531..000000000 --- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.runtimeconfig.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net6.0", - "frameworks": [ - { - "name": "Microsoft.NETCore.App", - "version": "6.0.0-rc.2.21480.5" - }, - { - "name": "Microsoft.AspNetCore.App", - "version": "6.0.0-rc.2.21480.10" - } - ] - } -} From 4f8670d6097f8a51af6522d15a9e11a9ae858a91 Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Wed, 18 Oct 2023 15:27:27 -0300 Subject: [PATCH 28/29] Remove the target framework 6.0 from AzureFunctionsTest.csproj since it doesn't support building for multiple targets --- .../Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj index e5ba4a8ae..b1bdaf7bd 100644 --- a/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj +++ b/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0 + net8.0 Exe v4 false From 47d631b1f096f192d406cc4f3108ebea8365f1ba Mon Sep 17 00:00:00 2001 From: Claudia Murialdo Date: Tue, 31 Oct 2023 14:44:19 -0300 Subject: [PATCH 29/29] Upgrade PackageHealthTest to test for net8. --- .../ProjectHealthTest/PackageVersionsConsistency.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dotnet/test/ProjectHealthTest/PackageVersionsConsistency.cs b/dotnet/test/ProjectHealthTest/PackageVersionsConsistency.cs index ad395603d..29be3c9ad 100644 --- a/dotnet/test/ProjectHealthTest/PackageVersionsConsistency.cs +++ b/dotnet/test/ProjectHealthTest/PackageVersionsConsistency.cs @@ -19,7 +19,7 @@ public class PackageVersionTest private const string PACKAGE_VERSION_ATTRIBUTE_NAME = "Version"; private const string TARGET_FRAMEWORK = "Project/PropertyGroup/TargetFramework"; private const string TARGET_FRAMEWORKS = "Project/PropertyGroup/TargetFrameworks"; - private const string NET6 = "net6.0"; + private const string NET8 = "net8.0"; private const string NET_FRAMEWORK = "net462"; private static HashSet ExcludedFromTransitiveDependenciesControl = new HashSet {"runtime"}; private static HashSet ProjectTemporaryExcludedFromDependenciesControl = new HashSet { "GeneXus.Deploy.AzureFunctions.Handlers.csproj", "AzureFunctionsTest.csproj" }; @@ -35,7 +35,7 @@ public class PackageVersionTest [Fact] public void TestPackageVersionConsistencyAcrossNETProjectsAndTransitives() { - TestPackageVersionConsistencyAcrossProjects(NET6, true); + TestPackageVersionConsistencyAcrossProjects(NET8, true); } /// /// Tests that all referenced packages have the same version by doing: @@ -47,7 +47,7 @@ public void TestPackageVersionConsistencyAcrossNETProjectsAndTransitives() [Fact] public void TestPackageVersionConsistencyAcrossNETProjects() { - TestPackageVersionConsistencyAcrossProjects(NET6, false); + TestPackageVersionConsistencyAcrossProjects(NET8, false); } [Fact] public void TestPackageVersionConsistencyAcrossNETFrameworkProjects() @@ -100,9 +100,9 @@ private void TestPackageVersionConsistencyAcrossProjects(string targetFramework, { XmlAttribute condition = packageNode.ParentNode.Attributes["Condition"]; if (condition != null) { - if (targetFramework == NET6 && condition.Value.Contains($"=='{NET_FRAMEWORK}'", StringComparison.OrdinalIgnoreCase)) + if (targetFramework == NET8 && condition.Value.Contains($"=='{NET_FRAMEWORK}'", StringComparison.OrdinalIgnoreCase)) continue; - else if (targetFramework == NET_FRAMEWORK && condition.Value.Contains($"=='{NET6}'", StringComparison.OrdinalIgnoreCase)) + else if (targetFramework == NET_FRAMEWORK && condition.Value.Contains($"=='{NET8}'", StringComparison.OrdinalIgnoreCase)) { continue; }