Skip to content

Commit 2b4d20f

Browse files
authored
Merge pull request #15 from umairsyed613/12_AutoPurge
Functionality for auto purge, packages updated
2 parents 41b3587 + e6fc94d commit 2b4d20f

30 files changed

+699
-265
lines changed
Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup>
3+
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
19+
</dependentAssembly>
20+
</assemblyBinding>
21+
</runtime>
622
</configuration>

src/Sample/CustomSimpleTextLog/CustomSimpleTextLog.csproj

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>CustomSimpleTextLog</RootNamespace>
1010
<AssemblyName>CustomSimpleTextLog</AssemblyName>
11-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
@@ -33,8 +33,34 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36+
<Reference Include="mscorlib" />
37+
<Reference Include="Serilog, Version=4.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\Serilog.4.2.0\lib\net471\Serilog.dll</HintPath>
39+
</Reference>
3640
<Reference Include="System" />
41+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
43+
</Reference>
3744
<Reference Include="System.Core" />
45+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
47+
</Reference>
48+
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
50+
</Reference>
51+
<Reference Include="System.Numerics" />
52+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
53+
<HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
54+
</Reference>
55+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
57+
</Reference>
58+
<Reference Include="System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll</HintPath>
60+
</Reference>
61+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62+
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
63+
</Reference>
3864
<Reference Include="System.Xml.Linq" />
3965
<Reference Include="System.Data.DataSetExtensions" />
4066
<Reference Include="Microsoft.CSharp" />
@@ -66,6 +92,7 @@
6692
<AutoGen>True</AutoGen>
6793
<DependentUpon>Resources.resx</DependentUpon>
6894
</Compile>
95+
<None Include="packages.config" />
6996
<None Include="Properties\Settings.settings">
7097
<Generator>SettingsSingleFileGenerator</Generator>
7198
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -79,11 +106,6 @@
79106
<ItemGroup>
80107
<None Include="App.config" />
81108
</ItemGroup>
82-
<ItemGroup>
83-
<PackageReference Include="Serilog">
84-
<Version>2.10.0</Version>
85-
</PackageReference>
86-
</ItemGroup>
87109
<ItemGroup>
88110
<ProjectReference Include="..\..\Serilog.Sinks.WinForms.Base\Serilog.Sinks.WinForms.Base.csproj">
89111
<Project>{ccb237ee-bc54-435f-a0f2-0c13cbcf6e06}</Project>

src/Sample/CustomSimpleTextLog/Form1.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
92
using System.Windows.Forms;
103
using Serilog;
11-
using Serilog.Sinks.WinForms;
124
using Serilog.Sinks.WinForms.Base;
135

146
namespace CustomSimpleTextLog
@@ -36,4 +28,4 @@ private void button1_Click(object sender, EventArgs e)
3628
Log.Information(textBox2.Text);
3729
}
3830
}
39-
}
31+
}

src/Sample/CustomSimpleTextLog/Program.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
52
using System.Windows.Forms;
6-
73
using Serilog;
84
using Serilog.Sinks.WinForms.Base;
95

@@ -20,10 +16,10 @@ static void Main()
2016
Log.Logger = new LoggerConfiguration()
2117
.WriteToSimpleAndRichTextBox()
2218
.CreateLogger();
23-
19+
2420
Application.EnableVisualStyles();
2521
Application.SetCompatibleTextRenderingDefault(false);
2622
Application.Run(new Form1());
2723
}
2824
}
29-
}
25+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Serilog" version="4.2.0" targetFramework="net481" />
4+
<package id="System.Buffers" version="4.5.1" targetFramework="net481" />
5+
<package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net481" />
6+
<package id="System.Memory" version="4.5.5" targetFramework="net481" />
7+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net481" />
8+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net481" />
9+
<package id="System.Threading.Channels" version="8.0.0" targetFramework="net481" />
10+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net481" />
11+
</packages>
Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup>
3+
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
19+
</dependentAssembly>
20+
<dependentAssembly>
21+
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
23+
</dependentAssembly>
24+
<dependentAssembly>
25+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
26+
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
27+
</dependentAssembly>
28+
<dependentAssembly>
29+
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
30+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
31+
</dependentAssembly>
32+
<dependentAssembly>
33+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
34+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
35+
</dependentAssembly>
36+
</assemblyBinding>
37+
</runtime>
638
</configuration>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<linker>
2+
<assembly fullname="System.Diagnostics.DiagnosticSource">
3+
<type fullname="System.Diagnostics.Metrics.MetricsEventSource">
4+
<!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
5+
<method name="GetInstance" />
6+
</type>
7+
</assembly>
8+
</linker>

src/Sample/TestApplication/LogVieweer.Designer.cs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Sample/TestApplication/TestApplication.csproj

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>TestApplication</RootNamespace>
1010
<AssemblyName>TestApplication</AssemblyName>
11-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
@@ -33,11 +33,37 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
37-
<HintPath>..\..\packages\Serilog.2.10.0\lib\net46\Serilog.dll</HintPath>
36+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
37+
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
38+
</Reference>
39+
<Reference Include="mscorlib" />
40+
<Reference Include="Serilog, Version=4.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\Serilog.4.2.0\lib\net471\Serilog.dll</HintPath>
3842
</Reference>
3943
<Reference Include="System" />
44+
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
46+
</Reference>
4047
<Reference Include="System.Core" />
48+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
50+
</Reference>
51+
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
53+
</Reference>
54+
<Reference Include="System.Numerics" />
55+
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
57+
</Reference>
58+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
60+
</Reference>
61+
<Reference Include="System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62+
<HintPath>..\..\packages\System.Threading.Channels.9.0.0\lib\net462\System.Threading.Channels.dll</HintPath>
63+
</Reference>
64+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
66+
</Reference>
4167
<Reference Include="System.Xml.Linq" />
4268
<Reference Include="System.Data.DataSetExtensions" />
4369
<Reference Include="Microsoft.CSharp" />
@@ -129,5 +155,8 @@
129155
<Name>Serilog.Sinks.WinForms</Name>
130156
</ProjectReference>
131157
</ItemGroup>
158+
<ItemGroup>
159+
<Content Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
160+
</ItemGroup>
132161
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
133162
</Project>
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Serilog" version="2.10.0" targetFramework="net48" />
3+
<package id="Serilog" version="4.2.0" targetFramework="net481" />
4+
<package id="System.Threading.Channels" version="9.0.0" targetFramework="net481" />
5+
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net481" />
6+
<package id="System.Buffers" version="4.6.0" targetFramework="net481" />
7+
<package id="System.Diagnostics.DiagnosticSource" version="9.0.0" targetFramework="net481" />
8+
<package id="System.Memory" version="4.6.0" targetFramework="net481" />
9+
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net481" />
10+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net481" />
11+
<package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net481" />
412
</packages>

0 commit comments

Comments
 (0)