Skip to content

Commit 667cf1d

Browse files
Upgrade log4net to 3.3.0 and remove obsolete app.config files (#1268)
* Upgrade log4net to 3.3.0 and remove obsolete app.config files * Upgrade log4net to 3.3.0
1 parent b5d6f6b commit 667cf1d

20 files changed

Lines changed: 6 additions & 197 deletions

File tree

dotnet/src/dotnetcore/GxClasses/GxClasses.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
</ItemGroup>
134134
<ItemGroup>
135135
<PackageReference Include="Experimental.System.Messaging.Signed" Version="1.0.0" />
136-
<PackageReference Include="log4net" Version="2.0.15" />
136+
<PackageReference Include="log4net" Version="3.3.0" />
137137
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.6" />
138138
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" PrivateAssets="All" />
139139
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">

dotnet/src/dotnetcore/GxPdfReportsCS.Itext4/GxPdfReportsCS.Itext4.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="log4net" Version="2.0.15" />
18+
<PackageReference Include="log4net" Version="3.3.0" />
1919
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
24-
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
2523
</ItemGroup>
2624

2725
<ItemGroup>

dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/GeneXus.OpenTelemetry.Azure.AppInsights.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<PackageReference Include="Azure.Identity" Version="1.11.4" />
1515
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.1.0" />
16-
<PackageReference Include="log4net.Ext.Json" Version="2.0.10.1" />
16+
<PackageReference Include="log4net.Ext.Json" Version="3.0.3" />
1717
<PackageReference Include="Microsoft.ApplicationInsights.Log4NetAppender" Version="2.22.0" />
1818

1919
<PackageReference Include="OpenTelemetry" Version="1.7.0" />

dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ private static string NormalizeLanguageName(string langCode)
457457
#if NETCORE
458458
public static IConfiguration ConfigRoot { get ; set; }
459459
const string Log4NetShortName = "log4net";
460-
static Version Log4NetVersion = new Version(2, 0, 15);
460+
static Version Log4NetVersion = new Version(3, 3, 0, 0);
461461

462462
const string ConfigurationManagerBak = "System.Configuration.ConfigurationManager, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51";
463463
const string ConfigurationManagerFileName = "System.Configuration.ConfigurationManager.dll";
@@ -504,7 +504,7 @@ private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEven
504504
#else
505505
static Dictionary<string, Version> AssemblyRedirect = new Dictionary<string, Version>
506506
{
507-
{"log4net", new Version(2, 0, 11) },
507+
{"log4net", new Version(3, 3, 0, 0) },
508508
{ "System.Threading.Tasks.Extensions", new Version(4, 2, 0, 1) },
509509
{ "System.Runtime.CompilerServices.Unsafe", new Version(4, 0, 4, 1) },
510510
{ "System.Buffers", new Version(4, 0, 5, 0)},

dotnet/src/dotnetframework/GxClasses/GxClasses.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="Microsoft.Win32.Registry" Version="4.3.0" />
2121
<PackageReference Include="Nustache" Version="1.16.0.10" />
2222
<PackageReference Include="SecurityCodeScan" PrivateAssets="all" Version="3.3.0" />
23-
<PackageReference Include="log4net" Version="2.0.11" />
23+
<PackageReference Include="log4net" Version="3.3.0" />
2424
<PackageReference Include="System.Net.Http" Version="4.3.4" />
2525
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0" />
2626
<PackageReference Include="System.Text.Json" Version="8.0.5" />

dotnet/src/dotnetframework/GxClasses/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

dotnet/src/dotnetframework/GxDataInitialization/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

dotnet/src/dotnetframework/GxMail/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

dotnet/src/dotnetframework/GxPdfReportsCS/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

dotnet/src/dotnetframework/GxSearch/app.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)