Skip to content

Commit

Permalink
Merge pull request #97 from ctaggart/chiron-6
Browse files Browse the repository at this point in the history
build remodel for a 6.3
  • Loading branch information
panesofglass authored Sep 28, 2018
2 parents 74fcfe1 + 67c39f4 commit 3558cbe
Show file tree
Hide file tree
Showing 15 changed files with 78 additions and 1,838 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ paket-files
*.suo
*.user
*.sln.docstates
.vs/

# Build results
.fake/
Expand Down
276 changes: 0 additions & 276 deletions .paket/Paket.Restore.targets

This file was deleted.

Binary file removed .paket/paket.bootstrapper.exe
Binary file not shown.
72 changes: 0 additions & 72 deletions .paket/paket.targets

This file was deleted.

46 changes: 24 additions & 22 deletions Chiron.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1A4266E5-5717-4405-ACD6-993DE3C8DE6C}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Chiron", "src\Chiron\Chiron.fsproj", "{4393FF1A-1C77-4087-9A5A-D89FB13480A6}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Chiron", "src\Chiron\Chiron.fsproj", "{4393FF1A-1C77-4087-9A5A-D89FB13480A6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{82DCB4A9-D431-4D37-B55F-D0B08C3B3A40}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Chiron.Tests", "tests\Chiron.Tests\Chiron.Tests.fsproj", "{E32A6190-0B57-4273-A031-1EA8F2FD82AE}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Chiron.Tests", "tests\Chiron.Tests\Chiron.Tests.fsproj", "{E32A6190-0B57-4273-A031-1EA8F2FD82AE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -20,37 +19,40 @@ Global
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|x64.ActiveCfg = Debug|x64
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|x64.Build.0 = Debug|x64
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|x86.ActiveCfg = Debug|x86
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|x86.Build.0 = Debug|x86
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|x64.ActiveCfg = Debug|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|x64.Build.0 = Debug|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|x86.ActiveCfg = Debug|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Debug|x86.Build.0 = Debug|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|Any CPU.Build.0 = Release|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|x64.ActiveCfg = Release|x64
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|x64.Build.0 = Release|x64
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|x86.ActiveCfg = Release|x86
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|x86.Build.0 = Release|x86
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|x64.ActiveCfg = Release|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|x64.Build.0 = Release|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|x86.ActiveCfg = Release|Any CPU
{4393FF1A-1C77-4087-9A5A-D89FB13480A6}.Release|x86.Build.0 = Release|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|x64.ActiveCfg = Debug|x64
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|x64.Build.0 = Debug|x64
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|x86.ActiveCfg = Debug|x86
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|x86.Build.0 = Debug|x86
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|x64.ActiveCfg = Debug|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|x64.Build.0 = Debug|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|x86.ActiveCfg = Debug|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Debug|x86.Build.0 = Debug|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|Any CPU.Build.0 = Release|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|x64.ActiveCfg = Release|x64
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|x64.Build.0 = Release|x64
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|x86.ActiveCfg = Release|x86
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|x86.Build.0 = Release|x86
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|x64.ActiveCfg = Release|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|x64.Build.0 = Release|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|x86.ActiveCfg = Release|Any CPU
{E32A6190-0B57-4273-A031-1EA8F2FD82AE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4393FF1A-1C77-4087-9A5A-D89FB13480A6} = {1A4266E5-5717-4405-ACD6-993DE3C8DE6C}
{E32A6190-0B57-4273-A031-1EA8F2FD82AE} = {82DCB4A9-D431-4D37-B55F-D0B08C3B3A40}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FFB8819D-FD60-470D-862E-5C48798A31F6}
EndGlobalSection
EndGlobal
7 changes: 7 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
image: Visual Studio 2017
build_script:
- ps: |
.\build.ps1
if ($lastexitcode -ne 0){ exit $lastexitcode }
artifacts:
- path: bin\*.nupkg
14 changes: 0 additions & 14 deletions build.cmd

This file was deleted.

20 changes: 20 additions & 0 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
$version = '6.3.0' # 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
24 changes: 0 additions & 24 deletions paket.dependencies

This file was deleted.

Loading

0 comments on commit 3558cbe

Please sign in to comment.