Merge pull request #20 from jansoren/dev

Now using Serilog version 2.x to prevent Serilog.FullNetFx issue

Author: nblumhardt

Build.ps1

@@ -6,15 +6,6 @@ param(
     [String] $sln                  # e.g serilog-sink-name
 )
 
-function Set-AssemblyVersions($informational, $assembly)
-{
-    (Get-Content assets/CommonAssemblyInfo.cs) |
-        ForEach-Object { $_ -replace """1.0.0.0""", """$assembly""" } |
-        ForEach-Object { $_ -replace """1.0.0""", """$informational""" } |
-        ForEach-Object { $_ -replace """1.1.1.1""", """$($informational).0""" } |
-        Set-Content assets/CommonAssemblyInfo.cs
-}
-
 function Install-NuGetPackages($solution)
 {
     nuget restore $solution
@@ -56,16 +47,8 @@ function Invoke-Build($majorMinor, $patch, $customLogger, $notouch, $sln)
 
     Write-Output "$sln $package"
 
-    if (-not $notouch)
-    {
-        $assembly = "$majorMinor.0.0"
-
-        Write-Output "Assembly version will be set to $assembly"
-        Set-AssemblyVersions $package $assembly
-    }
-
     Install-NuGetPackages $slnfile
-    
+
     Invoke-MSBuild $slnfile $customLogger
 
     Invoke-NuGetPack $package

appveyor.yml

@@ -0,0 +1,19 @@
+version: "{build}"
+configuration: Debug
+build_script:
+- ps: ./Build.ps1 -majorMinor "4.0" -patch "0-beta-$env:APPVEYOR_BUILD_VERSION" -customLogger "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+artifacts:
+- path: Serilog.Sinks.MSSqlServer.*.nupkg
+deploy:
+- provider: NuGet
+  api_key:
+    secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
+  skip_symbols: true
+  on:
+    branch: dev
+assembly_info:
+  patch: true
+  file: AssemblyInfo.*
+  assembly_version: "{build}"
+  assembly_file_version: "{build}"
+  assembly_informational_version: "4.0.0-beta-{build}"

assets/CommonAssemblyInfo.cs

@@ -4,6 +4,9 @@
 [assembly: AssemblyTitle("Serilog.Sinks.MSSqlServer")]
 [assembly: AssemblyDescription("Serilog sink for MSSqlServer")]
 [assembly: AssemblyCopyright("Copyright © Serilog Contributors 2014")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0")]
 
 [assembly: InternalsVisibleTo("Serilog.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +
                                                        "6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9" +

src/Serilog.Sinks.MSSqlServer/Properties/AssemblyInfo.cs

@@ -46,12 +46,12 @@
     <AssemblyOriginatorKeyFile>..\..\assets\Serilog.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll</HintPath>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Serilog.2.0.0-beta-523\lib\net45\Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll</HintPath>
+    <Reference Include="Serilog.Sinks.PeriodicBatching, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Serilog.Sinks.PeriodicBatching.2.0.0-beta-700\lib\net45\Serilog.Sinks.PeriodicBatching.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -69,9 +69,6 @@
     <Compile Include="Configuration\MSSqlServerConfigurationSection.cs" />
     <Compile Include="LoggerConfigurationMSSqlServerExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\assets\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="Sinks\MSSqlServer\ColumnOptions.cs" />
     <Compile Include="Sinks\MSSqlServer\MSSqlServerSink.cs" />
     <Compile Include="Sinks\MSSqlServer\SqlTableCreator.cs" />
@@ -83,6 +80,7 @@
       <Link>Serilog.snk</Link>
     </None>
     <None Include="packages.config" />
+    <None Include="project.json" />
     <None Include="Serilog.Sinks.MSSqlServer.nuspec" />
   </ItemGroup>
   <ItemGroup>
@@ -103,4 +101,4 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Serilog" version="1.5.14" targetFramework="net45" />
+  <package id="Serilog" version="2.0.0-beta-523" targetFramework="net45" />
+  <package id="Serilog.Sinks.PeriodicBatching" version="2.0.0-beta-700" targetFramework="net45" />
 </packages>

src/Serilog.Sinks.MSSqlServer/packages.config

@@ -0,0 +1,22 @@
+{
+  "version": "4.0.0-beta-0",
+  "description": "A Serilog sink that writes events to Microsoft SQL Server",
+  "authors": [ "Serilog Contributors" ],
+  "tags": [ "serilog", "sinks", "mssqlserver" ],
+  "projectUrl": "http://serilog.net",
+  "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
+  "iconUrl": "http://serilog.net/images/serilog-sink-nuget.png",
+  "dependencies": {
+    "Serilog": "2.0.0-beta-523",
+    "Serilog.Sinks.PeriodicBatching": "2.0.0-beta-700"
+  },
+  "compilationOptions": {
+    "keyFile": "../../assets/Serilog.snk"
+  },
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}