[v3 acquisition] PR1: bake CLI channel into assembly metadata

.github/workflows/build-cli-native-archives.yml

@@ -33,6 +33,18 @@ jobs:
     strategy:
       matrix:
         targets: ${{ fromJson(inputs.targets) }}
+    # Compute the Aspire CLI channel from the triggering GH Actions event,
+    # mirroring the algorithm in eng/pipelines/templates/build_sign_native.yml
+    # (computeCliChannel step):
+    #   pull_request          -> pr
+    #   refs/heads/release/*  -> staging
+    #   refs/heads/internal/release/* -> staging
+    #   anything else (push to main, schedule, workflow_dispatch) -> daily
+    # The AzDO 'stable' branch (DotNetFinalVersionKind == 'release') is
+    # intentionally omitted: stable archives are produced only by the AzDO
+    # release pipeline, never by GH Actions.
+    env:
+      ASPIRE_CLI_CHANNEL: ${{ github.event_name == 'pull_request' && 'pr' || (startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/internal/release/')) && 'staging' || 'daily' }}
 
     steps:
       - name: Checkout code
@@ -56,6 +68,7 @@ jobs:
           /bl:${{ github.workspace }}/artifacts/log/${{ inputs.configuration }}/BuildBundleDeps.binlog
           /p:ContinuousIntegrationBuild=true
           /p:BuildBundleDepsOnly=true
+          /p:AspireCliChannel=${{ env.ASPIRE_CLI_CHANNEL }}
           ${{ inputs.versionOverrideArg }}
 
       - name: Build bundle payload archive
@@ -85,6 +98,7 @@ jobs:
           /p:SkipManagedBuild=true
           /p:TargetRids=${{ matrix.targets.rids }}
           /p:BundlePayloadPath=${{ github.workspace }}/artifacts/bundle/aspire-ci-bundlepayload-${{ matrix.targets.rids }}.tar.gz
+          /p:AspireCliChannel=${{ env.ASPIRE_CLI_CHANNEL }}
           ${{ inputs.versionOverrideArg }}
 
       - name: Verify CLI tool nupkg

.github/workflows/polyglot-validation/setup-local-cli.sh

@@ -36,14 +36,27 @@ echo "=== Extracting bundle ==="
 
 # Set up NuGet hive
 echo "=== Setting up NuGet package hive ==="
-HIVE_DIR="$ASPIRE_HOME/hives/local/packages"
-mkdir -p "$HIVE_DIR"
 
 SHIPPING_DIR="$NUGETS_DIR/Release/Shipping"
 if [ ! -d "$SHIPPING_DIR" ]; then
     SHIPPING_DIR="$NUGETS_DIR"
 fi
 
+# Auto-detect PR identity from .nupkg filenames (e.g. "Aspire.Cli.13.4.0-pr.16820.g3703c5c4.nupkg")
+# so PR-built packages land in the same hive the CLI's CliExecutionContext.Channel resolves to
+# ("pr-<N>"). Falls back to "local" for true local-dev builds.
+HIVE_LABEL="local"
+SAMPLE_NUPKG=$(find "$SHIPPING_DIR" "$NUGETS_RID_DIR" -maxdepth 4 -name "Aspire.Cli.*.nupkg" 2>/dev/null | head -1)
+if [ -n "$SAMPLE_NUPKG" ]; then
+    SUFFIX=$(basename "$SAMPLE_NUPKG" | sed -nE 's/.*-(pr\.[0-9]+\.[0-9a-g]+).*\.nupkg$/\1/p')
+    if [[ "$SUFFIX" =~ ^pr\.([0-9]+)\.[0-9a-g]+$ ]]; then
+        HIVE_LABEL="pr-${BASH_REMATCH[1]}"
+    fi
+fi
+HIVE_DIR="$ASPIRE_HOME/hives/$HIVE_LABEL/packages"
+echo "  Using hive label: $HIVE_LABEL"
+mkdir -p "$HIVE_DIR"
+
 if [ -d "$SHIPPING_DIR" ]; then
     find "$SHIPPING_DIR" -name "*.nupkg" -exec cp {} "$HIVE_DIR/" \;
     echo "  ✓ Copied $(find "$HIVE_DIR" -name "*.nupkg" | wc -l) packages"
@@ -56,11 +69,5 @@ fi
 
 echo "  Total packages in hive: $(find "$HIVE_DIR" -name "*.nupkg" | wc -l)"
 
-# Set the channel to 'local' so CLI uses our hive
-echo "=== Configuring CLI channel ==="
-"$ASPIRE_HOME/bin/aspire" config set channel local --global || {
-    echo "  Warning: Failed to set channel"
-}
-
 echo ""
 echo "=== Aspire CLI setup complete ==="

.gitignore

@@ -210,3 +210,5 @@ extension/package.nls.*.json
 # Azure Functions local settings (may contain encrypted secrets)
 local.settings.json
 diagnostics.log
+.squad/
+tags

eng/clipack/Common.projitems

@@ -64,6 +64,11 @@
       <!-- Pass through version properties so the CLI gets the correct version -->
       <AdditionalProperties Condition="'$(VersionSuffix)' != ''" Include="VersionSuffix=$(VersionSuffix)" />
       <AdditionalProperties Condition="'$(OfficialBuildId)' != ''" Include="OfficialBuildId=$(OfficialBuildId)" />
+      <!-- Forward AspireCliChannel explicitly rather than relying on global-property
+           inheritance through the inner <MSBuild> invocation below. Matches the
+           explicit-forwarding pattern used for RuntimeIdentifier, VersionSuffix,
+           and Configuration. -->
+      <AdditionalProperties Condition="'$(AspireCliChannel)' != ''" Include="AspireCliChannel=$(AspireCliChannel)" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(PublishNativeAot)' == 'true'">

eng/pipelines/templates/build_sign_native.yml

@@ -72,6 +72,40 @@ jobs:
             displayName: 🟣Restore
 
         steps:
+          # Compute the Aspire CLI channel for the AspireCliChannel MSBuild
+          # property consumed by the native CLI build below. This is the canonical
+          # AzDO compute: build_sign_native runs BEFORE the `build` stage (per the
+          # dependsOn graph), so an output variable from a later stage would not
+          # be visible here, and there is no other AzDO consumer of this value.
+          # The variable is job-scoped (no isOutput=true) since it is consumed by
+          # a later step in the same job.
+          - pwsh: |
+              $ErrorActionPreference = 'Stop'
+              $reason = '$(Build.Reason)'
+              $sourceBranch = '$(Build.SourceBranch)'
+              Write-Host "Build.Reason: '$reason'"
+              Write-Host "Build.SourceBranch: '$sourceBranch'"
+
+              $versionKind = & "$(Build.SourcesDirectory)/$(dotnetScript)" msbuild "$(Build.SourcesDirectory)/eng/Versions.props" -getProperty:DotNetFinalVersionKind
+              $versionKind = $versionKind.Trim()
+              Write-Host "DotNetFinalVersionKind: '$versionKind'"
+
+              if ($reason -eq 'PullRequest') {
+                $channel = 'pr'
+              } elseif ($versionKind -eq 'release') {
+                $channel = 'stable'
+              } elseif ($sourceBranch -match '^refs/heads/(release|internal/release)/') {
+                $channel = 'staging'
+              } else {
+                # main and any other branch fall through to daily
+                $channel = 'daily'
+              }
+
+              Write-Host "Aspire CLI channel: $channel"
+              Write-Host "##vso[task.setvariable variable=aspireCliChannel]$channel"
+            name: computeCliChannel
+            displayName: 🟣Determine Aspire CLI channel
+
           # Build, publish, and sign aspire-managed before creating the bundle layout.
           # This ensures aspire-managed is signed before CreateLayout packs it into the bundle archive.
           # Step 1: dotnet publish produces the self-contained single-file binary.
@@ -143,6 +177,7 @@ jobs:
               /p:SkipManagedBuild=true
               /p:TargetRids=${{ targetRid }}
               /p:BundlePayloadPath=$(Build.SourcesDirectory)/artifacts/bundle/aspire-ci-bundlepayload-${{ targetRid }}.tar.gz
+              /p:AspireCliChannel=$(aspireCliChannel)
               $(_buildArgs)
               ${{ parameters.extraBuildArgs }}
               /bl:$(Build.Arcade.LogsPath)Build.binlog

eng/scripts/get-aspire-cli-pr.ps1

@@ -24,7 +24,7 @@
     Mutually exclusive with PRNumber and WorkflowRunId.
 
 .PARAMETER HiveLabel
-    Override the NuGet hive label (default: pr-PRNUMBER, run-RUNID, or run-GITHUB_RUN_ID for LocalDir).
+    Override the NuGet hive label (default: pr-PRNUMBER, run-RUNID, or local for LocalDir).
 
 .PARAMETER InstallPath
     Directory prefix to install (default: $HOME/.aspire on Unix, %USERPROFILE%\.aspire on Windows)
@@ -109,7 +109,7 @@ param(
     [Parameter(HelpMessage = "Use pre-downloaded artifacts from a local directory instead of downloading from GitHub")]
     [string]$LocalDir = "",
 
-    [Parameter(HelpMessage = "Override the NuGet hive label (default: pr-<PR>, run-<RUN_ID>, or run-<GITHUB_RUN_ID> (run-local when GITHUB_RUN_ID is unset))")]
+    [Parameter(HelpMessage = "Override the NuGet hive label (default: pr-<PR>, run-<RUN_ID>, or local for --LocalDir)")]
     [string]$HiveLabel = "",
 
     [Parameter(HelpMessage = "Directory prefix to install")]
@@ -742,37 +742,6 @@ function Remove-TempDirectory {
 # END: Shared code
 # =============================================================================
 
-# Function to save global settings using the aspire CLI
-# Uses 'aspire config set -g' to set global configuration values
-# Expected schema of ~/.aspire/globalsettings.json:
-# {
-#   "channel": "string"  // The channel name (e.g., "daily", "staging", "pr-1234")
-# }
-function Save-GlobalSettings {
-    [CmdletBinding(SupportsShouldProcess)]
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$CliPath,
-
-        [Parameter(Mandatory = $true)]
-        [string]$Key,
-
-        [Parameter(Mandatory = $true)]
-        [string]$Value
-    )
-
-    if ($PSCmdlet.ShouldProcess("$Key = $Value", "Set global config via aspire CLI")) {
-        Write-Message "Setting global config: $Key = $Value" -Level Verbose
-
-        $output = & $CliPath config set -g $Key $Value 2>&1
-        if ($LASTEXITCODE -ne 0) {
-            Write-Message "Failed to set global config via aspire CLI" -Level Warning
-            return
-        }
-        Write-Message "Global config saved: $Key = $Value" -Level Verbose
-    }
-}
-
 # Function to check if gh command is available
 function Test-GitHubCLIDependency {
     [CmdletBinding()]
@@ -1268,10 +1237,21 @@ function Start-InstallFromLocalDir {
     $cliBinDir = Join-Path $resolvedInstallPrefix "bin"
     $resolvedHiveLabel = if ($HiveLabel) {
         $HiveLabel
-    } elseif ($env:GITHUB_RUN_ID) {
-        "run-$($env:GITHUB_RUN_ID)"
     } else {
-        "run-local"
+        # Auto-detect PR identity from .nupkg filenames (e.g. "13.4.0-pr.16820.g3703c5c4")
+        # so PR-built packages land in the same hive the CLI's CliExecutionContext.Channel
+        # resolves to ("pr-<N>"). Falls back to "local" for true local-dev builds.
+        $detectedLabel = "local"
+        try {
+            $detectedSuffix = Get-VersionSuffixFromPackages -DownloadDir $LocalDirPath
+            if ($detectedSuffix -match '^pr\.(\d+)\.[0-9a-g]+$') {
+                $detectedLabel = "pr-$($Matches[1])"
+            }
+        }
+        catch {
+            # No PR-style packages in the local dir; keep "local".
+        }
+        $detectedLabel
     }
     $nugetHiveDir = Join-Path $resolvedInstallPrefix "hives" $resolvedHiveLabel "packages"
 
@@ -1298,13 +1278,6 @@ function Start-InstallFromLocalDir {
         Write-Message "Could not extract version suffix from local packages: $($_.Exception.Message)" -Level Warning
     }
 
-    # Save the global channel setting
-    if (-not $HiveOnly) {
-        $cliExe = if ($Script:HostOS -eq "win") { "aspire.exe" } else { "aspire" }
-        $cliPath = Join-Path $cliBinDir $cliExe
-        Save-GlobalSettings -CliPath $cliPath -Key "channel" -Value $resolvedHiveLabel
-    }
-
     # Update PATH environment variables
     if (-not $HiveOnly) {
         if ($SkipPath) {
@@ -1399,15 +1372,6 @@ function Start-DownloadAndInstall {
         }
     }
 
-    # Save the global channel setting to the PR hive channel
-    # This allows 'aspire new' and 'aspire init' to use the same channel by default
-    if (-not $HiveOnly) {
-        # Determine CLI path
-        $cliExe = if ($Script:HostOS -eq "win") { "aspire.exe" } else { "aspire" }
-        $cliPath = Join-Path $cliBinDir $cliExe
-        Save-GlobalSettings -CliPath $cliPath -Key "channel" -Value $resolvedHiveLabel
-    }
-
     # Update PATH environment variables
     if (-not $HiveOnly) {
         if ($SkipPath) {

eng/scripts/get-aspire-cli-pr.sh

@@ -71,7 +71,7 @@ USAGE:
                                 The directory must contain CLI archive files (aspire-cli-*.tar.gz or .zip)
                                 and optionally NuGet packages (*.nupkg).
     --hive-label LABEL          Override the NuGet hive label (default: pr-<PR_NUMBER>, run-<RUN_ID>,
-                                or run-<GITHUB_RUN_ID> (or run-local if GITHUB_RUN_ID is unset) for --local-dir)
+                                or local for --local-dir)
     -i, --install-path PATH     Directory prefix to install (default: ~/.aspire)
                                 CLI installs to: <install-path>/bin
                                 NuGet hive:      <install-path>/hives/pr-<PR_NUMBER>/packages (or run-<RUN_ID>)
@@ -444,36 +444,6 @@ install_archive() {
     say_verbose "Successfully installed archive"
 }
 
-# Function to save global settings using the aspire CLI
-# Uses 'aspire config set -g' to set global configuration values
-# Parameters:
-#   $1 - cli_path: Path to the aspire CLI executable
-#   $2 - key: The configuration key to set
-#   $3 - value: The value to set
-# Expected schema of ~/.aspire/globalsettings.json:
-# {
-#   "channel": "string"  // The channel name (e.g., "daily", "staging", "pr-1234")
-# }
-save_global_settings() {
-    local cli_path="$1"
-    local key="$2"
-    local value="$3"
-
-    if [[ "$DRY_RUN" == true ]]; then
-        say_info "[DRY RUN] Would run: $cli_path config set -g $key $value"
-        return 0
-    fi
-
-    say_verbose "Setting global config: $key = $value"
-
-    if ! "$cli_path" config set -g "$key" "$value" 2>/dev/null; then
-        say_warn "Failed to set global config via aspire CLI"
-        return 1
-    fi
-
-    say_verbose "Global config saved: $key = $value"
-}
-
 # Function to add PATH to shell configuration file
 # Parameters:
 #   $1 - config_file: Path to the shell configuration file
@@ -1017,10 +987,17 @@ install_from_local_dir() {
     local hive_label
     if [[ -n "$HIVE_LABEL" ]]; then
         hive_label="$HIVE_LABEL"
-    elif [[ -n "${GITHUB_RUN_ID:-}" ]]; then
-        hive_label="run-$GITHUB_RUN_ID"
     else
-        hive_label="run-local"
+        # Auto-detect PR identity from .nupkg filenames (e.g. "13.4.0-pr.16820.g3703c5c4")
+        # so PR-built packages land in the same hive the CLI's CliExecutionContext.Channel
+        # resolves to ("pr-<N>"). Falls back to "local" for true local-dev builds.
+        local detected_suffix
+        if detected_suffix=$(extract_version_suffix_from_packages "$local_dir") \
+            && [[ "$detected_suffix" =~ ^pr\.([0-9]+)\.[0-9a-g]+$ ]]; then
+            hive_label="pr-${BASH_REMATCH[1]}"
+        else
+            hive_label="local"
+        fi
     fi
     local nuget_hive_dir="$INSTALL_PREFIX/hives/$hive_label/packages"
 
@@ -1075,17 +1052,6 @@ install_from_local_dir() {
     else
         say_warn "Could not extract version suffix from local packages"
     fi
-
-    # Save the global channel setting
-    if [[ "$HIVE_ONLY" != true ]]; then
-        local cli_path
-        if [[ -f "$cli_install_dir/aspire.exe" ]]; then
-            cli_path="$cli_install_dir/aspire.exe"
-        else
-            cli_path="$cli_install_dir/aspire"
-        fi
-        save_global_settings "$cli_path" "channel" "$hive_label" || true
-    fi
 }
 
 # Main function to download and install from PR or workflow run ID
@@ -1198,20 +1164,6 @@ download_and_install_from_pr() {
             install_aspire_extension "$extension_download_dir"
         fi
     fi
-
-    # Save the global channel setting to the PR hive channel
-    # This allows 'aspire new' and 'aspire init' to use the same channel by default
-    if [[ "$HIVE_ONLY" != true ]]; then
-        # Determine CLI path
-        local cli_path
-        if [[ -f "$cli_install_dir/aspire.exe" ]]; then
-            cli_path="$cli_install_dir/aspire.exe"
-        else
-            cli_path="$cli_install_dir/aspire"
-        fi
-        # Non-fatal: channel can be set manually if this fails
-        save_global_settings "$cli_path" "channel" "$hive_label" || true
-    fi
 }
 
 # Main entry point — wraps everything after function definitions.