Merge pull request #14 from tabrath/feat/span

Use spans

Author: tabrath

.circleci/config.yml

@@ -5,11 +5,11 @@ jobs:
       - image: microsoft/dotnet:1.1-sdk
     steps:
       - checkout
-      - run: dotnet test -f netcoreapp1.1 test/BinaryEncoding.Tests/BinaryEncoding.Tests.csproj
+      - run: dotnet test -f netcoreapp1.1 -c Release test/BinaryEncoding.Tests/BinaryEncoding.Tests.csproj
   build:
     docker:
-      - image: microsoft/dotnet:2.0-sdk
+      - image: microsoft/dotnet:2.2-sdk
     steps:
       - checkout
-      - run: dotnet test -f netcoreapp2.0 test/BinaryEncoding.Tests/BinaryEncoding.Tests.csproj
+      - run: dotnet test -f netcoreapp2.2 -c Release test/BinaryEncoding.Tests/BinaryEncoding.Tests.csproj
 

.gitignore

@@ -6,6 +6,8 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.binlog
+*.opencover.xml
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

.travis.yml

@@ -1,22 +1,14 @@
 language: csharp
 solution: BinaryEncoding.sln
 
-matrix:
-  include:
-    - dotnet: 2.1.300-preview2-008533
-      mono: none
-      env: DOTNET=1
-      os: linux
-    - mono: latest
-      env: MONO=1
-      os: linux
-    - dotnet: 2.1.300-preview2-008533
-      mono: none
-      env: DOTNET=1
-      os: osx
-    - mono: latest
-      env: MONO=1
-      os: osx
+sudo: required
+dist: xenial
+mono: latest
+dotnet: 2.2.300
+
+os:
+  - linux
+  - osx
 
 notifications:
   email:
@@ -32,15 +24,16 @@ cache:
   directories:
   - ./packages
   - /.dotnetcli
+  - $HOME/.nuget/packages
   - $HOME/Library/Caches/Homebrew
 
 before_install:
   - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
 
 install:
   - git config --global core.autocrlf input
-  - chmod +x ./build.sh
 
 script:
-  - ./build.sh
-
+  - dotnet build -c Release
+  - dotnet test -c Release -f netcoreapp2.2 --no-build --no-restore --blame
+  - mono $HOME/.nuget/packages/xunit.runner.console/*/tools/net452/xunit.console.exe ./test/BinaryEncoding.Tests/bin/Release/net452/BinaryEncoding.Tests.dll

Directory.Build.props

@@ -0,0 +1,28 @@
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
+    <!-- have to teach MSBuild where the Mono copy of the reference asssemblies is -->
+    <TargetIsMono Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</TargetIsMono>
+
+    <!-- Look in the standard install locations -->
+    <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono>
+    <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
+    <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
+
+    <!-- If we found Mono reference assemblies, then use them -->
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net472'">$(BaseFrameworkPathOverrideForMono)/4.7.2-api</FrameworkPathOverride>
+    <EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">true</EnableFrameworkPathOverride>
+
+    <!-- Add the Facades directory.  Not sure how else to do this. Necessary at least for .NET 4.5 -->
+    <AssemblySearchPaths Condition=" '$(BaseFrameworkPathOverrideForMono)' != '' ">{RawFileName};{CandidateAssemblyFiles};{HintPathFromItem};$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
+    <AssemblySearchPaths Condition=" $(TargetFramework.StartsWith('net45')) and '$(BaseFrameworkPathOverrideForMono)' != '' ">$(BaseFrameworkPathOverrideForMono)/4.5;$(BaseFrameworkPathOverrideForMono)/4.5/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
+  </PropertyGroup>
+</Project>

appveyor.yml

@@ -38,47 +38,31 @@ init:
   - ps: Update-AppveyorBuild -Version $env:BUILD_VERSION
   - ps: Write-Host "Build version $env:BUILD_VERSION, NuGet version $env:NUGET_VERSION, Version suffix $env:VERSION_SUFFIX"
 
-before_build:
-  - appveyor-retry dotnet restore -v Minimal --runtime win10-x64
-
 build_script:
   - ps: |
       if ($env:APPVEYOR_REPO_BRANCH -eq "master")
       {
-        dotnet build "src\BinaryEncoding" -c $env:CONFIGURATION
+        dotnet build -c $env:CONFIGURATION
       }
       else
       {
-        dotnet build "src\BinaryEncoding" -c $env:CONFIGURATION --version-suffix $env:VERSION_SUFFIX
-      }
-
-after_build:
-  - ps: |
-      if ($env:APPVEYOR_REPO_BRANCH -eq "master")
-      {
-        dotnet pack "src\BinaryEncoding" -c $env:CONFIGURATION --no-build -o $env:APPVEYOR_BUILD_FOLDER\artifacts
-      }
-      else
-      {
-        dotnet pack "src\BinaryEncoding" -c $env:CONFIGURATION --no-build --version-suffix $env:VERSION_SUFFIX -o $env:APPVEYOR_BUILD_FOLDER\artifacts
+        dotnet build -c $env:CONFIGURATION --version-suffix $env:VERSION_SUFFIX
       }
 
 test: off
 
 test_script:
-  - dotnet test --configuration Debug --framework netcoreapp2.0 --logger trx;logfilename=TestResult.xml --results-directory "%APPVEYOR_BUILD_FOLDER%\test\BinaryEncoding.Tests\TestResults" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover %APPVEYOR_BUILD_FOLDER%\test\BinaryEncoding.Tests\BinaryEncoding.Tests.csproj
-
-after_test:
-  - ps: |
-        $wc = New-Object 'System.Net.WebClient'
-        $wc.UploadFile("https://ci.appveyor.com/api/testresults/xunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test\BinaryEncoding.Tests\TestResults\TestResult.xml))
+  - dotnet test -c %CONFIGURATION% -f netcoreapp2.2 /p:CollectCoverage=true %APPVEYOR_BUILD_FOLDER%\test\BinaryEncoding.Tests
 
 on_success:
   - choco install codecov
-  - codecov -f "%APPVEYOR_BUILD_FOLDER%\test\BinaryEncoding.Tests\coverage.xml"
+  - codecov -f "%APPVEYOR_BUILD_FOLDER%\test\BinaryEncoding.Tests\coverage.opencover.xml"
 
 artifacts:
-  - path: artifacts\**\*.*
+  - path: '**\*.nupkg'
+    name: nupkg
+  - path: '**\*.snupkg'
+    name: snupkg
 
 cache:
   - '%USERPROFILE%\.local'