Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge build changes from chiron-6 branch
- Loading branch information
Showing
8 changed files
with
40 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ paket-files | |
*.suo | ||
*.user | ||
*.sln.docstates | ||
.vs/ | ||
|
||
# Build results | ||
.fake/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,9 @@ | ||
version: 7.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\Chiron.Tests\Chiron.Tests.fsproj | ||
- ps: dotnet pack -c Release --version-suffix "aci-${env:APPVEYOR_BUILD_NUMBER}" | ||
- ps: dotnet benchmarks\Chiron.Benchmarks\bin\Release\netcoreapp2.0\Chiron.Benchmarks.dll --class SwaggerSchema | ||
|
||
- ps: | | ||
.\build.ps1 | ||
if ($lastexitcode -ne 0){ exit $lastexitcode } | ||
test: off | ||
|
||
artifacts: | ||
- path: '**\*.nupkg' | ||
- path: bin\*.nupkg | ||
- path: '**\BenchmarkDotNet.Artifacts\**\*.*' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
[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 Chiron.sln /p:Version=$version$versionSuffix | ||
dotnet test --no-build -c Release tests/Chiron.Tests/Chiron.Tests.fsproj | ||
dotnet pack --no-build -c Release src/Chiron /p:Version=$version$versionSuffix -o $psscriptroot/bin | ||
# dotnet benchmarks\Chiron.Benchmarks\bin\Release\netcoreapp2.0\Chiron.Benchmarks.dll --class SwaggerSchema |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,16 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
<PropertyGroup> | ||
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks> | ||
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks> | ||
<VersionPrefix>7.0.0</VersionPrefix> | ||
<GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<!--<Compile Include="Chiron.fsi" />--> | ||
<Compile Include="Chiron.fs" /> | ||
</ItemGroup> | ||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'"> | ||
<PackageReference Include="FParsec" Version="1.0.2" /> | ||
</ItemGroup> | ||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> | ||
<ItemGroup> | ||
<PackageReference Include="Aether" Version="8.2.0" /> | ||
<PackageReference Include="FParsec" Version="1.0.3" /> | ||
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" /> | ||
</ItemGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.