|
1 | 1 | param ( |
2 | 2 | [string]$buildNumber = "0", |
3 | | - [string]$suffix = "", |
| 3 | + [string]$suffix = "", |
| 4 | + [string]$minorVersionPrefix = "", |
4 | 5 | [string]$hashesForHardlinksFile = "hashesForHardlinks.txt" |
5 | 6 | ) |
6 | 7 |
|
7 | 8 | $rootDir = Split-Path -Parent $PSScriptRoot |
8 | 9 | $buildOutput = Join-Path $rootDir "buildoutput" |
9 | 10 |
|
10 | 11 | Import-Module $PSScriptRoot\Get-AzureFunctionsVersion -Force |
11 | | -$extensionVersion = Get-AzureFunctionsVersion $buildNumber $suffix |
| 12 | +$extensionVersion = Get-AzureFunctionsVersion $buildNumber $suffix $minorVersionPrefix |
12 | 13 | Write-Host "Site extension version: $extensionVersion" |
13 | 14 |
|
14 | 15 | # Construct variables for strings like "4.1.0-15898" and "4.1.0" |
@@ -50,7 +51,7 @@ function BuildRuntime([string] $targetRid, [bool] $isSelfContained) { |
50 | 51 | throw "Project path '$projectPath' does not exist." |
51 | 52 | } |
52 | 53 |
|
53 | | - $cmd = "publish", "$PSScriptRoot\..\src\WebJobs.Script.WebHost\WebJobs.Script.WebHost.csproj", "-r", "$targetRid", "--self-contained", "$isSelfContained", "-o", "$publishTarget", "-v", "m", "/p:BuildNumber=$buildNumber", "/p:IsPackable=false", "-c", "Release", $suffixCmd |
| 54 | + $cmd = "publish", "$PSScriptRoot\..\src\WebJobs.Script.WebHost\WebJobs.Script.WebHost.csproj", "-r", "$targetRid", "--self-contained", "$isSelfContained", "-o", "$publishTarget", "-v", "m", "/p:BuildNumber=$buildNumber", "/p:IsPackable=false", "/p:MinorVersionPrefix=$minorVersionPrefix", "-c", "Release", $suffixCmd |
54 | 55 |
|
55 | 56 | Write-Host "======================================" |
56 | 57 | Write-Host "Building $targetRid" |
@@ -241,7 +242,11 @@ function CreateSiteExtensions() { |
241 | 242 |
|
242 | 243 | $zipOutput = "$buildOutput\SiteExtension" |
243 | 244 | New-Item -Itemtype directory -path $zipOutput -Force > $null |
244 | | - ZipContent $siteExtensionPath "$zipOutput\Functions.$extensionVersion$runtimeSuffix.zip" |
| 245 | + if ($minorVersionPrefix -eq "10") { |
| 246 | + ZipContent $siteExtensionPath "$zipOutput\Functions.$extensionVersion$runtimeSuffix.zip" |
| 247 | + } else { |
| 248 | + ZipContent $siteExtensionPath "$zipOutput\FunctionsInProc.$extensionVersion$runtimeSuffix.zip" |
| 249 | + } |
245 | 250 |
|
246 | 251 | # Create directory for content even if there is no patch build. This makes artifact uploading easier. |
247 | 252 | $patchedContentDirectory = "$buildOutput\PatchedSiteExtension" |
|
0 commit comments