Skip to content

Commit 93b9f8f

Browse files
ocinbatocinbat
committed
Removed NLog dependency restriction.
1 parent 9714c22 commit 93b9f8f

8 files changed

+24
-8
lines changed

‎Trendyol.App.NLog/Trendyol.App.NLog.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
50-
<HintPath>..\packages\NLog.4.3.8\lib\net45\NLog.dll</HintPath>
51-
<Private>True</Private>
50+
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
5251
</Reference>
5352
<Reference Include="NLog.Targets.Gelf, Version=0.2.1.0, Culture=neutral, processorArchitecture=MSIL">
5453
<HintPath>..\packages\NLog.Targets.Gelf.1.0.0\lib\net40\NLog.Targets.Gelf.dll</HintPath>

‎Trendyol.App.NLog/Trendyol.App.NLog.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>Trendyol.App.NLog</id>
5-
<version>2.0.1</version>
5+
<version>3.0.0</version>
66
<title>Trendyol.App.NLog</title>
77
<authors>trendyol ocinbat</authors>
88
<owners>trendyol ocinbat</owners>
@@ -17,7 +17,7 @@
1717
<dependency id="Common.Logging" version="3.3.1" />
1818
<dependency id="Common.Logging.Core" version="3.3.1" />
1919
<dependency id="Common.Logging.NLog41" version="3.3.1" />
20-
<dependency id="NLog" version="[4.3.8]" />
20+
<dependency id="NLog" version="4.3.8" />
2121
<dependency id="NLog.Targets.Gelf" version="[1.0.0]" />
2222
<dependency id="Newtonsoft.Json" version="9.0.1" />
2323
</dependencies>

‎Trendyol.App.NLog/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net461" />
55
<package id="Common.Logging.NLog41" version="3.3.1" targetFramework="net461" />
66
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
7-
<package id="NLog" version="4.3.8" targetFramework="net461" />
7+
<package id="NLog" version="4.4.12" targetFramework="net461" />
88
<package id="NLog.Targets.Gelf" version="1.0.0" targetFramework="net461" />
99
</packages>

‎WindowsService/NLog.config

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<nlog p1:schemaLocation="http://www.nlog-team.org/schemas/NLog.xsd NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true" throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" xmlns:p1="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.nlog-team.org/schemas/NLog.xsd">
2+
<nlog p1:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true" throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" xmlns:p1="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.nlog-project.org/schemas/NLog.xsd">
3+
<extensions>
4+
<add assembly="NLog.Targets.Gelf"/>
5+
</extensions>
36
<variable name="applicationName" value="TrendyolApp.WindowsService"/>
47
<variable name="logFilePath" value="C:\@Logs\${shortdate}-${level}-${applicationName}.txt" />
58
<variable name="seperator" value="********************************" />
@@ -9,9 +12,10 @@
912
<target name="TraceFile" p1:type="File" layout="${defaultLayout}" filename="${logFilePath}" concurrentWrites="false" />
1013
<target name="DebugFile" p1:type="File" layout="${defaultLayout}" filename="${logFilePath}" concurrentWrites="false" />
1114
<target name="ErrorFile" p1:type="File" layout="${errorLayout}" filename="${logFilePath}" concurrentWrites="false" />
15+
<target name="graylog" xsi:type="gelf" endpoint="udp://log.stark.ist:12201" facility="${applicationName}" sendLastFormatParameter="true"/>
1216
</targets>
1317
<rules>
14-
<logger level="Debug" writeTo="DebugFile" />
18+
<logger level="Debug" writeTo="DebugFile,graylog" />
1519
<logger level="Trace" writeTo="TraceFile" />
1620
<logger level="Error" writeTo="ErrorFile" />
1721
<logger name="Hangfire.*" level="Off" />

‎WindowsService/SampleWindowsService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class SampleWindowsService : TrendyolWindowsService
1010

1111
public override void Start()
1212
{
13-
backgroundJobManager.Register<TestJob>(5000);
13+
backgroundJobManager.Register<TestJob>(1000);
1414
backgroundJobManager.UseAutofacActivator();
1515
backgroundJobManager.Start();
1616
}

‎WindowsService/TestJob.cs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class TestJob : IJob
1414

1515
public async Task Run()
1616
{
17+
Logger.Debug($"hamza2");
1718
}
1819
}
1920
}

‎WindowsService/WindowsService.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@
4747
<HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
52+
</Reference>
53+
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
54+
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
55+
</Reference>
56+
<Reference Include="NLog.Targets.Gelf, Version=0.2.1.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\NLog.Targets.Gelf.1.0.0\lib\net40\NLog.Targets.Gelf.dll</HintPath>
58+
</Reference>
5059
<Reference Include="PostSharp, Version=4.3.31.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
5160
<HintPath>..\packages\PostSharp.4.3.31\lib\net35-client\PostSharp.dll</HintPath>
5261
<Private>True</Private>

‎WindowsService/packages.config

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<package id="Autofac" version="4.2.1" targetFramework="net461" />
44
<package id="Common.Logging" version="3.3.1" targetFramework="net461" />
55
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net461" />
6+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
7+
<package id="NLog" version="4.4.12" targetFramework="net461" />
8+
<package id="NLog.Targets.Gelf" version="1.0.0" targetFramework="net461" />
69
<package id="PostSharp" version="4.3.31" targetFramework="net461" />
710
<package id="RestSharp" version="105.2.3" targetFramework="net461" />
811
<package id="Topshelf" version="4.0.3" targetFramework="net461" />

0 commit comments

Comments
 (0)