From 5a673535c861bd487f6351216c953d16b84742ba Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 9 May 2019 14:50:14 +1200
Subject: [PATCH] Support configuring assembly version in version.json

---
 Build/build.ps1     | 5 ++---
 Build/version.json  | 3 ++-
 azure-pipelines.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Build/build.ps1 b/Build/build.ps1
index 37746543..52eb1b08 100644
--- a/Build/build.ps1
+++ b/Build/build.ps1
@@ -12,6 +12,7 @@
   $msbuildVerbosity = 'minimal'
   $treatWarningsAsErrors = $false
   $workingName = if ($workingName) {$workingName} else {"Working"}
+  $assemblyVersion = if ($assemblyVersion) {$assemblyVersion} else {$majorVersion + '.0.0'}
   $netCliChannel = "2.0"
   $netCliVersion = "2.2.105"
   $nugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
@@ -154,11 +155,9 @@ function NetCliBuild()
 
   exec { & $script:msBuildPath "/t:restore" "/v:$msbuildVerbosity" "/p:Configuration=Release" "/p:LibraryFrameworks=`"$libraryFrameworks`"" "/p:TestFrameworks=`"$testFrameworks`"" "/m" $projectPath | Out-Default } "Error restoring $projectPath"
 
-  Write-Host -ForegroundColor Green "Building $libraryFrameworks in $projectPath"
+  Write-Host -ForegroundColor Green "Building $libraryFrameworks $assemblyVersion in $projectPath"
   Write-Host
 
-  $assemblyVersion = $majorVersion + '.0.0'
-
   exec { & $script:msBuildPath "/t:build" "/v:$msbuildVerbosity" $projectPath "/p:Configuration=Release" "/p:LibraryFrameworks=`"$libraryFrameworks`"" "/p:TestFrameworks=`"$testFrameworks`"" "/p:AssemblyOriginatorKeyFile=$signKeyPath" "/p:SignAssembly=$signAssemblies" "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" "/p:AdditionalConstants=$additionalConstants" "/p:GeneratePackageOnBuild=$buildNuGet" "/p:ContinuousIntegrationBuild=true" "/p:PackageId=$packageId" "/p:VersionPrefix=$majorWithReleaseVersion" "/p:VersionSuffix=$nugetPrerelease" "/p:AssemblyVersion=$assemblyVersion" "/p:FileVersion=$version" "/m" }
 }
 
diff --git a/Build/version.json b/Build/version.json
index b92f445b..097055f1 100644
--- a/Build/version.json
+++ b/Build/version.json
@@ -1,5 +1,6 @@
 {
   "Major": 12,
   "Release": 2,
-  "Prerelease": null
+  "Prerelease": null,
+  "Assembly": "12.0.0.2"
 }
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index baffb324..81dc3495 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,7 +30,7 @@ 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; "zipFileName"="Json$($version.Major)0r$($version.Release).zip"; "signAssemblies"=$sign; "signKeyPath"=$keyPath; "treatWarningsAsErrors"=$true; "buildNuGet"=$true}
+    .\Build\runbuild.ps1 -properties @{"majorVersion"="$($version.Major).0"; "majorWithReleaseVersion"="$($version.Major).0.$($version.Release)"; "nugetPrerelease"=$nugetPrerelease; "assemblyVersion"=$version.AssemblyVersion; "zipFileName"="Json$($version.Major)0r$($version.Release).zip"; "signAssemblies"=$sign; "signKeyPath"=$keyPath; "treatWarningsAsErrors"=$true; "buildNuGet"=$true}
   env:
     BuildId: $(Build.BuildId)
     SourceBranch: $(Build.SourceBranch)