Allow arbitrary platform settings to Build-Code.ps1

Author: hallipr

core/Azure.Mcp.Core/tests/test-resources-post.ps1

@@ -9,7 +9,7 @@ param(
 $ErrorActionPreference = "Stop"
 
 . "$PSScriptRoot/../../../eng/common/scripts/common.ps1"
-. "$PSScriptRoot/../../../eng/scripts/helpers/TestResourcesHelpers.ps1"
+. "$PSScriptRoot/../../../eng/scripts/helpers.ps1"
 
 $testSettings = New-TestSettings @PSBoundParameters -OutputPath $PSScriptRoot
 

eng/pipelines/templates/jobs/build.yml

@@ -63,15 +63,12 @@ jobs:
       pwsh: true
       filePath: $(Build.SourcesDirectory)/eng/scripts/Build-Code.ps1
       arguments: >
-        -ServerName '${{ parameters.ServerName }}'
         -BuildInfoPath '$(Pipeline.Workspace)/build_info/build_info.json'
         -OutputPath '$(Build.ArtifactStagingDirectory)'
-        -OperatingSystem '${{ parameters.OSName }}'
-        -Architecture '$(Architecture)'
-        -Native:$$(Native)
+        -ServerName '${{ parameters.ServerName }}'
+        -PlatformName '$(PlatformName)'
         -ReleaseBuild:$${{ ne(parameters.PublishTarget, 'none') }}
         -SelfContained
-        -Trimmed:$$(Trimmed)
         -SingleFile
 
   - task: Powershell@2

eng/scripts/Build-Code.ps1

@@ -1,34 +1,39 @@
 #!/bin/env pwsh
 #Requires -Version 7
 
-[CmdletBinding(DefaultParameterSetName='none')]
+[CmdletBinding(DefaultParameterSetName='SpecificPlatform')]
 param(
-    [string] $BuildInfoPath,
     [string] $OutputPath,
+    [string] $ServerName,
+
     [switch] $SelfContained,
     [switch] $SingleFile,
     [switch] $ReadyToRun,
-    [switch] $Trimmed,
     [switch] $ReleaseBuild,
     [switch] $CleanBuild,
-    [switch] $Native,
-    [string] $ServerName,
 
-    [Parameter(Mandatory, ParameterSetName='SpecificPlatform')]
+    [Parameter(ParameterSetName='SpecificPlatform')]
     [Alias('OS')]
-    [ValidateSet('windows','linux','macos')]
-    [string[]] $OperatingSystem,
-
-    [Parameter(Mandatory, ParameterSetName='SpecificPlatform')]
-    [ValidateSet('x64','arm64')]
-    [string[]] $Architecture,
+    [string[]] $OperatingSystems,
+    [Parameter(ParameterSetName='SpecificPlatform')]
+    [string[]] $Architectures,
+    [Parameter(ParameterSetName='SpecificPlatform')]
+    [switch] $Trimmed,
+    [Parameter(ParameterSetName='SpecificPlatform')]
+    [switch] $Native,
 
-    [Parameter(ParameterSetName='AllPlatforms')]
-    [switch] $AllPlatforms
+    [Parameter(ParameterSetName='BuildInfoPlatform')]
+    [string] $BuildInfoPath,
+    [Parameter(ParameterSetName='BuildInfoPlatform')]
+    [switch] $AllPlatforms,
+    [Parameter(Mandatory = {!$AllPlatforms}, ParameterSetName='BuildInfoPlatform')]
+    [string] $PlatformName
 )
 
 $ErrorActionPreference = 'Stop'
 . "$PSScriptRoot/../common/scripts/common.ps1"
+. "$PSScriptRoot/helpers.ps1"
+
 $RepoRoot = $RepoRoot.Path.Replace('\', '/')
 
 $exitCode = 0
@@ -37,131 +42,167 @@ if (!$OutputPath) {
     $OutputPath = "$RepoRoot/.work/build"
 }
 
-if(!$BuildInfoPath) {
-    $BuildInfoPath = "$RepoRoot/.work/build_info.json"
-}
+function BuildServer($server) {
+    $serverName = $server.name
+    $projectPath = $server.path
 
-if (!(Test-Path $BuildInfoPath)) {
-    LogError "Build info file $BuildInfoPath does not exist. Run eng/scripts/New-BuildInfo.ps1 to create it."
-    $exitCode = 1
-}
+    if(!(Test-Path $projectPath)) {
+        LogError "No project file found for $serverName"
+        $script:exitCode = 1
+        return
+    }
 
-# normalize OperatingSystem and Architecture
-$runtime = [System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier.Split('-')
+    $version = $server.version
 
-if($OperatingSystem) {
-    $OperatingSystem = $OperatingSystem | Select-Object -Unique
-} else {
-    if($AllPlatforms -and $Native) {
-        LogWarning "Native Builds do not support Cross OS builds. Only building for the current OS."
-    }
+    if($PlatformName) {
+        $platforms = $server.platforms | Where-Object { $_.name -eq $PlatformName }
 
-    if ($AllPlatforms -and !$Native) {
-        $OperatingSystem = @('windows', 'linux', 'macOS')
-    } else {
-        if ($IsWindows) {
-            $OperatingSystem = @('windows')
-        } elseif ($IsLinux) {
-            $OperatingSystem = @('linux')
-        } elseif ($IsMacOS) {
-            $OperatingSystem = @('macOS')
-        } else {
-            LogError "Unsupported OS detected. Supported OS are Windows, Linux and macOS."
-            $exitCode = 1
+        if ($platforms.Count -eq 0) {
+            LogError "No build configuration found for $serverName on $os-$arch with Native=$Native and Trimmed=$Trimmed"
+            $script:exitCode = 1
+            continue
         }
+    } else {
+        $platforms = $server.platforms
     }
-}
 
-if($Architecture) {
-    $Architecture = $Architecture | Select-Object -Unique
-} else {
-    $Architecture = $AllPlatforms ? @('x64', 'arm64') : @($runtime[1])
-}
+    foreach($platform in $platforms) {
+        $dotnetOs = $platform.dotnetOs
+        $arch = $platform.architecture
+        $configuration = if ($ReleaseBuild) { 'Release' } else { 'Debug' }
+        $runtime = "$dotnetOs-$arch"
 
-# Exit early if there were parameter errors
-if($exitCode -ne 0) {
-    exit $exitCode
-}
+        $outputDir = "$OutputPath/$($platform.artifactPath)"
+        Write-Host "Building $configuration $runtime, version $version in $outputDir" -ForegroundColor Green
 
-$buildInfo = Get-Content $BuildInfoPath -Raw | ConvertFrom-Json -AsHashtable
+        # Clear and recreate the package output directory
+        Remove-Item -Path $outputDir -Recurse -Force -ErrorAction SilentlyContinue -ProgressAction SilentlyContinue
+        New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
 
-function BuildServer($server) {
-    $serverName = $server.name
+        $command = "dotnet publish '$projectPath' --runtime '$runtime' --output '$outputDir' /p:Version=$version /p:Configuration=$configuration"
 
-    if(!(Test-Path $server.path)) {
-        LogError "No project file found for $serverName"
-        $script:exitCode = 1
-        return
-    }
+        if($SelfContained -or $platform.trimmed) {
+            $command += " --self-contained"
+        }
 
-    $projectPath = $server.path
-    $version = $server.version
+        if($platform.trimmed) {
+            $command += " /p:PublishTrimmed=true"
+        }
 
-    $serverOutputDirectory = "$OutputPath/$($server.artifactPath)"
+        if($platform.native) {
+            $command += " /p:BuildNative=true"
+        }
 
-    New-Item -Path $serverOutputDirectory -ItemType Directory -Force | Out-Null
+        if($ReadyToRun) {
+            $command += " /p:PublishReadyToRun=true"
+        }
 
-    foreach ($os in $OperatingSystem) {
-        foreach ($arch in $Architecture) {
-            $filteredPlatforms = @($server.platforms
-            | Where-Object {
-                ($_.operatingSystem -eq $os) -and
-                ($_.architecture -eq $arch) -and
-                ($_.native -eq $Native) -and
-                ($_.trimmed -eq $Trimmed) })
+        if($SingleFile) {
+            $command += " /p:PublishSingleFile=true"
+        }
 
-            if ($filteredPlatforms.Count -eq 0) {
-                LogError "No build configuration found for $serverName on $os-$arch with Native=$Native and Trimmed=$Trimmed"
-                $script:exitCode = 1
-                continue
-            } elseif ($filteredPlatforms.Count -gt 1) {
-                LogError "Multiple build configurations found for $serverName on $os-$arch with Native=$Native"
-                $script:exitCode = 1
-                continue
-            }
+        Invoke-LoggedMsBuildCommand $command -GroupOutput
+    }
 
-            $platform = $filteredPlatforms[0]
+    Write-Host "`nBuild completed successfully!" -ForegroundColor Green
+}
 
-            $dotnetOs = $platform.dotnetOs
-            $runtime = "$dotnetOs-$arch"
-            $configuration = if ($ReleaseBuild) { 'Release' } else { 'Debug' }
+function CreateServersWithPlatforms {
+    if(!$OperatingSystems) {
+        if ($IsWindows) {
+            $OperatingSystems = @('windows')
+        } elseif ($IsLinux) {
+            $OperatingSystems = @('linux')
+        } elseif ($IsMacOS) {
+            $OperatingSystems = @('macos')
+        } else {
+            LogError "Unsupported OS detected. Supported OS are Windows, Linux and macOS."
+            $exitCode = 1
+        }
+    }
 
-            $outputDir = "$OutputPath/$($platform.artifactPath)"
-            Write-Host "Building $configuration $runtime, version $version in $outputDir" -ForegroundColor Green
+    if(!$Architectures) {
+        $currentArch = [System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier.Split('-')[1]
+        $Architectures = @($currentArch)
+    }
 
-            # Clear and recreate the package output directory
-            Remove-Item -Path $outputDir -Recurse -Force -ErrorAction SilentlyContinue -ProgressAction SilentlyContinue
-            New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
+    $OperatingSystems = $OperatingSystems | Sort-Object -Unique
+    $Architectures = $Architectures | Sort-Object -Unique
+    $osDetails = Get-OperatingSystems
 
-            $command = "dotnet publish '$projectPath' --runtime '$runtime' --output '$outputDir' /p:Version=$version /p:Configuration=$configuration"
+    $serverDirectories = Get-ChildItem "$RepoRoot/servers" -Directory
+    $serverProjects = $serverDirectories | Get-ChildItem -Filter "src/*.csproj"
+    if ($ServerName) {
+        $serverProjects = $serverProjects | Where-Object { $_.BaseName -eq $ServerName }
+        if ($serverProjects.Count -eq 0) {
+            LogError "No server project found with name '$ServerName'."
+            $exitCode = 1
+        }
+    }
 
-            if($SelfContained) {
-                $command += " --self-contained"
-            }
+    $serverProjects | ForEach-Object {
+        $serverName = $_.BaseName
+        $projectPath = $_.FullName
+        $properties = . "$PsScriptRoot/Get-ProjectProperties.ps1" -Path $projectPath
 
-            if($ReadyToRun) {
-                $command += " /p:PublishReadyToRun=true"
-            }
+        $platforms = @($OperatingSystems | ForEach-Object {
+            $os = $osDetails | Where-Object Name -eq -value $_
 
-            if($Trimmed) {
-                $command += " /p:PublishTrimmed=true"
+            if(-not $os) {
+                LogError "Unsupported operating system specified: '$_'. Supported OS are: $($osDetails.Name -join ', ')"
+                $script:exitCode = 1
+                return
             }
 
-            if($Native) {
-                $command += " /p:BuildNative=true"
+            $Architectures | ForEach-Object {
+                $platform = "$($os.Name)-$_"
+                [ordered]@{
+                    name = $platform
+                    dotnetOs = $os.DotNetName
+                    architecture = $_
+                    artifactPath = "$serverName/$platform"
+                    native = $Native
+                    trimmed = $Trimmed
+                }
             }
+        })
 
-            if($SingleFile) {
-                $command += " /p:PublishSingleFile=true"
-            }
+        [ordered]@{
+            name = $serverName
+            path = $projectPath.Replace('\', '/')
+            version = $properties.Version
+            platforms = $platforms
+        }
+    }
+}
 
-            Invoke-LoggedMsBuildCommand $command -GroupOutput
+$servers = @()
 
-            Write-Host "`nBuild completed successfully!" -ForegroundColor Green
+if($PSCmdlet.ParameterSetName -eq 'SpecificPlatform') {
+    $servers = CreateServersWithPlatforms
+} else {
+    if(!$BuildInfoPath) {
+        $BuildInfoPath = "$RepoRoot/.work/build_info.json"
+    }
+
+    $buildInfo = Get-Content $BuildInfoPath -Raw | ConvertFrom-Json -AsHashtable
+
+    $servers = $buildInfo.servers
+
+    if ($ServerName) {
+        $servers = $servers | Where-Object { $_.name -eq $ServerName }
+        if ($servers.Count -eq 0) {
+            LogError "No build configuration found for server named '$ServerName' in build info file."
+            $exitCode = 1
         }
     }
 }
 
+# Exit early if there were parameter errors
+if($exitCode -ne 0) {
+    exit $exitCode
+}
+
 Push-Location $RepoRoot
 try {
     if ($CleanBuild) {
@@ -170,7 +211,7 @@ try {
         Remove-Item * -Recurse -Include 'obj', 'bin' -Force -ProgressAction SilentlyContinue
     }
 
-    foreach ($server in $buildInfo.servers) {
+    foreach ($server in $servers) {
         BuildServer $server
 
         if ($LastExitCode -ne 0) {

eng/scripts/New-BuildInfo.ps1

@@ -13,7 +13,8 @@ param(
 )
 
 . "$PSScriptRoot/../common/scripts/common.ps1"
-. "$PSScriptRoot/helpers/PathHelpers.ps1"
+. "$PSScriptRoot/helpers.ps1"
+
 $RepoRoot = $RepoRoot.Path.Replace('\', '/')
 $isPipelineRun = $CI -or $env:TF_BUILD -eq 'true'
 $isPullRequestBuild = $env:BUILD_REASON -eq 'PullRequest'
@@ -62,14 +63,9 @@ $serverDirectories = Get-ChildItem "$RepoRoot/servers" -Directory
 $toolDirectories = Get-ChildItem "$RepoRoot/tools" -Directory
 $coreDirectories = Get-ChildItem "$RepoRoot/core" -Directory
 
+$operatingSystems = Get-OperatingSystems
 $architectures = @('x64', 'arm64')
 
-$operatingSystems = @(
-    @{ name = 'linux'; nodeName = 'linux'; dotnetName = 'linux'; extension = '' }
-    @{ name = 'macos'; nodeName = 'darwin'; dotnetName = 'osx'; extension = '' }
-    @{ name = 'windows'; nodeName = 'win32'; dotnetName = 'win'; extension = '.exe' }
-)
-
 # Public releases always use the version from the repo without a dynamic prerelease suffix, except for test pipelines
 # which always use a dynamic prerelease suffix to allow for multiple releases from the same commit
 $dynamicPrereleaseVersion = $PublishTarget -ne 'public' -or $TestPipeline
@@ -562,6 +558,7 @@ function Get-BuildMatrices {
             $runRecordedTests = $runUnitTests -and ($pathsToTest | Where-Object { $_.hasRecordedTests } | Measure-Object | Select-Object -ExpandProperty Count) -gt 0
 
             $buildMatrix[$legName] = [ordered]@{
+                PlatformName = $platform.name
                 Pool = $pool
                 OSVmImage = $vmImage
                 Architecture = $arch