diff options
| author | Oren Novotny <oren@novotny.org> | 2018-08-31 11:53:35 -0400 |
|---|---|---|
| committer | Oren Novotny <oren@novotny.org> | 2018-08-31 11:53:35 -0400 |
| commit | dce81fed3051bc460152264345ee08368905f835 (patch) | |
| tree | d09c9150e46a937311c36ae33658609703da3fb1 | |
| parent | Add version override logic (diff) | |
| download | BouncyCastle.NET-ed25519-dce81fed3051bc460152264345ee08368905f835.tar.xz | |
Set correct ver for three part builds
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .vsts-shared.yml | 6 | ||||
| -rw-r--r-- | crypto/src/crypto.csproj | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 0f57570ed..7f92de194 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ *.userprefs *.vsp *.coverage - +*.exe *.nupkg Backup/ @@ -19,6 +19,7 @@ _Resharper*/ *.ide/ packages/ .vs/ +.store/ *.nuget.props *.nuget.targets diff --git a/.vsts-shared.yml b/.vsts-shared.yml index aff5d5927..fd835083d 100644 --- a/.vsts-shared.yml +++ b/.vsts-shared.yml @@ -10,10 +10,14 @@ steps: displayName: Install NBGV tool condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) -- script: nbgv cloud +- script: nbgv cloud -c displayName: Set Version condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) +- powershell: echo "##vso[build.updatebuildnumber]$Env:GitBuildVersionSimple" + displayName: Set Version for Mapped + condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false), eq(variables['IsMatchingBase'], true)) + - task: DotNetCoreCLI@2 inputs: command: pack diff --git a/crypto/src/crypto.csproj b/crypto/src/crypto.csproj index b5d250cf9..081155451 100644 --- a/crypto/src/crypto.csproj +++ b/crypto/src/crypto.csproj @@ -37,7 +37,7 @@ <Compile Include="..\bzip2\src\**\*.cs" LinkBase="bzip2" /> <None Include="..\..\BouncyCastle.snk" /> <PackageReference Include="NerdBank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> - <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All" /> + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" /> </ItemGroup> <Target Name="SetBuildVer" AfterTargets="GetBuildVersion" BeforeTargets="SetCloudBuildVersionVars;SetCloudBuildNumberWithVersion"> |