Merge pull request #7 from panesofglass/build

Update build to support tags

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,19 +15,19 @@ 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 pack -c Release --include-symbols
+  - dotnet pack --no-build -c Release --include-symbols
 
 branches:
   except:
-    - gh-pages
+    - gh-pages

appveyor.yml

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

build.ps1

@@ -0,0 +1,20 @@
+[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 Hephaestus.sln /p:Version=$version$versionSuffix
+dotnet pack --no-build -c Release src/Hephaestus /p:Version=$version$versionSuffix -o $psscriptroot/bin

src/Directory.Build.props

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>5.0.1</VersionPrefix>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <DefineConstants Condition="'$(Hopac)' == 'true'">$(DefineConstants);HOPAC</DefineConstants>
+
+    <VersionPrefix>5.1.0</VersionPrefix>
     <Authors>Andrew Cherry</Authors>
     <Description>Graph-base protocol machines for F#</Description>
     <Description Condition="'$(Hopac)' == 'true'">$(Description) powered by the Hopac concurrency library</Description>
@@ -12,5 +16,30 @@
     <RepositoryUrl>https://github.com/xyncro/hephaestus</RepositoryUrl>
     <PackageTags>$(PackageTags);protocol;machine;functional;graphs;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>
+    <Compile Include="$(MSBuildThisFileDirectory)Hephaestus\Hephaestus.fs" />
+    <EmbeddedResource Include="**\*.resx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="4.3.4" />
+    <PackageReference Include="Aether" Version="[8.2.0,9)" />
+    <PackageReference Include="Anat" Version="[1.0.1,2)" />
+    <PackageReference Include="Hekate" Version="[3.2.1,4)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(Hopac)' == 'true'">
+    <PackageReference Include="Hopac" Version="0.3.23" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
+  </ItemGroup>
 </Project>

src/Hephaestus.Common.targets

@@ -2,5 +2,4 @@
   <PropertyGroup>
     <Hopac>true</Hopac>
   </PropertyGroup>
-  <Import Project="..\Hephaestus.Common.targets" />
 </Project>

src/Hephaestus.Hopac/Hephaestus.Hopac.fsproj

@@ -1,3 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Hephaestus.Common.targets" />
 </Project>