Fix artifact generation to support multi TFM (#10107)

Fix artifact generation to support multi TFM

Author: kshyju

azure-pipelines.yml

@@ -1,12 +1,6 @@
 variables:
   buildNumber: $[ counter('constant', 13000) ]
   isReleaseBranch: $[contains(variables['Build.SourceBranch'], 'release/')]
-  ${{ if contains(variables['Build.SourceBranch'], 'release/inproc6/') }}:
-    minorVersionPrefix: "6"
-  ${{ elseif contains(variables['Build.SourceBranch'], 'release/inproc8/') }}:
-    minorVersionPrefix: "8"
-  ${{ else }}:
-    minorVersionPrefix: ""
   DOTNET_NOLOGO: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -46,11 +40,16 @@ jobs:
     name: Initialize
     inputs:
       filePath: '$(Build.Repository.LocalPath)\build\initialize-pipeline.ps1'
-      arguments: -minorVersionPrefix "$(minorVersionPrefix)"
       showWarnings: true
       pwsh: true
 
 - job: BuildArtifacts
+  strategy: 
+    matrix:
+      net6:
+        minorVersionPrefix: "6"
+      net8:
+        minorVersionPrefix: "8"
   dependsOn: InitializePipeline
   condition: and(succeeded(), or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.InitializePipeline.outputs['Initialize.BuildArtifacts'], true)))
   variables:
@@ -68,7 +67,7 @@ jobs:
   steps:
   - template: build/install-dotnet.yml
   - task: PowerShell@2
-    displayName: "Build artifacts"
+    displayName: "Build artifacts $(minorVersionPrefix)"
     inputs:
       filePath: '$(Build.Repository.LocalPath)\build\build-extensions.ps1'
       arguments: '-buildNumber "$(buildNumber)" -suffix "$(suffix)" -minorVersionPrefix "$(minorVersionPrefix)"'
@@ -81,12 +80,13 @@ jobs:
       SourceFolder: 'out/pub/WebJobs.Script.WebHost'
       Contents: '**/*.zip'
       TargetFolder: '$(Build.ArtifactStagingDirectory)'
+
   - task: DotNetCoreCLI@2
     displayName: 'Build host packages'
     inputs:
       command: 'custom'
       custom: 'pack'
-      arguments: -p:BuildNumber=$(buildNumber) -c Release $(packSuffixSwitch)
+      arguments: '-p:BuildNumber=$(buildNumber) -c Release $(packSuffixSwitch) -p:MinorVersionPrefix="$(minorVersionPrefix)"'
       projects: |
         **\WebJobs.Script.csproj
         **\WebJobs.Script.WebHost.csproj
@@ -103,7 +103,7 @@ jobs:
     displayName: 'ESRP CodeSigning: Strong Name and Authenticode'
     inputs:
       ConnectedServiceName: 'ESRP Service'
-      FolderPath: 'out/bin/WebJobs.Script.Abstractions/release'
+      FolderPath: 'out/bin/WebJobs.Script.Abstractions'
       Pattern: Microsoft.Azure.WebJobs.Script.Abstractions*.dll
       signConfigType: inlineSignParams
       inlineOperation: |
@@ -257,8 +257,10 @@ jobs:
     inputs:
       BuildDropPath: '$(Build.ArtifactStagingDirectory)\SiteExtension'
       Verbosity: 'Information'
+
   - publish: $(Build.ArtifactStagingDirectory)\SiteExtension
-    artifact: SiteExtension
+    artifact: _SiteExtension.net$(minorVersionPrefix)
+
   - pwsh: |
       if ((test-path $(Build.ArtifactStagingDirectory)\ZippedPatchSiteExtension))
       {
@@ -272,23 +274,23 @@ jobs:
       BuildDropPath: '$(Build.ArtifactStagingDirectory)\ZippedPatchSiteExtension'
       Verbosity: 'Information'
     condition: and(succeeded(), eq(variables['isPatchVersion'], 'true'))
-  - publish: $(Build.ArtifactStagingDirectory)\ZippedPatchSiteExtension
-    artifact: PatchedSiteExtension
-    condition: and(succeeded(), eq(variables['isPatchVersion'], 'true'))
   - task: ManifestGeneratorTask@0
     displayName: 'SBOM Generation Task - PrivateSiteExtension'
     inputs:
       BuildDropPath: '$(Build.ArtifactStagingDirectory)\PrivateSiteExtension'
       Verbosity: 'Information'
+
   - publish: $(Build.ArtifactStagingDirectory)\PrivateSiteExtension
-    artifact: PrivateSiteExtension
+    artifact: _PrivateSiteExtension.net$(minorVersionPrefix)
+
   - task: ManifestGeneratorTask@0
     displayName: 'SBOM Generation Task - Symbols'
     inputs:
       BuildDropPath: '$(Build.ArtifactStagingDirectory)\Symbols'
       Verbosity: 'Information'
   - publish: $(Build.ArtifactStagingDirectory)\Symbols
-    artifact: Symbols
+    artifact: _Symbols.net$(minorVersionPrefix)
+
   - task: ManifestGeneratorTask@0
     displayName: 'SBOM Generation Task - NugetPackages'
     inputs:
@@ -558,3 +560,88 @@ jobs:
     inputs:
       filePath: '$(Build.Repository.LocalPath)\build\checkin-secrets.ps1'
       arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'' -leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'
+
+- job: PublishArtifacts
+  dependsOn: BuildArtifacts
+  condition: succeeded()
+
+  steps:
+
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download _SiteExtension.net6 Artifact'
+    inputs:
+      buildType: 'current'
+      artifact: '_SiteExtension.net6'
+      path: '$(Build.ArtifactStagingDirectory)/SiteExtension'
+
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download _SiteExtension.net8 Artifact'
+    inputs:
+      buildType: 'current'
+      artifact: '_SiteExtension.net8'
+      path: '$(Build.ArtifactStagingDirectory)/SiteExtension'
+
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download _PrivateSiteExtension.net6 Artifact'
+    inputs:
+      buildType: 'current'
+      artifact: '_PrivateSiteExtension.net6'
+      path: '$(Build.ArtifactStagingDirectory)/PrivateSiteExtension'
+
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download _PrivateSiteExtension.net8 Artifact'
+    inputs:
+      buildType: 'current'
+      artifact: '_PrivateSiteExtension.net8'
+      path: '$(Build.ArtifactStagingDirectory)/PrivateSiteExtension'
+
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download _Packages.net8 Artifact'
+    inputs:
+      buildType: 'current'
+      artifact: '_Packages.net8'
+      path: '$(Build.ArtifactStagingDirectory)/packages'
+
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download Symbols6 Artifact'
+    inputs:
+      buildType: 'current'
+      artifact: '_Symbols.net6'
+      path: '$(Build.ArtifactStagingDirectory)/Symbols'
+
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download Symbols8 Artifact'
+    inputs:
+      buildType: 'current'
+      artifact: '_Symbols.net8'
+      path: '$(Build.ArtifactStagingDirectory)/Symbols'
+
+# Publish artifacts.
+
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish SiteExtension Artifact'
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)/SiteExtension'
+      artifact: 'SiteExtension'
+      publishLocation: 'pipeline'
+
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish PrivateSiteExtension Artifact'
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)/PrivateSiteExtension'
+      artifact: 'PrivateSiteExtension'
+      publishLocation: 'pipeline'
+
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish Nuget packages Artifact'
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)/packages'
+      artifact: 'NugetPackages'
+      publishLocation: 'pipeline'
+
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish Symbols Artifact'
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)/Symbols'
+      artifact: 'Symbols'
+      publishLocation: 'pipeline'

build/build-extensions.ps1

@@ -20,6 +20,13 @@ $patchVersion = [int]$versionParts[2]
 $isPatch = $patchVersion -gt 0
 Write-Host "MajorMinorVersion is '$majorMinorVersion'. Patch version is '$patchVersion'. IsPatch: '$isPatch'"
 
+#  Based on the minorVersionPrefix value, set target framework to be used for building/publishing
+if ($minorVersionPrefix -eq "8") {
+    $targetFramework = "net8.0"
+} else {
+    $targetFramework = "net6.0"
+}
+
 function ZipContent([string] $sourceDirectory, [string] $target) {
     $stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
 
@@ -41,17 +48,18 @@ function ZipContent([string] $sourceDirectory, [string] $target) {
 function BuildRuntime([string] $targetRid, [bool] $isSelfContained) {
     $stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
 
-    $publishTarget = "$publishDir\release_$targetRid"
+    $publishTarget = "$publishDir\release_$targetFramework" + "_$targetRid"
+
     $projectPath = "$rootDir\src\WebJobs.Script.WebHost\WebJobs.Script.WebHost.csproj"
     if (-not (Test-Path $projectPath))
     {
         throw "Project path '$projectPath' does not exist."
     }
 
-    $cmd = "publish", $projectPath , "-r", "$targetRid", "--self-contained", "$isSelfContained", "-v", "m", "-c", "Release", "-p:IsPackable=false", "-p:BuildNumber=$buildNumber", "-p:MinorVersionPrefix=$minorVersionPrefix"
+    $cmd = "publish", $projectPath , "-r", "$targetRid", "-f", "$targetFramework", "--self-contained", "$isSelfContained", "-v", "m", "-c", "Release", "-p:IsPackable=false", "-p:BuildNumber=$buildNumber", "-p:MinorVersionPrefix=$minorVersionPrefix"
 
     Write-Host "======================================"
-    Write-Host "Building $targetRid"
+    Write-Host "Building $targetRid for target framework $targetFramework"
     Write-Host "  Self-Contained:    $isSelfContained"
     Write-Host "  Publish Directory:  $publishTarget"
     Write-Host ""
@@ -80,7 +88,7 @@ function BuildRuntime([string] $targetRid, [bool] $isSelfContained) {
     Write-Host ""
     CleanOutput $publishTarget
     Write-Host ""
-    Write-Host "Done building $targetRid. Elapsed: $($stopwatch.Elapsed)"
+    Write-Host "Done building $targetRid for target framework $targetFramework. Elapsed: $($stopwatch.Elapsed)"
     Write-Host "======================================"
     Write-Host ""
 }
@@ -219,8 +227,8 @@ function CreateSiteExtensions() {
 
     Write-Host "======================================"
     Write-Host "Copying build to temp directory to prepare for zipping official site extension."
-    Copy-Item -Path $publishDir\release_win-x86\ -Destination $officialSiteExtensionPath\32bit -Force -Recurse > $null
-    Copy-Item -Path $publishDir\release_win-x64 -Destination $officialSiteExtensionPath\64bit -Force -Recurse > $null
+    Copy-Item -Path "$publishDir\release_$targetFramework`_win-x86\" -Destination "$officialSiteExtensionPath\32bit" -Force -Recurse > $null
+    Copy-Item -Path "$publishDir\release_$targetFramework`_win-x64\" -Destination "$officialSiteExtensionPath\64bit" -Force -Recurse > $null
     Copy-Item -Path $officialSiteExtensionPath\32bit\applicationHost.xdt -Destination $officialSiteExtensionPath -Force > $null
     Write-Host "  Deleting workers directory: $officialSiteExtensionPath\32bit\workers" 
     Remove-Item -Recurse -Force "$officialSiteExtensionPath\32bit\workers" -ErrorAction SilentlyContinue
@@ -290,7 +298,7 @@ function CreateSiteExtensions() {
     Write-Host "======================================"
     $stopwatch.Reset()
     Write-Host "Copying build to temp directory to prepare for zipping private site extension."
-    Copy-Item -Path $publishDir\release_win-x86\ -Destination $siteExtensionPath\SiteExtensions\Functions\32bit -Force -Recurse > $null
+    Copy-Item -Path $publishDir\release_$targetFramework`_win-x86\ -Destination $siteExtensionPath\SiteExtensions\Functions\32bit -Force -Recurse > $null
     Copy-Item -Path $siteExtensionPath\SiteExtensions\Functions\32bit\applicationHost.xdt -Destination $siteExtensionPath\SiteExtensions\Functions -Force > $null
     Write-Host "Done copying. Elapsed: $($stopwatch.Elapsed)"
     Write-Host "======================================"