Skip to content

Commit 76fc7d9

Browse files
nblumhardtnblumhardt
authored
Merge pull request #45 from serilog/dev
2.3.1 Release
2 parents 25cbf7b + 7ce6fa9 commit 76fc7d9

21 files changed

+125
-11512
lines changed

Diff for: ‎Build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ foreach ($src in ls src/*) {
2020

2121
echo "build: Packaging project in $src"
2222

23-
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
23+
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix --include-source
2424
if($LASTEXITCODE -ne 0) { exit 1 }
2525

2626
Pop-Location

Diff for: ‎NuGet.config

-8
This file was deleted.

Diff for: ‎appveyor.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
version: '{build}'
22
skip_tags: true
3-
image: Visual Studio 2015
3+
image: Visual Studio 2017
44
configuration: Release
55
install:
66
- ps: mkdir -Force ".\build\" | Out-Null
7-
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
7+
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
88
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
9-
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
9+
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.1'
1010
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
1111
build_script:
1212
- ps: ./Build.ps1
@@ -26,5 +26,4 @@ deploy:
2626
artifact: /Serilog.*\.nupkg/
2727
tag: v$(appveyor_build_version)
2828
on:
29-
branch: master
30-
29+
branch: master

Diff for: ‎global.json

-6
This file was deleted.

Diff for: ‎sample/Sample/Properties/AssemblyInfo.cs

-23
This file was deleted.

Diff for: ‎sample/Sample/Sample.csproj

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
5+
<OutputType>Exe</OutputType>
6+
</PropertyGroup>
7+
8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
9+
<PreserveCompilationContext>false</PreserveCompilationContext>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<ProjectReference Include="..\..\src\Serilog.Settings.Configuration\Serilog.Settings.Configuration.csproj" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.0" />
18+
<PackageReference Include="Serilog.Sinks.Literate" Version="2.0.0" />
19+
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.0.0" />
20+
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.0.0" />
21+
<PackageReference Include="Serilog.Enrichers.Thread" Version="2.0.0" />
22+
<PackageReference Include="Serilog.Filters.Expressions" Version="1.0.0" />
23+
</ItemGroup>
24+
25+
</Project>

Diff for: ‎sample/Sample/Sample.xproj

-20
This file was deleted.

Diff for: ‎sample/Sample/project.json

-34
This file was deleted.

Diff for: ‎serilog-settings-configuration.sln

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.10
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4E41FD57-5FAB-4E3C-B16E-463DE98338BC}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{62D0B904-1D11-4962-A4A8-DE28672AA28B}"
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{62D0B904-1D11-4962-A4A8-DE28672AA28B}"
99
ProjectSection(SolutionItems) = preProject
1010
appveyor.yml = appveyor.yml
1111
Build.ps1 = Build.ps1
12-
global.json = global.json
12+
CHANGES.md = CHANGES.md
1313
LICENSE = LICENSE
1414
README.md = README.md
1515
EndProjectSection
1616
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Settings.Configuration", "src\Serilog.Settings.Configuration\Serilog.Settings.Configuration.xproj", "{21FF98ED-E68C-4A67-B241-C8D6122FAD7D}"
18-
EndProject
1917
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D551DCB0-7771-4D01-BEBD-F7B57D1CF0E3}"
2018
EndProject
21-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Settings.Configuration.Tests", "test\Serilog.Settings.Configuration.Tests\Serilog.Settings.Configuration.Tests.xproj", "{F793C6E8-C40A-4018-8884-C97E2BE38A54}"
22-
EndProject
2319
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{D24872B9-57F3-42A7-BC8D-F9DA222FCE1B}"
2420
EndProject
25-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sample", "sample\Sample\Sample.xproj", "{A00E5E32-54F9-401A-BBA1-2F6FCB6366CD}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Settings.Configuration", "src\Serilog.Settings.Configuration\Serilog.Settings.Configuration.csproj", "{21FF98ED-E68C-4A67-B241-C8D6122FAD7D}"
22+
EndProject
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Settings.Configuration.Tests", "test\Serilog.Settings.Configuration.Tests\Serilog.Settings.Configuration.Tests.csproj", "{F793C6E8-C40A-4018-8884-C97E2BE38A54}"
24+
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "sample\Sample\Sample.csproj", "{A00E5E32-54F9-401A-BBA1-2F6FCB6366CD}"
2626
EndProject
2727
Global
2828
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Diff for: ‎src/Serilog.Settings.Configuration/ConfigurationLoggerConfigurationExtensions.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Microsoft.Extensions.DependencyModel;
1818
using Serilog.Configuration;
1919
using Serilog.Settings.Configuration;
20+
using System.Reflection;
2021

2122
namespace Serilog
2223
{
@@ -59,8 +60,11 @@ public static LoggerConfiguration ConfigurationSection(
5960
{
6061
if (settingConfiguration == null) throw new ArgumentNullException(nameof(settingConfiguration));
6162
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
62-
63-
return settingConfiguration.Settings(new ConfigurationReader(configuration, dependencyContext ?? DependencyContext.Default));
63+
64+
return settingConfiguration.Settings(
65+
new ConfigurationReader(
66+
configuration,
67+
dependencyContext ?? (Assembly.GetEntryAssembly() != null ? DependencyContext.Default : null)));
6468
}
6569
}
6670
}

Diff for: ‎src/Serilog.Settings.Configuration/Properties/AssemblyInfo.cs

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
4-
5-
// General Information about an assembly is controlled through the following
6-
// set of attributes. Change these attribute values to modify the information
7-
// associated with an assembly.
8-
[assembly: AssemblyTitle("Serilog.Settings.Configuration")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("Serilog.Settings.Configuration")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
16-
17-
// Setting ComVisible to false makes the types in this assembly not visible
18-
// to COM components. If you need to access a type in this assembly from
19-
// COM, set the ComVisible attribute to true on that type.
20-
[assembly: ComVisible(false)]
1+
using System.Runtime.CompilerServices;
212

223
[assembly: InternalsVisibleTo("Serilog.Settings.Configuration.Tests, PublicKey=" +
234
"0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +

Diff for: ‎src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Microsoft.Extensions.Configuration (appsettings.json) support for Serilog.</Description>
5+
<VersionPrefix>2.3.1</VersionPrefix>
6+
<Authors>Serilog Contributors</Authors>
7+
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>Serilog.Settings.Configuration</AssemblyName>
11+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
12+
<SignAssembly>true</SignAssembly>
13+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
14+
<PackageId>Serilog.Settings.Configuration</PackageId>
15+
<PackageTags>serilog;json</PackageTags>
16+
<PackageIconUrl>http://serilog.net/images/serilog-configuration-nuget.png</PackageIconUrl>
17+
<PackageProjectUrl>http://serilog.net</PackageProjectUrl>
18+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
19+
20+
<!-- Don't reference the full NETStandard.Library -->
21+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="1.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.0.0" />
27+
<PackageReference Include="Serilog" Version="2.0.0" />
28+
</ItemGroup>
29+
30+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
31+
<DefineConstants>$(DefineConstants);APPDOMAIN</DefineConstants>
32+
</PropertyGroup>
33+
34+
</Project>

Diff for: ‎src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.xproj

-18
This file was deleted.

Diff for: ‎src/Serilog.Settings.Configuration/project.json

-28
This file was deleted.

0 commit comments

Comments
 (0)