Merge pull request #12 from merbla/core-dotnet

Serilog 2.0 Support

Author: merbla

.gitignore

@@ -1,6 +1,8 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+.vs/
+
 # User-specific files
 *.suo
 *.user

.nuget/packages.config

@@ -1,73 +1,109 @@
-param(
-    [String] $majorMinor = "0.0",  # 2.0
-    [String] $patch = "0",         # $env:APPVEYOR_BUILD_VERSION
-    [String] $customLogger = "",   # C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll
-    [Switch] $notouch
-)
-
-function Set-AssemblyVersions($informational, $assembly)
+$root = $(Get-Item $($MyInvocation.MyCommand.Path)).DirectoryName
+
+function Install-Dnvm
 {
-    (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
+    & where.exe dnvm 2>&1 | Out-Null
+    if(($LASTEXITCODE -ne 0) -Or ((Test-Path Env:\APPVEYOR) -eq $true))
+    {
+        Write-Host "DNVM not found"
+        &{$Branch='dev';iex ((New-Object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))}
+
+        # Normally this happens automatically during install but AppVeyor has
+        # an issue where you may need to manually re-run setup from within this process.
+        if($env:DNX_HOME -eq $NULL)
+        {
+            Write-Host "Initial DNVM environment setup failed; running manual setup"
+            $tempDnvmPath = Join-Path $env:TEMP "dnvminstall"
+            $dnvmSetupCmdPath = Join-Path $tempDnvmPath "dnvm.ps1"
+            & $dnvmSetupCmdPath setup
+        }
+    }
 }
 
-function Install-NuGetPackages()
+function Get-DnxVersion
 {
-    nuget restore serilog-sinks-splunk.sln
+    $globalJson = Join-Path $PSScriptRoot "global.json"
+    $jsonData = Get-Content -Path $globalJson -Raw | ConvertFrom-JSON
+    return $jsonData.sdk.version
 }
 
-function Invoke-MSBuild($solution, $customLogger)
+function Restore-Packages
 {
-    if ($customLogger)
-    {
-        msbuild "$solution" /verbosity:minimal /p:Configuration=Release /logger:"$customLogger"
-    }
-    else
-    {
-        msbuild "$solution" /verbosity:minimal /p:Configuration=Release
-    }
+    param([string] $DirectoryName)
+    & dnu restore ("""" + $DirectoryName + """")
 }
 
-function Invoke-NuGetPackProj($csproj)
+function Build-Projects
 {
-    nuget pack -Prop Configuration=Release -Symbols $csproj
+    param($Directory, $pack)
+     
+    $DirectoryName = $Directory.DirectoryName
+    $artifactsFolder = join-path $root "artifacts"
+    $projectsFolder = join-path $artifactsFolder $Directory.Name 
+    $buildFolder = join-path $projectsFolder "testbin"
+    $packageFolder = join-path $projectsFolder "packages"
+     
+    & dnu build ("""" + $DirectoryName + """") --configuration Release --out $buildFolder; if($LASTEXITCODE -ne 0) { exit 1 }
+    
+    if($pack){
+        & dnu pack ("""" + $DirectoryName + """") --configuration Release --out $packageFolder; if($LASTEXITCODE -ne 0) { exit 1 }
+    }
 }
-
-function Invoke-NuGetPackSpec($nuspec, $version)
+ 
+function Test-Projects
 {
-    nuget pack $nuspec -Version $version -OutputDirectory ..\..\
+    param([string] $DirectoryName)
+    & dnx -p ("""" + $DirectoryName + """") test; if($LASTEXITCODE -ne 0) { exit 2 }
 }
 
-function Invoke-NuGetPack($version)
-{ 
-    pushd .\src\Serilog.Sinks.Splunk
-    Invoke-NuGetPackSpec "Serilog.Sinks.Splunk.nuspec" $version
-    popd
+function Remove-PathVariable
+{
+    param([string] $VariableToRemove)
+    $path = [Environment]::GetEnvironmentVariable("PATH", "User")
+    $newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
+    [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
+    $path = [Environment]::GetEnvironmentVariable("PATH", "Process")
+    $newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
+    [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
 }
 
-function Invoke-Build($majorMinor, $patch, $customLogger, $notouch)
-{
-    $package="$majorMinor.$patch"
+Push-Location $PSScriptRoot
 
-    Write-Output "Building Serilog.Sinks.Splunk $package"
+$dnxVersion = Get-DnxVersion
 
-    if (-not $notouch)
-    {
-        $assembly = "$majorMinor.0.0"
+# Clean
+if(Test-Path .\artifacts) { Remove-Item .\artifacts -Force -Recurse }
 
-        Write-Output "Assembly version will be set to $assembly"
-        Set-AssemblyVersions $package $assembly
-    }
+# Remove the installed DNVM from the path and force use of
+# per-user DNVM (which we can upgrade as needed without admin permissions)
+Remove-PathVariable "*Program Files\Microsoft DNX\DNVM*"
 
-    Install-NuGetPackages
-    
-    Invoke-MSBuild "serilog-sinks-splunk.sln" $customLogger
+# Make sure per-user DNVM is installed
+Install-Dnvm
 
-    Invoke-NuGetPack $package
-}
+# Install DNX
+dnvm install $dnxVersion -r CoreCLR -NoNative
+dnvm install $dnxVersion -r CLR -NoNative
+dnvm use $dnxVersion -r CLR
+
+# Package restore
+Get-ChildItem -Path . -Filter *.xproj -Recurse | ForEach-Object { Restore-Packages $_.DirectoryName }
+
+# Set build number
+$env:DNX_BUILD_VERSION = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
+Write-Host "Build number: " $env:DNX_BUILD_VERSION
+
+# Build/package
+Get-ChildItem -Path .\src -Filter *.xproj -Recurse | ForEach-Object { Build-Projects $_ $true }
+Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Build-Projects $_ $false }
+
+# Test
+Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Test-Projects $_.DirectoryName }
+
+# Switch to Core CLR
+dnvm use $dnxVersion -r CoreCLR
+
+# Test again
+Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Test-Projects $_.DirectoryName }
 
-$ErrorActionPreference = "Stop"
-Invoke-Build $majorMinor $patch $customLogger $notouch
+Pop-Location

Build.ps1

@@ -1,16 +1,22 @@
-##1.5.0
- - Moved the sink from its [original location](https://github.com/serilog/serilog)
+##2.0 
+ - Support for DotNet Core
+ - Event Collector Sink targeting core
+ - TCP/UDP Sinks targeting 4.5
+ - Changed HTTP Client to include URI endpoint to host: "services/collector/event"
 
-##1.5.30
- - Added switch for template rendering
+##1.7
+ - Better support for formatting including [#578](https://github.com/serilog/serilog/issues/578)
+ - Cleanup on Event Collector
 
+##1.6.50
+ - Streaming support for Event Collector
+ 
 ##1.6.42
  - Added support for Splunk 6.3 Event Collector
  - Deprecated Splunk HTTP Sink using Management Port/API
 
-##1.6.50
- - Streaming support for Event Collector
-
-##1.7
- - Better support for formatting including [#578](https://github.com/serilog/serilog/issues/578)
- - Cleanup on Event Collector
+##1.5.30
+ - Added switch for template rendering
+ 
+ ##1.5.0
+ - Moved the sink from its [original location](https://github.com/serilog/serilog)

CHANGES.md

@@ -21,23 +21,6 @@ Using the new Event Collector in Splunk 6.3
 
 ```csharp 
 var log = new LoggerConfiguration()
-     .WriteTo.SplunkViaEventCollector("https://mysplunk:8088/services/collector", "myeventcollectortoken")
+     .WriteTo.EventCollector("https://mysplunk:8088/services/collector", "myeventcollectortoken")
     .CreateLogger();
-```
-
-Set up to log via TCP
-
-```csharp
-var log = new LoggerConfiguration()
-    .WriteTo.SplunkViaTcp("127.0.0.1", 10001)
-    .CreateLogger();
-```
-
-Or maybe UDP
-
-```csharp
-var log = new LoggerConfiguration()
-    .WriteTo.SplunkViaUdp("127.0.0.1", 10000)
-    .CreateLogger();
-```
-
+```

README.md

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "1.0.0-rc1-update1"
+  }
+}