From a38a90ca2630c45a77ae53f09b391dad233048ad Mon Sep 17 00:00:00 2001 From: Ruben Bartelink Date: Fri, 21 Dec 2018 18:04:57 +0000 Subject: [PATCH] Use MinVer (#75) --- Directory.Build.props | 4 +-- Directory.Build.targets | 14 ++++++++++ README.md | 6 +++++ azure-pipelines.yml | 26 +++++++++---------- build.proj | 8 +++--- src/Equinox.Codec/Equinox.Codec.fsproj | 2 ++ .../Equinox.EventStore.fsproj | 2 ++ .../Equinox.MemoryStore.fsproj | 2 ++ src/Equinox/Equinox.fsproj | 2 ++ tools/Equinox.Tool/Equinox.Tool.fsproj | 2 ++ 10 files changed, 48 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index bfb9e915c..bebac5421 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,5 @@ - 0.0.1 @jet @bartelink @eiriktsarpalis and contributors Jet.com Composable high performance event sourcing componentry @@ -21,7 +20,8 @@ false - FS2003 + + $(NoWarn);FS2003;NU5105 diff --git a/Directory.Build.targets b/Directory.Build.targets index 406b73cf2..9761fd755 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,4 +3,18 @@ + + + $(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-pr.$(BUILD_PR) + $(PackageVersion).$(MinVerPreRelease) + $(PackageVersion)+$(MinVerBuildMetadata) + $(PackageVersion) + + + + + 0 + $(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(BUILD_ID) + + \ No newline at end of file diff --git a/README.md b/README.md index cfd0b1ae8..47110122f 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,12 @@ The Equinox components within this repository are delivered as a series of multi - `samples/TodoBackend` (in this repo): Standard https://todobackend.com compliant backend - `Equinox.Tool` (Nuget: `dotnet tool install Equinox.Tool -g`): Tool incorporating a benchmark scenario runner, facilitating running representative load tests composed of transactions in `samples/Store` and `samples/TodoBackend` against any nominated store; this allows perf tuning and measurement in terms of both latency and transaction charge aspects. +## Versioning + +## About Versioning + +The repo is versioned based on [SemVer 2.0](https://semver.org/spec/v2.0.0.html) using the tiny-but-mighty [MinVer](https://github.com/adamralph/minver) from @adamralph. [See here](https://github.com/adamralph/minver#how-it-works) for more information on how it works. + ## CONTRIBUTING Please raise GitHub issues for any questions so others can benefit from the discussion. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b55b48f5a..edd9b1b0f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,16 +4,6 @@ jobs: pool: vmImage: 'vs2017-win2016' steps: - - powershell: | - $buildId = $env:BUILD_BUILDNUMBER.PadLeft(7, '0'); - $versionSuffixPR = "ci-$buildId-pr$($env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)"; - $branchName = "$env:BUILD_SOURCEBRANCHNAME".Replace("_",""); - $versionSuffixBRANCH = "$branchName-$buildId"; - $isTag = "$env:BUILD_SOURCEBRANCH".StartsWith('refs/tags/'); - $isPR = "$env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" -ne "" - $versionSuffix = if ($isTag) { "" } else { if ($isPR) { $versionSuffixPR } else { $versionSuffixBRANCH } }; - Write-Host "##vso[task.setvariable variable=VersionSuffix]$versionSuffix"; - displayName: compute VersionSuffix - script: dotnet test build.proj -v n displayName: dotnet test build.proj env: @@ -27,7 +17,8 @@ jobs: - script: dotnet pack build.proj displayName: dotnet pack build.proj env: - VersionSuffix: '$(VersionSuffix)' + BUILD_PR: $(SYSTEM.PULLREQUEST.PULLREQUESTNUMBER) + BUILD_ID: $(BUILD.BUILDNUMBER) - task: PublishBuildArtifacts@1 inputs: pathtoPublish: 'bin/nupkg' @@ -39,7 +30,8 @@ jobs: publishFeedCredentials: 'Jet-MyGet' versioningScheme: byEnvVar versionEnvVar: Version - packagesToPush: 'bin/nupkg/*.nupkg' + packagesToPush: _none +# packagesToPush: 'bin/nupkg/*.nupkg' - job: Linux pool: @@ -58,7 +50,10 @@ jobs: testResultsFiles: 'tests/**/*.trx' condition: succeededOrFailed() - script: dotnet pack build.proj - displayName: dotnet pack build.proj + displayName: dotnet pack + env: + BUILD_PR: $(SYSTEM.PULLREQUEST.PULLREQUESTNUMBER) + BUILD_ID: $(BUILD.BUILDNUMBER) - job: MacOS pool: @@ -77,4 +72,7 @@ jobs: testResultsFiles: 'tests/**/*.trx' condition: succeededOrFailed() - script: dotnet pack build.proj - displayName: dotnet pack build.proj \ No newline at end of file + displayName: dotnet pack + env: + BUILD_PR: $(SYSTEM.PULLREQUEST.PULLREQUESTNUMBER) + BUILD_ID: $(BUILD.BUILDNUMBER) \ No newline at end of file diff --git a/build.proj b/build.proj index 7ecfcbbb3..4ffeb8b56 100644 --- a/build.proj +++ b/build.proj @@ -6,8 +6,9 @@ --configuration Release $([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)")) - -o $(ThisDirAbsolute)bin/nupkg --version-suffix "$(VersionSuffix)" - + /p:BUILD_PR=$(BUILD_PR) + /p:BUILD_ID=$(BUILD_ID) $(PrOption) -o $(ThisDirAbsolute)bin/nupkg + --logger:trx $(TestOptions) --filter KnownFailOn!=Mono @@ -18,9 +19,8 @@ - + diff --git a/src/Equinox.Codec/Equinox.Codec.fsproj b/src/Equinox.Codec/Equinox.Codec.fsproj index e0b91dd19..20a780134 100644 --- a/src/Equinox.Codec/Equinox.Codec.fsproj +++ b/src/Equinox.Codec/Equinox.Codec.fsproj @@ -15,6 +15,8 @@ + + diff --git a/src/Equinox.EventStore/Equinox.EventStore.fsproj b/src/Equinox.EventStore/Equinox.EventStore.fsproj index 16de41a3f..92af6061c 100644 --- a/src/Equinox.EventStore/Equinox.EventStore.fsproj +++ b/src/Equinox.EventStore/Equinox.EventStore.fsproj @@ -22,6 +22,8 @@ + + diff --git a/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj b/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj index d72dd50eb..6c0c39054 100644 --- a/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj +++ b/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj @@ -19,6 +19,8 @@ + + diff --git a/src/Equinox/Equinox.fsproj b/src/Equinox/Equinox.fsproj index 64cd20c3e..8512bd2f3 100644 --- a/src/Equinox/Equinox.fsproj +++ b/src/Equinox/Equinox.fsproj @@ -17,6 +17,8 @@ + + diff --git a/tools/Equinox.Tool/Equinox.Tool.fsproj b/tools/Equinox.Tool/Equinox.Tool.fsproj index cdcec5e77..6cb20885a 100644 --- a/tools/Equinox.Tool/Equinox.Tool.fsproj +++ b/tools/Equinox.Tool/Equinox.Tool.fsproj @@ -38,6 +38,8 @@ + +