diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 59a367b7..cb3df420 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,7 +30,9 @@ steps: write-host "Build number $buildNumber" -fore white $nugetPrerelease = if ($Env:SourceBranch.StartsWith("refs/heads/release/")) { $version.Prerelease } else { "build$($buildNumber.ToString("D6"))" } write-host "Prerelease $nugetPrerelease" -fore white - .\Build\runbuild.ps1 -properties @{"majorVersion"="$($version.Major).0"; "majorWithReleaseVersion"="$($version.Major).0.$($version.Release)"; "nugetPrerelease"=$nugetPrerelease; "assemblyVersion"=$version.Assembly; "zipFileName"="Json$($version.Major)0r$($version.Release).zip"; "signAssemblies"=$sign; "signKeyPath"=$keyPath; "treatWarningsAsErrors"=$true; "buildNuGet"=$true} + $assemblyVersion = if (version.Assembly) { $version.Assembly } else { "$($version.Major).0.0.0" } + write-host "Assembly $assemblyVersion" -fore white + .\Build\runbuild.ps1 -properties @{"majorVersion"="$($version.Major).0"; "majorWithReleaseVersion"="$($version.Major).0.$($version.Release)"; "nugetPrerelease"=$nugetPrerelease; "assemblyVersion"=$assemblyVersion; "zipFileName"="Json$($version.Major)0r$($version.Release).zip"; "signAssemblies"=$sign; "signKeyPath"=$keyPath; "treatWarningsAsErrors"=$true; "buildNuGet"=$true} env: BuildId: $(Build.BuildId) SourceBranch: $(Build.SourceBranch)