Skip to content

Commit a77bf00

Browse files
authored
Host Split Update host build pipeline to publish a new FunctionsInproc site extension (#9817)
* removing 10
1 parent 55f79f5 commit a77bf00

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

azure-pipelines.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
variables:
22
buildNumber: $[ counter('constant', 13000) ]
33
isReleaseBranch: $[contains(variables['Build.SourceBranch'], 'release/')]
4+
${{ if contains(variables['Build.SourceBranch'], 'release/inproc6/') }}:
5+
minorVersionPrefix: "6"
6+
${{ else }}:
7+
minorVersionPrefix: "10"
48
DOTNET_NOLOGO: 1
59
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
610
DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -10,12 +14,14 @@ pr:
1014
include:
1115
- dev
1216
- release/4.*
17+
- release/inproc6/4.*
1318

1419
trigger:
1520
branches:
1621
include:
1722
- dev
1823
- release/4.*
24+
- release/inproc6/4.*
1925

2026
jobs:
2127
- job: InitializePipeline
@@ -40,7 +46,7 @@ jobs:
4046
dependsOn: InitializePipeline
4147
condition: and(succeeded(), or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.InitializePipeline.outputs['Initialize.BuildArtifacts'], true)))
4248
variables:
43-
${{ if or( eq( variables['Build.Reason'], 'PullRequest' ), and( not( contains( variables['Build.SourceBranch'], 'release/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/ExtensionsMetadataGenerator/' ) ) ) ) }}:
49+
${{ if or( eq( variables['Build.Reason'], 'PullRequest' ), and( not( contains( variables['Build.SourceBranch'], 'release/inproc6/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/ExtensionsMetadataGenerator/' ) ) ) ) }}:
4450
suffixTemp: $(buildNumber)
4551
packSuffixSwitchTemp: --version-suffix $(buildNumber)
4652
emgSuffixSwitchTemp: --version-suffix ci$(buildNumber)
@@ -57,7 +63,7 @@ jobs:
5763
displayName: "Build artifacts"
5864
inputs:
5965
filePath: '$(Build.Repository.LocalPath)\build\build-extensions.ps1'
60-
arguments: '-buildNumber "$(buildNumber)" -suffix "$(suffix)"'
66+
arguments: '-buildNumber "$(buildNumber)" -suffix "$(suffix)" -minorVersionPrefix "$(minorVersionPrefix)"'
6167
- task: PowerShell@2
6268
displayName: "Check for security vulnerabilities"
6369
inputs:

build/Get-AzureFunctionsVersion.psm1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
function Get-AzureFunctionsVersion {
22
param(
33
[string] $buildNumber,
4-
[string] $suffix
4+
[string] $suffix,
5+
[string] $minorVersionPrefix
56
)
67

78
$hasSuffix = ![string]::IsNullOrEmpty($suffix)
@@ -12,7 +13,7 @@ function Get-AzureFunctionsVersion {
1213
}
1314

1415
# use the same logic as the projects to generate the site extension version
15-
$cmd = "build", "$PSScriptRoot\common.props", "/t:EchoVersion", "-restore:False", "/p:BuildNumber=$buildNumber", $suffixCmd, "--nologo", "-clp:NoSummary"
16+
$cmd = "build", "$PSScriptRoot\common.props", "/t:EchoVersion", "-restore:False", "/p:BuildNumber=$buildNumber", "/p:MinorVersionPrefix=$minorVersionPrefix", $suffixCmd, "--nologo", "-clp:NoSummary"
1617
$version = (& dotnet $cmd).Trim()
1718

1819
return $version

build/build-extensions.ps1

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
param (
22
[string]$buildNumber = "0",
3-
[string]$suffix = "",
3+
[string]$suffix = "",
4+
[string]$minorVersionPrefix = "",
45
[string]$hashesForHardlinksFile = "hashesForHardlinks.txt"
56
)
67

78
$rootDir = Split-Path -Parent $PSScriptRoot
89
$buildOutput = Join-Path $rootDir "buildoutput"
910

1011
Import-Module $PSScriptRoot\Get-AzureFunctionsVersion -Force
11-
$extensionVersion = Get-AzureFunctionsVersion $buildNumber $suffix
12+
$extensionVersion = Get-AzureFunctionsVersion $buildNumber $suffix $minorVersionPrefix
1213
Write-Host "Site extension version: $extensionVersion"
1314

1415
# Construct variables for strings like "4.1.0-15898" and "4.1.0"
@@ -50,7 +51,7 @@ function BuildRuntime([string] $targetRid, [bool] $isSelfContained) {
5051
throw "Project path '$projectPath' does not exist."
5152
}
5253

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
5455

5556
Write-Host "======================================"
5657
Write-Host "Building $targetRid"
@@ -241,7 +242,11 @@ function CreateSiteExtensions() {
241242

242243
$zipOutput = "$buildOutput\SiteExtension"
243244
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+
}
245250

246251
# Create directory for content even if there is no patch build. This makes artifact uploading easier.
247252
$patchedContentDirectory = "$buildOutput\PatchedSiteExtension"

build/common.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<TargetFramework>netstandard2.1</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<MajorVersion>4</MajorVersion>
7-
<MinorVersion>30</MinorVersion>
7+
<MinorVersionPrefix Condition="'$(MinorVersionPrefix)' == ''">10</MinorVersionPrefix>
8+
<MinorVersion>$(MinorVersionPrefix)30</MinorVersion>
89
<PatchVersion>0</PatchVersion>
910
<BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
1011
<PreviewVersion></PreviewVersion>

0 commit comments

Comments
 (0)