Skip to content

Commit 55fd966

Browse files
sommmensommmen
committed
fix: merge and fix
2 parents 1a859ad + 81b8163 commit 55fd966

File tree

9 files changed

+42
-43
lines changed

9 files changed

+42
-43
lines changed

‎src/Serilog.Ui.ElasticSearchProvider/Serilog.Ui.ElasticSearchProvider.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
10-
<PackageReference Include="NEST" Version="7.11.1" />
9+
<PackageReference Include="NEST" Version="7.11.1" />
1110
<PackageReference Include="NEST.JsonNetSerializer" Version="7.11.1" />
1211
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1312
</ItemGroup>

‎src/Serilog.Ui.ElasticSearchProvider/Serilog.Ui.ElasticSearchProvider.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<releaseNotes></releaseNotes>
1414
<copyright></copyright>
1515
<tags>serilog serilog-ui serilog.sinks.elasticsearch</tags>
16-
<icon>assets\icon.png</icon>
16+
<icon>assets\icon.png</icon>
1717
<dependencies>
1818
<group targetFramework=".NETStandard2.0">
1919
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />

‎src/Serilog.Ui.MongoDbProvider/Serilog.Ui.MongoDbProvider.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<releaseNotes></releaseNotes>
1515
<copyright></copyright>
1616
<tags>serilog serilog-ui serilog.sinks.mongodb</tags>
17-
<icon>assets\icon.png</icon>
17+
<icon>assets\icon.png</icon>
1818
<dependencies>
1919
<group targetFramework=".NETStandard2.0">
2020
<dependency id="Microsoft.CSharp" version="4.7.0" />

‎src/Serilog.Ui.MsSqlServerProvider/Serilog.Ui.MsSqlServerProvider.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<Version>2.1.1</Version>
5+
<Version>2.1.2</Version>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="Dapper" Version="2.0.35" />
10-
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.1" />
10+
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/Serilog.Ui.MsSqlServerProvider/Serilog.Ui.MsSqlServerProvider.nuspec

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3-
<metadata>
4-
<id>Serilog.UI.MsSqlServerProvider</id>
5-
<version>$version$</version>
6-
<title>Serilog.UI.MsSqlServerProvider</title>
7-
<authors>Mohsen Esmailpour</authors>
8-
<owners>mo.esmp</owners>
9-
<projectUrl>https://github.com/mo-esmp/serilog-ui</projectUrl>
10-
<license type="expression">MIT</license>
11-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12-
<description>Microsoft SQL Server data provider for Serilog UI.</description>
13-
<readme>docs\README.md</readme>
14-
<releaseNotes></releaseNotes>
15-
<copyright></copyright>
16-
<tags>serilog serilog-ui serilog.sinks.mssqlserver</tags>
17-
<icon>assets\icon.png</icon>
18-
<dependencies>
19-
<group targetFramework=".NETStandard2.0">
20-
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />
21-
<dependency id="Dapper" version="2.0.35" exclude="Build,Analyzers" />
22-
<dependency id="Microsoft.Data.SqlClient" version="2.1.1" exclude="Build,Analyzers" />
23-
</group>
24-
</dependencies>
25-
</metadata>
26-
<files>
27-
<file src="bin\Release\netstandard2.0\*.dll" target="lib/netstandard2.0" />
28-
<file src="..\..\README.md" target="docs\" />
29-
<file src="..\..\assets\icon.png" target="assets\" />
30-
</files>
3+
<metadata>
4+
<id>Serilog.UI.MsSqlServerProvider</id>
5+
<version>$version$</version>
6+
<title>Serilog.UI.MsSqlServerProvider</title>
7+
<authors>Mohsen Esmailpour</authors>
8+
<owners>mo.esmp</owners>
9+
<projectUrl>https://github.com/mo-esmp/serilog-ui</projectUrl>
10+
<license type="expression">MIT</license>
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<description>Microsoft SQL Server data provider for Serilog UI.</description>
13+
<readme>docs\README.md</readme>
14+
<releaseNotes></releaseNotes>
15+
<copyright></copyright>
16+
<tags>serilog serilog-ui serilog.sinks.mssqlserver</tags>
17+
<icon>assets\icon.png</icon>
18+
<dependencies>
19+
<group targetFramework=".NETStandard2.0">
20+
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />
21+
<dependency id="Dapper" version="2.0.35" exclude="Build,Analyzers" />
22+
<dependency id="Microsoft.Data.SqlClient" version="2.1.2" exclude="Build,Analyzers" />
23+
</group>
24+
</dependencies>
25+
</metadata>
26+
<files>
27+
<file src="bin\Release\netstandard2.0\*.dll" target="lib/netstandard2.0" />
28+
<file src="..\..\README.md" target="docs\" />
29+
<file src="..\..\assets\icon.png" target="assets\" />
30+
</files>
3131
</package>

‎src/Serilog.Ui.MySqlProvider/Serilog.Ui.MySqlProvider.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<releaseNotes></releaseNotes>
1414
<copyright></copyright>
1515
<tags>serilog serilog-ui serilog.sinks.mysql serilog.sinks.mariadb</tags>
16-
<icon>assets\icon.png</icon>
16+
<icon>assets\icon.png</icon>
1717
<dependencies>
1818
<group targetFramework=".NETStandard2.0">
1919
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />

‎src/Serilog.Ui.PostgreSqlProvider/Serilog.Ui.PostgreSqlProvider.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<releaseNotes></releaseNotes>
1414
<copyright></copyright>
1515
<tags>serilog serilog-ui serilog.sinks.postgresql</tags>
16-
<icon>assets\icon.png</icon>
16+
<icon>assets\icon.png</icon>
1717
<dependencies>
1818
<group targetFramework=".NETStandard2.0">
1919
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />

‎src/Serilog.Ui.Web/Serilog.UI.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<copyright></copyright>
1616
<tags>serilog serilog-ui log logui log-ui web-log</tags>
1717
<icon>assets\icon.png</icon>
18-
<dependencies>
18+
<dependencies>
1919
<group targetFramework=".NETCoreApp3.1">
2020
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />
2121
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />

‎src/Serilog.Ui.Web/package-lock.json

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

0 commit comments

Comments
 (0)