Merge pull request #51 from panesofglass/build

Update build to version and package based on tag

Author: panesofglass

.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,20 +15,20 @@ 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 -c Release tests/Aether.Tests/Aether.Tests.fsproj
-  - dotnet pack -c Release --include-symbols
+  - dotnet test --no-build -c Release tests/Aether.Tests/Aether.Tests.fsproj
+  - dotnet pack --no-build -c Release --include-symbols
 
 branches:
   except:
-    - gh-pages
+    - gh-pages

appveyor.yml

@@ -1,13 +1,8 @@
-version: 8.2.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/Aether.Tests/Aether.Tests.fsproj
-  - ps: dotnet pack -c Release --include-symbols --version-suffix "aci-${env:APPVEYOR_BUILD_NUMBER}"
-
+  - ps: |
+      .\build.ps1
+      if ($lastexitcode -ne 0){ exit $lastexitcode }
 test: off
-
 artifacts:
-  - path: '**\*.nupkg'
+  - path: bin\*.nupkg

build.ps1

@@ -0,0 +1,21 @@
+[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 Aether.sln /p:Version=$version$versionSuffix
+dotnet test --no-build -c Release tests/Aether.Tests/Aether.Tests.fsproj
+dotnet pack --no-build -c Release /p:Version=$version$versionSuffix -o $psscriptroot/bin

src/Aether/Aether.fsproj

@@ -3,7 +3,6 @@
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="Aether.fs" />
   </ItemGroup>

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>8.2.0</VersionPrefix>
+    <VersionPrefix>8.3.0</VersionPrefix>
     <Authors>Andrew Cherry, Marcus Griep, Max Malook</Authors>
     <Description>Optics for F#</Description>
     <Copyright>Copyright © Xyncro Ltd</Copyright>
@@ -11,5 +11,8 @@
     <RepositoryUrl>https://github.com/xyncro/aether</RepositoryUrl>
     <PackageTags>$(PackageTags);lens;prism;isomorphism;optic;f#;fsharp</PackageTags>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
+  </ItemGroup>
 </Project>