Merge pull request #9 from panesofglass/build

Update build

Author: panesofglass

.gitignore

@@ -87,6 +87,7 @@ $tf/
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
+.idea/
 
 # JustCode is a .NET coding addin-in
 .JustCode

.travis.yml

@@ -1,7 +1,9 @@
 language: csharp
 
-mono: 5.2.0
-dotnet: 2.0.0
+dotnet: 2.1.402
+
+mono:
+  - 5.2.0
 
 install:
   - mozroots --import --sync
@@ -13,21 +15,21 @@ matrix:
     - os: linux # Ubuntu 14.04
       dist: trusty
       sudo: required
-      dotnet: 2.0.0
+      dotnet: 2.1.402
     - os: osx # OSX 10.12
       osx_image: xcode9.1
-      dotnet: 2.0.0
+      dotnet: 2.1.402
       dist: trusty
       sudo: required
 
 script: 
   - dotnet --info
   - dotnet restore
   - dotnet build -c Release
-  - dotnet test tests/Freya.Core.Tests/Freya.Core.Tests.fsproj -c Release 
-  - dotnet test tests/Freya.Core.Hopac.Tests/Freya.Core.Hopac.Tests.fsproj -c Release 
-  - dotnet pack -c Release --include-symbols
-  - dotnet tests/Freya.Core.Benchmarks/bin/Release/netcoreapp2.0/Freya.Core.Benchmarks.dll
+  - dotnet test --no-build tests/Freya.Core.Tests/Freya.Core.Tests.fsproj -c Release 
+  - dotnet test --no-build tests/Freya.Core.Hopac.Tests/Freya.Core.Hopac.Tests.fsproj -c Release 
+  - dotnet pack --no-build -c Release --include-symbols
+  - dotnet tests/Freya.Core.Benchmarks/bin/Release/netcoreapp2.1/Freya.Core.Benchmarks.dll
 
 branches:
   except:

appveyor.yml

@@ -1,16 +1,8 @@
-version: 4.0.0-aci-{build}
-
+image: Visual Studio 2017
 build_script:
-  - ps: dotnet --info
-  - ps: dotnet restore
-  - ps: dotnet build -c Release --version-suffix "aci-${env:APPVEYOR_BUILD_NUMBER}"
-  - ps: dotnet test -c Release tests\Freya.Core.Tests\Freya.Core.Tests.fsproj
-  - ps: dotnet test -c Release tests\Freya.Core.Hopac.Tests\Freya.Core.Hopac.Tests.fsproj
-  - ps: dotnet pack -c Release --include-symbols --version-suffix "aci-${env:APPVEYOR_BUILD_NUMBER}"
-  - ps: dotnet .\tests\Freya.Core.Benchmarks\bin\Release\netcoreapp2.0\Freya.Core.Benchmarks.dll
-
-test: off
-
+- ps: |
+      .\build.ps1
+      if ($lastexitcode -ne 0){ exit $lastexitcode }
 artifacts:
-  - path: '**\*.nupkg'
-  - path: '**\BenchmarkDotNet.Artifacts\**\*.*'
+- path: bin\*.nupkg
+- path: '**\BenchmarkDotNet.Artifacts\**\*.*'

build.ps1

@@ -0,0 +1,24 @@
+[xml]$doc = Get-Content .\src\Directory.Build.props
+$version = $doc.Project.PropertyGroup.VersionPrefix # the version under development, update after a release
+$versionSuffix = '-build.0' # manually incremented for local builds
+
+function isVersionTag($tag){
+    $v = New-Object Version
+    [Version]::TryParse($tag, [ref]$v)
+}
+
+if ($env:appveyor){
+    $versionSuffix = '-build.' + $env:appveyor_build_number
+    if ($env:appveyor_repo_tag -eq 'true' -and (isVersionTag($env:appveyor_repo_tag_name))){
+        $version = $env:appveyor_repo_tag_name
+        $versionSuffix = ''
+    }
+    Update-AppveyorBuild -Version "$version$versionSuffix"
+}
+
+dotnet build -c Release Freya.Core.sln /p:Version=$version$versionSuffix
+dotnet test --no-build -c Release tests/Freya.Core.Tests/Freya.Core.Tests.fsproj
+dotnet test --no-build -c Release tests/Freya.Core.Hopac.Tests/Freya.Core.Hopac.Tests.fsproj
+dotnet pack --no-build -c Release src/Freya.Core /p:Version=$version$versionSuffix -o $psscriptroot/bin
+dotnet pack --no-build -c Release src/Freya.Core.Hopac /p:Version=$version$versionSuffix -o $psscriptroot/bin
+dotnet tests/Freya.Core.Benchmarks/bin/Release/netcoreapp2.1/Freya.Core.Benchmarks.dll

src/Directory.Build.props

@@ -12,5 +12,13 @@
     <RepositoryUrl>https://github.com/xyncro/freya-core</RepositoryUrl>
     <PackageTags>$(PackageTags);functional;web;freya;f#;fsharp</PackageTags>
     <PackageTags Condition="'$(Hopac)' == 'true'">$(PackageTags);hopac</PackageTags>
+
+    <!-- SourceLink related properties https://github.com/dotnet/SourceLink#using-sourcelink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
+  </ItemGroup>
 </Project>

src/Freya.Core.Common.targets

@@ -20,6 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="4.3.4" />
     <PackageReference Include="Aether" Version="[8.2.0,9)" />
   </ItemGroup>
 

tests/Freya.Core.Benchmarks/Freya.Core.Benchmarks.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <DebugType>none</DebugType>
     <ServerGarbageCollection>true</ServerGarbageCollection>

tests/Freya.Core.Tests.Common.targets

@@ -1,7 +1,8 @@
-<Project>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <DefineConstants Condition="'$(Hopac)' == 'true'">$(DefineConstants);HOPAC</DefineConstants>
     <ServerGarbageCollection Condition="'$(Hopac)' == 'true'">true</ServerGarbageCollection>
     <IsPackable>false</IsPackable>