diff --git a/appveyor.yml b/appveyor.yml index 0e082644..9a3aeb7c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,17 +1,18 @@ version: 1.0.{build} +image: Visual Studio 2017 configuration: Release -build_script: -- ps: >- - dotnet restore src\NLog.Extensions.Logging - .\patchFileVersion.ps1 "NLog.Extensions.Logging.csproj" "$env:appveyor_build_version" +install: + - '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"' + +build_script: + - ps: .\build.ps1 - dotnet pack src\NLog.Extensions.Logging --configuration Release artifacts: -- path: 'src\NLog.Extensions.Logging\bin\release\*.nupkg' + - path: 'artifacts\*.nupkg' test_script: -- ps: .\run-tests.ps1 + - ps: .\run-tests.ps1 deploy: - provider: NuGet diff --git a/build.ps1 b/build.ps1 new file mode 100644 index 00000000..aea965a0 --- /dev/null +++ b/build.ps1 @@ -0,0 +1,16 @@ +# restore and builds all projects as release. +# creates NuGet package at \artifacts +dotnet --version + +$versionPrefix = "1.0.0" +$versionSuffix = "rtm-rc6" +$versionFile = $versionPrefix + "." + ${env:APPVEYOR_BUILD_NUMBER} +$versionProduct = $versionPrefix; +if (-Not $versionSuffix.Equals("")) + { $versionProduct = $versionProduct + "-" + $versionSuffix } + +msbuild /t:Restore,Pack .\src\NLog.Extensions.Logging\ /p:targetFrameworks='"net451;net461;netstandard1.5;netstandard2.0;uap10.0"' /p:VersionPrefix=$versionPrefix /p:VersionSuffix=$versionSuffix /p:FileVersion=$versionFile /p:ProductVersion=$versionProduct /p:Configuration=Release /p:IncludeSymbols=true /p:PackageOutputPath=..\..\artifacts /verbosity:minimal +if (-Not $LastExitCode -eq 0) + { exit $LastExitCode } + +exit $LastExitCode diff --git a/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj b/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj index ef4afa41..27a5fba0 100644 --- a/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj +++ b/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj @@ -5,22 +5,18 @@ net451;net461;netstandard1.5;netstandard2.0 true true - + + NLog.Extensions.Logging v$(ProductVersion) + $(ProductVersion) + Microsoft;Julian Verdurmen + NLog NLog provider for Microsoft.Extensions.Logging for usage in .NET Standard libraries and console applicaties. For ASP.NET Core, use NLog.Web.AspNetCore: https://www.nuget.org/packages/NLog.Web.AspNetCore - - Microsoft;Julian Verdurmen - NLog - NLog.Extensions.Logging - NLog.snk - true - true - NLog.Extensions.Logging NLog;Microsoft.Extensions.Logging;log;logfiles;netcore;nlog - +rc6: support UAP10/UWP rc5: Fix System.Runtime not found in the GAC on .NET 4.5 / 4.6 rc4: Fixed bug with message templates, removed NLog 5 dependency rc3: Support for .NET 4.6.1, support for message templates .NET standard 1.5+ and .NET 4.5.1+ @@ -31,25 +27,40 @@ rc3: Support for .NET 4.6.1, support for message templates .NET standard 1.5+ an https://github.com/NLog/NLog.Extensions.Logging/blob/master/LICENSE git git://github.com/NLog/NLog.Extensions.Logging - 1.0.0-rtm-rc5 + + true 1.0.0.0 - - 1.0.0.0 - + NLog.snk + true + NLog.Extensions.Logging for .NET Framework 4.6.1 true + NLog.Extensions.Logging for .NET Framework 4.5.1 true $(DefineConstants);NETCORE1_0 + NLog.Extensions.Logging for NetStandard 1.5 1.6.0 $(DefineConstants);NETCORE1_0 + + NLog.Extensions.Logging for UWP + UAP,Version=v10.0 + true + 1.6.0 + .NETCore + v5.0 + UAP + 10.0.15083.0 + 10.0.10240.0 + $(DefineConstants);NETCORE1_0 + - + @@ -61,6 +72,9 @@ rc3: Support for .NET 4.6.1, support for message templates .NET standard 1.5+ an + + +