Skip to content

Commit cfb4585

Browse files
mo-esmpmo-esmp
authored
Merge pull request #68 from mo-esmp/fix/fix-nuspecs
Align nusepc files with csproj files.
2 parents 2ee1c80 + b54ea49 commit cfb4585

File tree

13 files changed

+112
-102
lines changed

13 files changed

+112
-102
lines changed

‎samples/SampleWebApp/Startup.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.Extensions.DependencyInjection;
88
using Microsoft.Extensions.Hosting;
99
using Microsoft.IdentityModel.Tokens;
10-
using SampleWebApp.Authentication;
1110
using SampleWebApp.Authentication.Jwt;
1211
using SampleWebApp.Data;
1312
using Serilog.Ui.MsSqlServerProvider;
@@ -81,11 +80,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
8180
options.RoutePrefix = "serilog-ui";
8281
options.HomeUrl = "/#Test";
8382
options.InjectJavascript("/js/serilog-ui/custom.js");
84-
options.Authorization = new AuthorizationOptions
85-
{
86-
AuthenticationType = AuthenticationType.Jwt,
87-
Filters = new[] { new SerilogUiCustomAuthFilter() }
88-
};
83+
//options.Authorization = new AuthorizationOptions
84+
//{
85+
// AuthenticationType = AuthenticationType.Jwt,
86+
// Filters = new[] { new SerilogUiCustomAuthFilter() }
87+
//};
8988
});
9089

9190
app.UseEndpoints(endpoints =>

‎src/Serilog.Ui.Core/Serilog.Ui.Core.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<LangVersion>latest</LangVersion>
56
<Version>2.1.0</Version>
67
</PropertyGroup>
78

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

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

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<Version>2.1.0</Version>
5+
<LangVersion>latest</LangVersion>
6+
<Version>2.1.1</Version>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
1010
<PackageReference Include="NEST" Version="7.11.1" />
1111
<PackageReference Include="NEST.JsonNetSerializer" Version="7.11.1" />
1212
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />

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

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
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.ElasticSearchProvider</id>
5-
<version>$version$</version>
6-
<title>Serilog.Ui.ElasticSearchProvider</title>
7-
<authors>Ricardo Demauro - rmauro.dev</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>ElasticSearch data provider for Serilog UI.</description>
13-
<releaseNotes></releaseNotes>
14-
<copyright></copyright>
15-
<tags>serilog serilog-ui serilog.sinks.elasticsearch</tags>
16-
<icon>assets\icon.png</icon>
17-
<dependencies>
18-
<group targetFramework=".NETStandard2.0">
19-
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />
20-
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" exclude="Build,Analyzers" />
21-
<dependency id="NEST" version="7.11.1" exclude="Build,Analyzers" />
22-
<dependency id="NEST.JsonNetSerializer" version="7.11.1" exclude="Build,Analyzers" />
23-
<dependency id="Newtonsoft.Json" version="12.0.3" exclude="Build,Analyzers" />
24-
</group>
25-
</dependencies>
26-
</metadata>
27-
<files>
28-
<file src="bin\Release\netstandard2.0\*.dll" target="lib/netstandard2.0" />
29-
<file src="..\..\assets\icon.png" target="assets\" />
30-
</files>
3+
<metadata>
4+
<id>Serilog.UI.ElasticSearchProvider</id>
5+
<version>$version$</version>
6+
<title>Serilog.Ui.ElasticSearchProvider</title>
7+
<authors>Ricardo Demauro - rmauro.dev</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>ElasticSearch data provider for Serilog UI.</description>
13+
<releaseNotes></releaseNotes>
14+
<copyright></copyright>
15+
<tags>serilog serilog-ui serilog.sinks.elasticsearch</tags>
16+
<icon>assets\icon.png</icon>
17+
<dependencies>
18+
<group targetFramework=".NETStandard2.0">
19+
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />
20+
<dependency id="NEST" version="7.11.1" exclude="Build,Analyzers" />
21+
<dependency id="NEST.JsonNetSerializer" version="7.11.1" exclude="Build,Analyzers" />
22+
<dependency id="Newtonsoft.Json" version="13.0.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="..\..\assets\icon.png" target="assets\" />
29+
</files>
3130
</package>

‎src/Serilog.Ui.MongoDbProvider/Serilog.Ui.MongoDbProvider.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<Version>2.2.0</Version>
5+
<LangVersion>latest</LangVersion>
6+
<Version>2.2.1</Version>
67
</PropertyGroup>
78

89
<ItemGroup>

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

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +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.MongoDbProvider</id>
5-
<version>$version$</version>
6-
<title>Serilog.UI.MongoDbProvider</title>
7-
<authors>Christian Haase</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>MongoDB 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.mongodb</tags>
17-
<icon>assets\icon.png</icon>
18-
<dependencies>
19-
<group targetFramework=".NETStandard2.0">
20-
<dependency id="Microsoft.CSharp" version="4.7.0" />
21-
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />
22-
<dependency id="MongoDB.Driver" version="2.11.5" exclude="Build,Analyzers" />
23-
<dependency id="Newtonsoft.Json" version="12.0.3" exclude="Build,Analyzers" />
24-
</group>
25-
</dependencies>
26-
</metadata>
27-
<files>
28-
<file src="bin\Release\netstandard2.0\*.dll" target="lib/netstandard2.0" />
29-
<file src="..\..\README.md" target="docs\" />
30-
<file src="..\..\assets\icon.png" target="assets\" />
31-
</files>
3+
<metadata>
4+
<id>Serilog.UI.MongoDbProvider</id>
5+
<version>$version$</version>
6+
<title>Serilog.UI.MongoDbProvider</title>
7+
<authors>Christian Haase</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>MongoDB 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.mongodb</tags>
17+
<icon>assets\icon.png</icon>
18+
<dependencies>
19+
<group targetFramework=".NETStandard2.0">
20+
<dependency id="Microsoft.CSharp" version="4.7.0" />
21+
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />
22+
<dependency id="MongoDB.Driver" version="2.11.5" exclude="Build,Analyzers" />
23+
<dependency id="Newtonsoft.Json" version="13.0.2" exclude="Build,Analyzers" />
24+
</group>
25+
</dependencies>
26+
</metadata>
27+
<files>
28+
<file src="bin\Release\netstandard2.0\*.dll" target="lib/netstandard2.0" />
29+
<file src="..\..\assets\icon.png" target="assets\" />
30+
</files>
3231
</package>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<Version>2.1.2</Version>
5+
<LangVersion>latest</LangVersion>
6+
<Version>2.1.3</Version>
67
</PropertyGroup>
78

89
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<group targetFramework=".NETStandard2.0">
2020
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.3" exclude="Build,Analyzers" />
2121
<dependency id="Dapper" version="2.0.35" exclude="Build,Analyzers" />
22-
<dependency id="Microsoft.Data.SqlClient" version="2.1.2" exclude="Build,Analyzers" />
22+
<dependency id="Microsoft.Data.SqlClient" version="5.1.0" exclude="Build,Analyzers" />
2323
</group>
2424
</dependencies>
2525
</metadata>

‎src/Serilog.Ui.MySqlProvider/Serilog.Ui.MySqlProvider.csproj

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

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<LangVersion>latest</LangVersion>
6+
<Version>2.1.0</Version>
57
</PropertyGroup>
68

79
<ItemGroup>

‎src/Serilog.Ui.PostgreSqlProvider/Serilog.Ui.PostgreSqlProvider.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
6-
<Version>2.1.0</Version>
6+
<Version>2.1.1</Version>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Npgsql" Version="6.0.9" />
1110
<PackageReference Include="Dapper" Version="2.0.35" />
11+
<PackageReference Include="Npgsql" Version="6.0.9" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

0 commit comments

Comments
 (0)