Skip to content

Commit 2e37b5f

Browse files
ilonatommyilonatommy
committed
Merge remote-tracking branch 'upstream/main' into fix-58815
2 parents 6996392 + 18b3b4a commit 2e37b5f

File tree

28 files changed

+738
-837
lines changed

28 files changed

+738
-837
lines changed

‎.github/workflows/locker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Locker - Lock stale issues
22
on:
33
schedule:
4-
- cron: '34 8 * * *' # Once per day, overnight PT, uncommon minute of hour
4+
- cron: '34 12 * * 1-5' # Once per weekday, overnight PT, uncommon minute of hour
55

66
workflow_dispatch:
77
# Manual triggering through the GitHub UI, API, or CLI

‎docs/area-owners.md

Lines changed: 28 additions & 28 deletions
Large diffs are not rendered by default.

‎eng/Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@
5656
$(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
5757
" />
5858

59+
<!-- In the VMR, we don't build the native ANCM bits in pass 1 -->
60+
<ProjectToExclude Include="
61+
$(RepoRoot)src\Installers\**\*.vcxproj;
62+
"
63+
Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
64+
65+
5966
<!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 -->
6067
<ProjectToExclude Include="
6168
$(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;

‎eng/Common.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</TargetOsName>
55
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux</TargetOsName>
66
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('FreeBSD'))">freebsd</TargetOsName>
7+
78
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
9+
<NativePlatform>$(TargetArchitecture)</NativePlatform>
10+
<NativePlatform Condition=" '$(NativePlatform)' == 'x86' ">Win32</NativePlatform>
11+
812
<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
913
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
1014
<DefaultAppHostRuntimeIdentifier Condition=" '$(DotNetBuild)' == 'true' ">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>

‎eng/Version.Details.xml

Lines changed: 164 additions & 164 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 79 additions & 79 deletions
Large diffs are not rendered by default.

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ steps:
3737
# in the default public locations.
3838
internalRuntimeDownloadArgs=
3939
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
40-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
40+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4141
fi
4242
4343
buildConfig=Release

‎eng/common/cross/armel/armel.jessie.patch

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎eng/common/cross/build-rootfs.sh

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,13 @@ while :; do
164164
armel)
165165
__BuildArch=armel
166166
__UbuntuArch=armel
167-
__UbuntuRepo="http://ftp.debian.org/debian/"
168-
__CodeName=jessie
167+
__UbuntuRepo="http://archive.debian.org/debian/"
168+
__CodeName=buster
169169
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
170+
__LLDB_Package="liblldb-6.0-dev"
171+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
172+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
173+
__UbuntuSuites=
170174
;;
171175
armv6)
172176
__BuildArch=armv6
@@ -278,46 +282,23 @@ while :; do
278282

279283
;;
280284
xenial) # Ubuntu 16.04
281-
if [[ "$__CodeName" != "jessie" ]]; then
282-
__CodeName=xenial
283-
fi
284-
;;
285-
zesty) # Ubuntu 17.04
286-
if [[ "$__CodeName" != "jessie" ]]; then
287-
__CodeName=zesty
288-
fi
285+
__CodeName=xenial
289286
;;
290287
bionic) # Ubuntu 18.04
291-
if [[ "$__CodeName" != "jessie" ]]; then
292-
__CodeName=bionic
293-
fi
288+
__CodeName=bionic
294289
;;
295290
focal) # Ubuntu 20.04
296-
if [[ "$__CodeName" != "jessie" ]]; then
297-
__CodeName=focal
298-
fi
291+
__CodeName=focal
299292
;;
300293
jammy) # Ubuntu 22.04
301-
if [[ "$__CodeName" != "jessie" ]]; then
302-
__CodeName=jammy
303-
fi
294+
__CodeName=jammy
304295
;;
305296
noble) # Ubuntu 24.04
306-
if [[ "$__CodeName" != "jessie" ]]; then
307-
__CodeName=noble
308-
fi
297+
__CodeName=noble
309298
if [[ -n "$__LLDB_Package" ]]; then
310299
__LLDB_Package="liblldb-18-dev"
311300
fi
312301
;;
313-
jessie) # Debian 8
314-
__CodeName=jessie
315-
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
316-
317-
if [[ -z "$__UbuntuRepo" ]]; then
318-
__UbuntuRepo="http://ftp.debian.org/debian/"
319-
fi
320-
;;
321302
stretch) # Debian 9
322303
__CodeName=stretch
323304
__LLDB_Package="liblldb-6.0-dev"
@@ -333,7 +314,7 @@ while :; do
333314
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
334315

335316
if [[ -z "$__UbuntuRepo" ]]; then
336-
__UbuntuRepo="http://ftp.debian.org/debian/"
317+
__UbuntuRepo="http://archive.debian.org/debian/"
337318
fi
338319
;;
339320
bullseye) # Debian 11
@@ -473,10 +454,6 @@ if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
473454
__AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
474455
fi
475456

476-
if [[ "$__BuildArch" == "armel" ]]; then
477-
__LLDB_Package="lldb-3.5-dev"
478-
fi
479-
480457
__UbuntuPackages+=" ${__LLDB_Package:-}"
481458

482459
if [[ -z "$__UbuntuRepo" ]]; then
@@ -850,12 +827,6 @@ EOF
850827
if [[ "$__SkipUnmount" == "0" ]]; then
851828
umount "$__RootfsDir"/* || true
852829
fi
853-
854-
if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
855-
pushd "$__RootfsDir"
856-
patch -p1 < "$__CrossDir/$__BuildArch/armel.jessie.patch"
857-
popd
858-
fi
859830
elif [[ "$__Tizen" == "tizen" ]]; then
860831
ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch"
861832
else

‎eng/common/native/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ case "$os" in
4545
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
4646
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
4747
# brew update --preinstall
48-
brew bundle --no-upgrade --no-lock --file=- <<EOF
48+
brew bundle --no-upgrade --file=- <<EOF
4949
brew "cmake"
5050
brew "icu4c"
5151
brew "openssl@3"

‎eng/common/templates-official/job/job.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
3232
ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
3333
condition: always()
34+
retryCountOnTaskFailure: 10 # for any logs being locked
3435
continueOnError: true
3536
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
3637
- output: pipelineArtifact
@@ -39,14 +40,15 @@ jobs:
3940
displayName: 'Publish logs'
4041
continueOnError: true
4142
condition: always()
43+
retryCountOnTaskFailure: 10 # for any logs being locked
4244
sbomEnabled: false # we don't need SBOM for logs
4345

4446
- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
4547
- output: buildArtifacts
4648
displayName: Publish Logs
4749
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
4850
publishLocation: Container
49-
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
51+
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
5052
continueOnError: true
5153
condition: always()
5254
sbomEnabled: false # we don't need SBOM for logs

‎eng/common/templates-official/steps/publish-build-artifacts.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ parameters:
2424
- name: is1ESPipeline
2525
type: boolean
2626
default: true
27+
28+
- name: retryCountOnTaskFailure
29+
type: string
30+
default: 10
2731

2832
steps:
2933
- ${{ if ne(parameters.is1ESPipeline, true) }}:
@@ -38,4 +42,5 @@ steps:
3842
PathtoPublish: ${{ parameters.pathToPublish }}
3943
${{ if parameters.artifactName }}:
4044
ArtifactName: ${{ parameters.artifactName }}
41-
45+
${{ if parameters.retryCountOnTaskFailure }}:
46+
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}

‎eng/common/templates/job/job.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
4747
continueOnError: true
4848
condition: always()
49+
retryCountOnTaskFailure: 10 # for any logs being locked
4950
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
5051
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
5152
parameters:
@@ -56,6 +57,7 @@ jobs:
5657
displayName: 'Publish logs'
5758
continueOnError: true
5859
condition: always()
60+
retryCountOnTaskFailure: 10 # for any logs being locked
5961
sbomEnabled: false # we don't need SBOM for logs
6062

6163
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
@@ -66,7 +68,7 @@ jobs:
6668
displayName: Publish Logs
6769
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
6870
publishLocation: Container
69-
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
71+
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
7072
continueOnError: true
7173
condition: always()
7274

‎eng/common/templates/steps/publish-build-artifacts.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ parameters:
2525
type: string
2626
default: 'Container'
2727

28+
- name: retryCountOnTaskFailure
29+
type: string
30+
default: 10
31+
2832
steps:
2933
- ${{ if eq(parameters.is1ESPipeline, true) }}:
3034
- 'eng/common/templates cannot be referenced from a 1ES managed template': error
@@ -37,4 +41,6 @@ steps:
3741
PublishLocation: ${{ parameters.publishLocation }}
3842
PathtoPublish: ${{ parameters.pathToPublish }}
3943
${{ if parameters.artifactName }}:
40-
ArtifactName: ${{ parameters.artifactName }}
44+
ArtifactName: ${{ parameters.artifactName }}
45+
${{ if parameters.retryCountOnTaskFailure }}:
46+
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

‎eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25157.1",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25164.6",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25164.6",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25164.6",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)