github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

Bump log4net to 2.0.12

pull/758/head
NextTurn 2020-04-06 00:00:00 +08:00 committed by Next Turn
parent 7b23c949c4
commit 0df32ccd44
5 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/WinSW.Core/Native/Throw.cs
View File

@ -67,6 +67,7 @@ namespace WinSW.Native
} }
/// <exception cref="CommandException" /> /// <exception cref="CommandException" />
[DoesNotReturn]
[MethodImpl(MethodImplOptions.NoInlining)] [MethodImpl(MethodImplOptions.NoInlining)]
internal static void Win32Exception(string message) internal static void Win32Exception(string message)
{ {

13
src/WinSW.Core/WinSW.Core.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="log4net" Version="2.0.8" /> <PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.*"> <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
@ -17,19 +17,8 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'"> <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0" /> <PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
</ItemGroup>
<!-- error NU1605: Detected package downgrade: log4net 2.0.8 -->
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" /> <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
<PackageReference Include="System.Threading" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net5.0-windows'"> <ItemGroup Condition="'$(TargetFramework)' != 'net5.0-windows'">

20
src/WinSW/Program.cs
View File

@ -1177,9 +1177,7 @@ namespace WinSW
var consoleLogLevel = Level.Info; var consoleLogLevel = Level.Info;
var eventLogLevel = Level.Warn; var eventLogLevel = Level.Warn;
#if NET
var repository = LogManager.GetRepository(Assembly.GetExecutingAssembly()); var repository = LogManager.GetRepository(Assembly.GetExecutingAssembly());
#endif
if (inConsoleMode) if (inConsoleMode)
{ {
@ -1191,11 +1189,7 @@ namespace WinSW
}; };
consoleAppender.ActivateOptions(); consoleAppender.ActivateOptions();
BasicConfigurator.Configure( BasicConfigurator.Configure(repository, consoleAppender);
#if NET
repository,
#endif
consoleAppender);
} }
else else
{ {
@ -1206,11 +1200,7 @@ namespace WinSW
}; };
eventLogAppender.ActivateOptions(); eventLogAppender.ActivateOptions();
BasicConfigurator.Configure( BasicConfigurator.Configure(repository, eventLogAppender);
#if NET
repository,
#endif
eventLogAppender);
} }
XmlServiceConfig config; XmlServiceConfig config;
@ -1243,11 +1233,7 @@ namespace WinSW
}; };
fileAppender.ActivateOptions(); fileAppender.ActivateOptions();
BasicConfigurator.Configure( BasicConfigurator.Configure(repository, fileAppender);
#if NET
repository,
#endif
fileAppender);
return config; return config;
} }

4
src/WinSW/WinSW.csproj
View File

@ -28,10 +28,6 @@
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20303.1" /> <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20303.1" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net5.0-windows'"> <ItemGroup Condition="'$(TargetFramework)' != 'net5.0-windows'">
<PackageReference Include="ilmerge" Version="$(ILMergeVersion)" /> <PackageReference Include="ilmerge" Version="$(ILMergeVersion)" />
<Reference Include="System.ServiceProcess" /> <Reference Include="System.ServiceProcess" />

6
src/WinSW/WrapperService.cs
View File

@ -21,11 +21,7 @@ namespace WinSW
private static readonly int additionalStopTimeout = 1_000; private static readonly int additionalStopTimeout = 1_000;
private static readonly ILog Log = LogManager.GetLogger( private static readonly ILog Log = LogManager.GetLogger(typeof(WrapperService));
#if NET
Assembly.GetExecutingAssembly(),
#endif
"WinSW");
private readonly XmlServiceConfig config; private readonly XmlServiceConfig config;