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
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxClasses/GxClasses.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Experimental.System.Messaging.Signed" Version="1.0.0" />
<PackageReference Include="log4net" Version="3.3.0" />
<PackageReference Include="log4net" Version="3.3.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.6" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="log4net" Version="3.3.0" />
<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>
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ private static string NormalizeLanguageName(string langCode)
#if NETCORE
public static IConfiguration ConfigRoot { get ; set; }
const string Log4NetShortName = "log4net";
static Version Log4NetVersion = new Version(3, 3, 0, 0);
static Version Log4NetVersion = new Version(3, 3, 1, 0);

const string ConfigurationManagerBak = "System.Configuration.ConfigurationManager, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51";
const string ConfigurationManagerFileName = "System.Configuration.ConfigurationManager.dll";
Expand Down Expand Up @@ -504,7 +504,7 @@ private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEven
#else
static Dictionary<string, Version> AssemblyRedirect = new Dictionary<string, Version>
{
{"log4net", new Version(3, 3, 0, 0) },
{"log4net", new Version(3, 3, 1, 0) },
{ "System.Threading.Tasks.Extensions", new Version(4, 2, 0, 1) },
{ "System.Runtime.CompilerServices.Unsafe", new Version(4, 0, 4, 1) },
{ "System.Buffers", new Version(4, 0, 5, 0)},
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetframework/GxClasses/GxClasses.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageReference Include="Microsoft.Win32.Registry" Version="4.3.0" />
<PackageReference Include="Nustache" Version="1.16.0.10" />
<PackageReference Include="SecurityCodeScan" PrivateAssets="all" Version="3.3.0" />
<PackageReference Include="log4net" Version="3.3.0" />
<PackageReference Include="log4net" Version="3.3.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
Expand Down
Loading