Merge pull request #21 from merbla/2.0-RTM

2.0 Release

Author: merbla

.travis.yml

@@ -0,0 +1,46 @@
+language: csharp
+
+#dotnet cli require Ubuntu 14.04
+sudo: required
+dist: trusty
+
+#dotnet cli require OSX 10.10
+osx_image: xcode7.1
+
+addons:
+  apt:
+    packages:
+    - gettext
+    - libcurl4-openssl-dev
+    - libicu-dev
+    - libssl-dev
+    - libunwind8
+    - zlib1g
+
+os:
+  - osx
+  - linux
+
+env:
+  matrix: 
+    - CLI_VERSION=1.0.0-preview2-003121
+    - CLI_VERSION=Latest
+
+matrix:
+  allow_failures:
+    - env: CLI_VERSION=Latest
+
+before_install:
+  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; brew link --force openssl; fi
+  # Download script to install dotnet cli
+  - if test "$CLI_OBTAIN_URL" == ""; then export CLI_OBTAIN_URL="https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.sh"; fi
+  - curl -L --create-dirs $CLI_OBTAIN_URL -o ./scripts/obtain/install.sh
+  - find ./scripts -name "*.sh" -exec chmod +x {} \;
+  - export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
+  # use bash to workaround bug https://github.com/dotnet/cli/issues/1725
+  - sudo bash ./scripts/obtain/install.sh --channel "preview" --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR" --no-path
+  # add dotnet to PATH
+  - export PATH="$DOTNET_INSTALL_DIR:$PATH"
+
+script:
+  - ./build.sh

Build.ps1

@@ -11,5 +11,6 @@ Push-Location src/Serilog.Sinks.Splunk
 & dotnet pack -c Release -o ..\..\.\artifacts --version-suffix=$revision
 if($LASTEXITCODE -ne 0) { exit 1 }    
 
+
 Pop-Location
 Pop-Location

CHANGES.md

@@ -1,8 +1,9 @@
-##2.0 (RC)
+##2.0
  - Support for DotNet Core
  - Event Collector Sink targeting core
- - TCP/UDP Sinks targeting 4.5
+ - TCP/UDP Sinks targeting 4.5 *ONLY*
  - Changed HTTP Client to include URI endpoint to host: "services/collector/event"
+ - Event Collector changed to use epoch time [#15](https://github.com/serilog/serilog-sinks-splunk/pull/15)
 
 ##1.8
  - Event Collector changed to use epoch time [#15](https://github.com/serilog/serilog-sinks-splunk/pull/15)

appveyor.yml

@@ -1,11 +1,12 @@
 version: '{build}'
+skip_tags: true
 image: Visual Studio 2015
 configuration: Release
 install:
   - ps: mkdir -Force ".\build\" | Out-Null
-  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
+  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
   - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
-  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath'
+  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
 build_script:
 - ps: ./Build.ps1
@@ -18,4 +19,11 @@ deploy:
     secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
   skip_symbols: true
   on:
-    branch: /^(dev|master)$/
+    branch: /^(dev|master)$/
+- provider: GitHub
+  auth_token:
+    secure: ggZTqqV1z0xecDoQbeoy3A7xikShCt9FWZIGp95dG9Fo0p5RAT9oGU0ZekHfUIwk
+  artifact: /Serilog.*\.nupkg/
+  tag: v$(appveyor_build_version)
+  on:
+    branch: master

build.sh

@@ -2,10 +2,10 @@
 dotnet restore
 for path in src/*/project.json; do
     dirname="$(dirname "${path}")"
-    dotnet build ${dirname} -c Release
+    dotnet build ${dirname}
 done 
 
 for path in sample/project.json; do
     dirname="$(dirname "${path}")"
-    dotnet build ${dirname} -c Release
+    dotnet build ${dirname}
 done 

sample/project.json

@@ -1,15 +1,15 @@
 {
-  "version": "2.0.0-rc-*",
+  "version": "2.0.0",
   "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.0-rc2-3002702"
+      "version": "1.0.0"
     },
     "Serilog.Sinks.Splunk": {"target": "project"},
-    "Serilog.Sinks.Literate": "2.0.0-rc-25"
+    "Serilog.Sinks.Literate": "2.0.0"
   },
   "frameworks": {
     "netcoreapp1.0": {

src/Serilog.Sinks.Splunk/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0-rc-*",
+  "version": "2.0.0",
   "description": "The Splunk Sink for Serilog",
   "authors": [
     "Matthew Erbs, Serilog Contributors"
@@ -17,20 +17,31 @@
     "iconUrl": "http://serilog.net/images/serilog-sink-nuget.png"
   },
   "buildOptions": {
-    "keyFile": "../../assets/Serilog.snk",
+    
     "xmlDoc": true
   },
   "dependencies": {
-    "Serilog": "2.0.0-rc-556"
+    "Serilog": "2.0.0"
   },
   "frameworks": { 
+    "net4.5": {
+        "buildOptions": {
+        "define": [ "TCP", "UDP" ]
+      },
+      "frameworkAssemblies": {
+        "System.Net.Http": ""
+      },
+      "dependencies": {
+        "Splunk.Logging.Common": "1.6.0"
+      }
+    },
     "netstandard1.1": {
       "dependencies": {
-        "System.Collections": "4.0.11-rc2-24027",
-        "System.Collections.Concurrent": "4.0.12-rc2-24027",
-        "System.Runtime": "4.1.0-rc2-24027",
-        "System.Threading": "4.0.11-rc2-24027",
-        "System.Net.Http": "4.0.1-rc2-24027"
+        "System.Collections": "4.0.11",
+        "System.Collections.Concurrent": "4.0.12",
+        "System.Runtime": "4.1.0",
+        "System.Threading": "4.0.11",
+        "System.Net.Http": "4.1.0"
       }
     }
   }