Skip to content

Commit

Permalink
Build for TargetFramework 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
claudiamurialdo committed May 29, 2023
1 parent be1d271 commit 2845033
Show file tree
Hide file tree
Showing 56 changed files with 80 additions and 62 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
<AssemblyName>GeneXus.Data.DynService.Core</AssemblyName>
<NoWarn>CA1812</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
<AssemblyName>GeneXus.Data.DynService.DynamoDB</AssemblyName>
<SignAssembly>false</SignAssembly>
Expand Down
4 changes: 3 additions & 1 deletion dotnet/src/dotnetcommon/GxCryptography/EncryptionProvider.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography;
using System.IO;
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
<RootNamespace>GxCryptography</RootNamespace>
<NoWarn>618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023</NoWarn>
<NoWarn>618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023;SYSLIB0022</NoWarn>
<AssemblyName>GxCryptography</AssemblyName>
<PackageTags>Data Access</PackageTags>
<PackageId>GeneXus.Cryptography</PackageId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
<RootNamespace>GxCryptographyCommon</RootNamespace>
<NoWarn>618;1607;1698</NoWarn>
<AssemblyName>GxCryptographyCommon</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
<RootNamespace>GeneXus.Encryption</RootNamespace>
<AssemblyName>GxEncrypt</AssemblyName>
<PackageTags>Encrypt64 Decrypt64</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
<AssemblyName>GeneXus.Data.DynService.CosmosDB</AssemblyName>
<SignAssembly>false</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>DynService OData</PackageTags>
<PackageId>GeneXus.DynService.OData.Core</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>NETCORE;</DefineConstants>
<PackageTags>GXGeolocation GXHttpServices WebSocket</PackageTags>
<PackageId>GeneXus.Classes.Web.Core</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxClasses/GxClasses.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<OutputType>Library</OutputType>
<DefineConstants>NETCORE;NODATIME</DefineConstants>
<PackageTags>Data Access</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<PackageTags>DataInitialization</PackageTags>
<PackageId>GeneXus.DataInitialization.Core</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxExcel/GxExcel.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<AssemblyName>GxExcelI</AssemblyName>
<PackageTags>EPPlus Lite</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxMail/GxMail.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>SMTP Exchange POP3</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxMaps/GxMaps.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Maps</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<PackageTags>GxNetCoreStartup</PackageTags>
<PackageId>GeneXus.NetCoreStartup</PackageId>
<GxGenerateDepsFile>true</GxGenerateDepsFile>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Itext PDF Report</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxSearch/GxSearch.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701;NU1603;CS0618</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Lucene Search</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxXsl/GxXsl.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<AssemblyName>GxXsl</AssemblyName>
<RootNamespace>GxXsl</RootNamespace>
<PackageTags>XML xsl apply</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<AssemblyName>GeneXus.SD.Store.StoreManager</AssemblyName>
<RootNamespace>GeneXus.SD.Store</RootNamespace>
<PackageTags>StoreManager</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<PackageTags>Memcached</PackageTags>
<PackageId>GeneXus.Memcached.Core</PackageId>
<DefineConstants>NETCORE</DefineConstants>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<PackageTags>Redis</PackageTags>
<PackageId>GeneXus.Redis.Core</PackageId>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<PackageId>GeneXus.AWS.Queue</PackageId>
<PackageTags>AWS SQS Queue Messaging</PackageTags>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<PackageId>GeneXus.Azure.Queue</PackageId>
<PackageTags>Azure Queue Messaging</PackageTags>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<PackageId>GeneXus.Azure.ServiceBus</PackageId>
<PackageTags>Azure ServiceBus Messaging</PackageTags>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<PackageId>GeneXus.Message.MessageBroker</PackageId>
<PackageTags>Broker Messaging</PackageTags>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
<PackageId>GeneXus.Message.Queue</PackageId>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>GeneXus.OpenTelemetry</AssemblyName>
Expand All @@ -10,14 +10,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104" />
<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>NETCORE;</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SignAssembly>false</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>NETCORE;</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SignAssembly>false</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SignAssembly>false</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SignAssembly>false</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SignAssembly>false</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/Reor/Reor.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<PackageTags>Reorg</PackageTags>
<PackageId>GeneXus.Reorganization.Core</PackageId>
Expand Down
2 changes: 2 additions & 0 deletions dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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);

Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<IsPublishable>false</IsPublishable>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Loading

0 comments on commit 2845033

Please sign in to comment.