diff --git a/.gitignore b/.gitignore index 44a79dbc..9d563042 100644 --- a/.gitignore +++ b/.gitignore @@ -87,6 +87,7 @@ $tf/ _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user +.idea/ # JustCode is a .NET coding addin-in .JustCode diff --git a/.travis.yml b/.travis.yml index e7889913..73a18e4a 100644 --- a/.travis.yml +++ b/.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,10 +15,10 @@ 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 @@ -27,4 +29,4 @@ script: branches: except: - - gh-pages \ No newline at end of file + - gh-pages diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index 84f024bf..00000000 --- a/NuGet.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/appveyor.yml b/appveyor.yml index 9f127207..b5444f68 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,7 @@ -version: 4.0.0-aci-{build} - +image: Visual Studio 2017 build_script: - - ps: dotnet --info - - ps: dotnet restore - - 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: '**\BenchmarkDotNet.Artifacts\**\*.*' +- path: bin\*.nupkg diff --git a/build.ps1 b/build.ps1 new file mode 100644 index 00000000..f1261ba2 --- /dev/null +++ b/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 Freya.sln /p:Version=$version$versionSuffix +dotnet pack --no-build -c Release src/Freya /p:Version=$version$versionSuffix -o $psscriptroot/bin +dotnet pack --no-build -c Release src/Freya.Hopac /p:Version=$version$versionSuffix -o $psscriptroot/bin diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f65bb1e9..329120f5 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -12,6 +12,14 @@ https://github.com/xyncro/freya $(PackageTags);functional;web;freya;f#;fsharp $(PackageTags);hopac + true + + + true + true + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + + + diff --git a/src/Freya.Hopac/Freya.Hopac.csproj b/src/Freya.Hopac/Freya.Hopac.csproj index 75a9b987..eb5914e4 100644 --- a/src/Freya.Hopac/Freya.Hopac.csproj +++ b/src/Freya.Hopac/Freya.Hopac.csproj @@ -5,9 +5,9 @@ - - - - + + + + diff --git a/src/Freya/Freya.csproj b/src/Freya/Freya.csproj index 65c56235..4b03e03f 100644 --- a/src/Freya/Freya.csproj +++ b/src/Freya/Freya.csproj @@ -2,9 +2,9 @@ - - - - + + + +