Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.36.0" />
<PackageReference Include="Azure.Core" Version="1.56.0" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.36.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="GeneXus.Odata.Client" Version="5.2.3.8" />
<PackageReference Include="GeneXus.Odata.Client" Version="6.0.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\GxClasses\GxClasses.csproj" />
Expand Down
2 changes: 0 additions & 2 deletions dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
</ItemGroup>

Expand Down
34 changes: 24 additions & 10 deletions dotnet/src/dotnetcore/GxClasses/GxClasses.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<Compile Include="..\..\dotnetframework\GxClasses\Model\URLRouter.cs" Link="Model\URLRouter.cs" />
<Compile Include="..\..\dotnetframework\GxClasses\Model\SdtGridState.cs" Link="Model\SdtGridState.cs" />
<Compile Include="..\..\dotnetframework\GxClasses\Model\SdtGridState_InputValuesItem.cs" Link="Model\SdtGridState_InputValuesItem.cs" />
<Compile Include="..\..\dotnetframework\GxClasses\Printer\GxPrinterDevice.cs" Link="Printer\GxPrinterDevice.cs" />
<Compile Include="..\..\dotnetframework\GxClasses\Security\WebSecurity.cs" Link="Security\WebSecurity.cs" />
<Compile Include="..\..\dotnetframework\GxClasses\Services\Caching\GxCache.cs" Link="Services\Caching\GxCache.cs" />
<Compile Include="..\..\dotnetframework\GxClasses\Domain\GxCollections.cs" Link="Domain\GxCollections.cs" />
Expand Down Expand Up @@ -150,22 +151,35 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Experimental.System.Messaging.Signed" Version="1.0.0" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" />
<PackageReference Include="log4net" Version="3.3.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.6" />
<!-- Override Microsoft.Data.SqlClient's vulnerable transitive Azure.Identity 1.11.4. Without
this, every consumer of the GeneXus.Classes.Core nupkg (generated GeneXus apps included)
inherits the 1.11.4 transitive and ships it in their bin. -->
<PackageReference Include="Azure.Identity" Version="1.21.0" />
<!-- OpenTelemetry 1.15.3 + Azure.Monitor.OpenTelemetry.Exporter 1.8.1 cascade these to v10.0
transitively. The OpenTelemetry refs below carry PrivateAssets="All" so the cascade does
not flow to consumers, which would then build against the net8.0 in-box 8.0 versions and
hit CS1705 type-mismatch with this assembly. Re-export the cascade transitive packages so
consumers resolve to the same 10.0 versions GxClasses was compiled against. -->
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.3" />
<PackageReference Include="System.Text.Json" Version="10.0.3" />
<!-- Azure.Monitor.OpenTelemetry.Exporter (PrivateAssets=All above) floors Azure.Core at 1.56,
but the public Azure.Identity floors it at 1.53. Without re-exporting 1.56, consumers
resolve 1.53 and hit MSB3277 against this assembly's 1.56. Pin it so the cascade flows. -->
<PackageReference Include="Azure.Core" Version="1.56.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" PrivateAssets="ALL" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" PrivateAssets="All" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" PrivateAssets="All" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.8.1" PrivateAssets="All" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" PrivateAssets="All" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="MySqlConnector" Version="2.2.3" />
<PackageReference Include="MySqlConnector" Version="2.5.0" />
<PackageReference Include="NetTopologySuite" Version="2.0.0" />
<PackageReference Include="NodaTime" Version="3.1.9" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.3.1" />
Expand All @@ -174,7 +188,7 @@
<PackageReference Include="Stubble.Core" Version="1.8.4" />
<PackageReference Include="System.DirectoryServices" Version="4.7.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.2" />
<PackageReference Include="GeneXus.Drawing.Common" Version="2.0.4" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
<PackageReference Include="NUglify" Version="1.16.4" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxExcel/GxExcel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="EPPlus" Version="4.5.3.2" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxMail/GxMail.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<PackageReference Include="MailKit" Version="3.1.1" />
<PackageReference Include="Microsoft.Exchange.WebServices" Version="2.2.0" />
<PackageReference Include="MimeKit" Version="3.1.1" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.84.0" />
<PackageReference Include="OpenPop" Version="2.0.6.2" />
<PackageReference Include="Org.Mentalis.Security" Version="1.0.0" />
</ItemGroup>
Expand Down
13 changes: 6 additions & 7 deletions dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.3" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.6" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.3" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.84.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />

<PackageReference Include="Azure.Identity" Version="1.11.0" PrivateAssets="All" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="OpenTelemetry" Version="1.7.0" PrivateAssets="All" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" PrivateAssets="All" />
<PackageReference Include="Azure.Identity" Version="1.21.0" PrivateAssets="All" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.8.1" PrivateAssets="All" />
<PackageReference Include="OpenTelemetry" Version="1.15.3" PrivateAssets="All" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" PrivateAssets="All" />

<PackageReference Include="itext7" Version="8.0.0" PrivateAssets="All" />
Expand Down
3 changes: 3 additions & 0 deletions dotnet/src/dotnetcore/GxOffice/GxOffice.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
<ItemGroup>
<PackageReference Include="NPOI" Version="2.5.6" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<!-- Override NPOI's vulnerable transitives (NPOI 2.7.x still depends on these older versions) -->
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.3" Condition="'$(TargetFramework)' == 'net8.0'" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="log4net" Version="3.3.1" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<EmbeddedResource Include="..\..\dotnetframework\GxPdfReportsCS\sRGB Color Space Profile.icm" Link="sRGB Color Space Profile.icm" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="PdfPig" Version="0.1.8" PrivateAssets="All"/>
<PackageReference Include="PdfPig" Version="0.1.8" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand All @@ -31,8 +31,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
<PackageReference Include="GeneXus.Drawing.Common" Version="2.0.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 11 additions & 2 deletions dotnet/src/dotnetcore/GxPdfReportsCS/PDFReportPDFPig.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
using System;
using System.Collections.Generic;
#if NETCORE
using GeneXus.Drawing;
using GeneXus.Drawing.Imaging;
using GeneXus.Drawing.Text;
using GeneXus.Drawing.Drawing2D;
using Color = GeneXus.Drawing.Color;
using Font = GeneXus.Drawing.Font;
#else
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using System.Drawing.Text;
using Color = System.Drawing.Color;
using Font = System.Drawing.Font;
#endif
using System.IO;
using System.Net.Http;
using System.Text;
Expand All @@ -14,8 +25,6 @@
using static GeneXus.Utils.StringUtil;
using static UglyToad.PdfPig.Writer.PdfDocumentBuilder;
using static UglyToad.PdfPig.Writer.PdfPageBuilder;
using Color = System.Drawing.Color;
using Font = System.Drawing.Font;
using PageSize = UglyToad.PdfPig.Content.PageSize;
using PdfRectangle = UglyToad.PdfPig.Core.PdfRectangle;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>

<PackageReference Include="Azure.Identity" Version="1.11.0" />
<PackageReference Include="Azure.Identity" Version="1.21.0" />
<PackageReference Include="Azure.Messaging.EventGrid" Version="4.20.0" />

</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>

<PackageReference Include="Azure.Identity" Version="1.11.0" />
<PackageReference Include="Azure.Identity" Version="1.21.0" />
<PackageReference Include="Azure.Storage.Queues" Version="12.16.0" />

</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>

<PackageReference Include="Azure.Identity" Version="1.11.0" />
<PackageReference Include="Azure.Identity" Version="1.21.0" />
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.16.2" />

</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void Stop()
}
public void RecordException(string message)
{
_activity?.RecordException(new Exception(message));
_activity?.AddException(new Exception(message));
}

public void SetStringAttribute(string property, string value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.14" NoWarn="NU5104" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.15.2" NoWarn="NU5104" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ public static TracerProviderBuilder AddGxAspNetInstrumentation(this TracerProvid
.AddSqlClientInstrumentation(opt =>
{
opt.RecordException = true;
opt.EnableConnectionLevelAttributes = true;
opt.SetDbStatementForText = true;
// OpenTelemetry.Instrumentation.SqlClient 1.15+ removed EnableConnectionLevelAttributes
// and SetDbStatementForText. Connection-level attributes and db.statement text are
// now emitted by default following the stable OpenTelemetry semantic conventions
// (gated by OTEL_SEMCONV_STABILITY_OPT_IN at the consumer's runtime if needed).
// For finer control re-enable via EnrichWithSqlCommand and manual Activity tagging.
});
string envvar = Environment.GetEnvironmentVariable("OTEL_TRACES_EXPORTER");
if (envvar != null && envvar.Contains("console"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
</PropertyGroup>
<ItemGroup>

<PackageReference Include="Azure.Identity" Version="1.11.0" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.1.0" />
<PackageReference Include="log4net.Ext.Json" Version="2.0.10.1" />
<PackageReference Include="Azure.Identity" Version="1.21.0" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.8.1" />
<PackageReference Include="log4net.Ext.Json" Version="3.0.3" />
<PackageReference Include="Microsoft.ApplicationInsights.Log4NetAppender" Version="2.22.0" />
<PackageReference Include="OpenTelemetry" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />

<PackageReference Include="OpenTelemetry" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />

</ItemGroup>
<ItemGroup>
Expand Down
Loading
Loading