diff --git a/build.sh b/build.sh index 27b2e5e..19ab21c 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ dotnet --info dotnet restore for path in src/**/*.csproj; do - dotnet build -f netstandard1.6 -c Release ${path} + dotnet build -f netstandard2.0 -c Release ${path} done for path in test/*.Tests/*.csproj; do diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj index 69e0e28..1b69583 100644 --- a/sample/Sample/Sample.csproj +++ b/sample/Sample/Sample.csproj @@ -13,8 +13,15 @@ - + + + + + + + + diff --git a/src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj b/src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj index fb72dd5..1e24c68 100644 --- a/src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj +++ b/src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj @@ -4,7 +4,7 @@ Microsoft.Extensions.Configuration (appsettings.json) support for Serilog. 3.0.0 Serilog Contributors - net451;netstandard1.6 + netstandard2.0;net451 true true Serilog.Settings.Configuration @@ -16,20 +16,20 @@ https://serilog.net/images/serilog-configuration-nuget.png https://github.com/serilog/serilog-settings-configuration https://www.apache.org/licenses/LICENSE-2.0 - - - true Serilog - - + - - $(DefineConstants);APPDOMAIN - + + + + + + + diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs index 8b50e08..3514237 100644 --- a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs +++ b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs @@ -286,12 +286,10 @@ where filter(assemblyName.Name) } else { -#if APPDOMAIN query = from outputAssemblyPath in System.IO.Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.dll") let assemblyFileName = System.IO.Path.GetFileNameWithoutExtension(outputAssemblyPath) where filter(assemblyFileName) select AssemblyName.GetAssemblyName(outputAssemblyPath); -#endif } return query.ToArray(); diff --git a/test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj b/test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj index e817514..deb329a 100644 --- a/test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj +++ b/test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj @@ -1,5 +1,16 @@  + + net452;netcoreapp2.0 Serilog.Settings.Configuration.Tests @@ -13,12 +24,18 @@ + + + + + + + + - -