Skip to content

Backport 2 PRs from v7.6 branch to v7.6.0 branch #27021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 2 commits into from
Mar 12, 2026
Merged

Backport 2 PRs from v7.6 branch to v7.6.0 branch #27021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b73d227
Revert "[release/v7.6] Fetch latest ICU release version dynamically" …
daxian-dbw Mar 12, 2026
57bb008
[release/v7.6] Fix the container image for vPack, MSIX vPack and Pack…
daxian-dbw Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .pipelines/MSIXBundle-vPack-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ variables:
BuildSolution: $(Build.SourcesDirectory)\dirs.proj
ReleaseTagVar: ${{ parameters.ReleaseTagVar }}
BuildConfiguration: Release
WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2019/vse2022:latest'
WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
Codeql.Enabled: false # pipeline is not building artifacts; it repackages existing artifacts into a vpack
DOTNET_CLI_TELEMETRY_OPTOUT: 1
POWERSHELL_TELEMETRY_OPTOUT: 1
Expand All @@ -46,6 +46,9 @@ resources:
extends:
template: v2/Microsoft.Official.yml@onebranchTemplates
parameters:
featureFlags:
WindowsHostVersion:
Version: 2022
platform:
name: 'windows_undocked' # windows undocked

Expand Down
3 changes: 2 additions & 1 deletion .pipelines/PowerShell-Coordinated_Packages-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ variables:
- name: LinuxContainerImage
value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
- name: WindowsContainerImage
value: onebranch.azurecr.io/windows/ltsc2019/vse2022:latest
value: onebranch.azurecr.io/windows/ltsc2022/vse2022:latest
- name: CDP_DEFINITION_BUILD_COUNT
value: $[counter('', 0)]
- name: ReleaseTagVar
Expand Down Expand Up @@ -105,6 +105,7 @@ extends:
LinuxHostVersion:
Network: KS3
WindowsHostVersion:
Version: 2022
Network: KS3
incrementalSDLBinaryAnalysis: true
globalSdl:
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/PowerShell-vPack-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ variables:
- name: BuildConfiguration
value: Release
- name: WindowsContainerImage
value: 'onebranch.azurecr.io/windows/ltsc2019/vse2022:latest'
value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
- name: Codeql.Enabled
value: false # pipeline is not building artifacts; it repackages existing artifacts into a vpack
- name: DOTNET_CLI_TELEMETRY_OPTOUT
Expand Down
14 changes: 1 addition & 13 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2152,7 +2152,7 @@ function Get-PackageDependencies
# than the build version and we know that older versions just works.
#
$MinICUVersion = 60 # runtime minimum supported
$BuildICUVersion = Get-IcuLatestRelease
$BuildICUVersion = 76 # current build version
$MaxICUVersion = $BuildICUVersion + 30 # headroom
Comment on lines 2154 to 2156
Copy link

Copilot AI Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$BuildICUVersion is now a hardcoded value (76). Since this needs to stay in sync with the ICU major version the bundled .NET runtime is built against, it would be helpful to add a short source-of-truth reference (e.g., where this version is defined/verified) or centralize it as a single constant so it’s less likely to become stale during future runtime updates.

Copilot uses AI. Check for mistakes.

if ($Distribution -eq 'deb') {
Expand Down Expand Up @@ -5812,15 +5812,3 @@ function Test-IsProductFile {

return $false
}

# Get major version from latest ICU release (latest: stable version)
function Get-IcuLatestRelease {
$response = Invoke-WebRequest -Uri "https://github.com/unicode-org/icu/releases/latest"
$tagUrl = ($response.Links | Where-Object href -like "*releases/tag/release-*")[0].href

if ($tagUrl -match 'release-(\d+)\.') {
return [int]$Matches[1]
}

throw "Unable to determine the latest ICU release version."
}
Loading