Skip to content

Commit a9b319f

Browse files
nblumhardtnblumhardt
authored
Merge pull request #90 from skomis-mm/netstandard2
Update to netstandard 2.0 rtm dependencies / tooling
2 parents dcc5e6d + 5be654b commit a9b319f

File tree

8 files changed

+18
-58
lines changed

8 files changed

+18
-58
lines changed

‎Build.ps1‎

Lines changed: 1 addition & 1 deletion
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 --include-symbols -o ..\..\artifacts --version-suffix=$suffix
23+
& dotnet pack -c Release --include-source -o ..\..\artifacts --version-suffix=$suffix
2424
if($LASTEXITCODE -ne 0) { exit 1 }
2525

2626
Pop-Location

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ image: Visual Studio 2017 Preview
44
configuration: Release
55
install:
66
- ps: mkdir -Force ".\build\" | Out-Null
7-
#- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/release/2.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
7+
#- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/release/2.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
88
#- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
99
#- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 2.0.0-preview2-006497'
1010
#- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"

‎samples/Sample/Sample.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
55
<AssemblyName>Sample</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<PackageId>Sample</PackageId>
@@ -12,17 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0-preview2-final" />
16-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0-preview2-final" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
1717
<PackageReference Include="Serilog.Sinks.Literate" Version="2.0.0" />
1818
</ItemGroup>
1919

20-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
21-
</ItemGroup>
22-
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
24-
<Reference Include="System" />
25-
<Reference Include="Microsoft.CSharp" />
26-
</ItemGroup>
27-
2820
</Project>

‎samples/WebSample/WebSample.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<PreserveCompilationContext>true</PreserveCompilationContext>
55
<AssemblyName>WebSample</AssemblyName>
66
<OutputType>Exe</OutputType>
7-
<PackageId>WebSample</PackageId>
8-
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
97
</PropertyGroup>
108
<ItemGroup>
119
<None Update="wwwroot\**\*;Views\**\*;Areas\**\Views">
@@ -23,7 +21,7 @@
2321
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
2422
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
2523
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
26-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0-preview2-final" />
24+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
2725
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
2826
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
2927
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />

‎src/Serilog.Extensions.Logging/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

4-
[assembly: AssemblyVersion("1.0.0.0")]
4+
[assembly: AssemblyVersion("2.0.0.0")]
55

66
[assembly: InternalsVisibleTo("Serilog.Extensions.Logging.Tests, PublicKey=" +
77
"0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +

‎src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>Serilog provider for Microsoft.Extensions.Logging</Description>
55
<VersionPrefix>2.0.0</VersionPrefix>
66
<Authors>Microsoft;Serilog Contributors</Authors>
7-
<TargetFrameworks>net45;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net45;net46;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>Serilog.Extensions.Logging</AssemblyName>
@@ -17,45 +17,31 @@
1717
<PackageProjectUrl>https://github.com/serilog/serilog-extensions-logging</PackageProjectUrl>
1818
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
1919
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
20-
<!-- Don't reference the full NETStandard.Library -->
21-
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
2220
</PropertyGroup>
2321

2422
<ItemGroup>
2523
<PackageReference Include="Serilog" Version="2.3.0" />
2624
</ItemGroup>
2725

28-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
29-
<Reference Include="System.Runtime" />
30-
<Reference Include="System" />
31-
<Reference Include="Microsoft.CSharp" />
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'netstandard1.3' ">
3227
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
28+
3329
<Compile Remove="SerilogLoggingBuilderExtensions.cs" />
30+
<None Include="SerilogLoggingBuilderExtensions.cs" />
3431
</ItemGroup>
3532

36-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
37-
<Reference Include="System.Runtime" />
38-
<Reference Include="System" />
39-
<Reference Include="Microsoft.CSharp" />
40-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0-preview2-final" />
41-
<PackageReference Include="NETStandard.Library" Version="2.0.0-preview2-25401-01" />
42-
<Compile Remove="SerilogLoggerFactoryExtensions.cs" />
43-
</ItemGroup>
44-
45-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
46-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
47-
<Compile Remove="SerilogLoggingBuilderExtensions.cs" />
48-
</ItemGroup>
49-
50-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
51-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0-preview2-final" />
52-
<PackageReference Include="NETStandard.Library" Version="2.0.0-preview2-25401-01" />
33+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netstandard2.0' ">
34+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
5335
</ItemGroup>
5436

5537
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
5638
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
5739
</PropertyGroup>
5840

41+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
42+
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
43+
</PropertyGroup>
44+
5945
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
6046
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
6147
</PropertyGroup>

‎src/Serilog.Extensions.Logging/SerilogLoggerFactoryExtensions.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System;
55
using Microsoft.Extensions.Logging;
66
using Serilog.Extensions.Logging;
7-
using System.ComponentModel;
87

98
namespace Serilog
109
{
@@ -13,21 +12,6 @@ namespace Serilog
1312
/// </summary>
1413
public static class SerilogLoggerFactoryExtensions
1514
{
16-
/// <summary>
17-
/// Add Serilog to the logging pipeline.
18-
/// </summary>
19-
/// <param name="factory">The logger factory to configure.</param>
20-
/// <param name="logger">The Serilog logger; if not supplied, the static <see cref="Serilog.Log"/> will be used.</param>
21-
/// <returns>The logger factory.</returns>
22-
[EditorBrowsable(EditorBrowsableState.Never)]
23-
public static ILoggerFactory AddSerilog(
24-
this ILoggerFactory factory,
25-
ILogger logger)
26-
{
27-
if (factory == null) throw new ArgumentNullException(nameof(factory));
28-
return factory.AddSerilog(logger, false);
29-
}
30-
3115
/// <summary>
3216
/// Add Serilog to the logging pipeline.
3317
/// </summary>

‎test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net46;net461</TargetFrameworks>
55
<AssemblyName>Serilog.Extensions.Logging.Tests</AssemblyName>
66
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
77
<SignAssembly>true</SignAssembly>

0 commit comments

Comments
 (0)