Skip to content

Commit bef54f2

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20260731.1
On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26372.6 -> To Version 11.0.0-beta.26381.1
1 parent 98f658a commit bef54f2

8 files changed

Lines changed: 28 additions & 12 deletions

File tree

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-arcade dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26372.6</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26381.1</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Dependencies>
33
<ProductDependencies />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26372.6">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26381.1">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>e5f974ba880c3da69932191c665e90ee64e8da26</Sha>
7+
<Sha>93eebf1a31a5eaafd44326f1a81ca107913e098c</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

eng/common/core-templates/job/helix-job-monitor.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ parameters:
6565
type: boolean
6666
default: true
6767

68+
# When true, allow the monitor to succeed when this stage produces no Helix jobs in any attempt.
69+
# Forwarded as --allow-no-helix-jobs.
70+
- name: allowNoHelixJobs
71+
type: boolean
72+
default: false
73+
6874
# When true, test results are reported to Azure DevOps using the fully qualified test name
6975
# (Namespace.Type.Method) as the stable automatedTestName and the visible title is qualified as
7076
# well (--use-fully-qualified-test-name). Opt-in because it changes AzDO test identity and display;
@@ -104,9 +110,11 @@ jobs:
104110
pool:
105111
${{ if eq(variables['System.TeamProject'], 'public') }}:
106112
name: $(DncEngPublicBuildPool)
113+
os: linux
107114
demands: ImageOverride -equals build.azurelinux.3.amd64.open
108115
${{ else }}:
109116
name: $(DncEngInternalBuildPool)
117+
os: linux
110118
demands: ImageOverride -equals build.azurelinux.3.amd64
111119
steps:
112120
- checkout: self
@@ -187,22 +195,30 @@ jobs:
187195
--helix-base-uri '${{ parameters.helixBaseUri }}'
188196
--polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}'
189197
--fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}'
198+
--allow-no-helix-jobs '${{ parameters.allowNoHelixJobs }}'
190199
--use-fully-qualified-test-name '${{ parameters.useFullyQualifiedTestName }}'
191200
--max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully.
192201
--stage-name '$(System.StageName)'
202+
--stage-attempt '$(System.StageAttempt)'
193203
)
194204
195205
organization='${{ parameters.organization }}'
196206
repository='${{ parameters.repository }}'
197207
198208
# Fall back to Azure DevOps-provided environment variables when the caller did not
199209
# supply organization / repository explicitly. BUILD_REPOSITORY_NAME is typically
200-
# 'owner/repo' for GitHub-backed builds.
210+
# 'owner/repo' for GitHub-backed builds and 'owner-repo' for internal builds.
201211
if [ -z "$organization" ] || [ -z "$repository" ]; then
202212
buildRepoName="${BUILD_REPOSITORY_NAME:-}"
203213
if [ -n "$buildRepoName" ] && [[ "$buildRepoName" == */* ]]; then
204214
repoOwner="${buildRepoName%%/*}"
205215
repoName="${buildRepoName#*/}"
216+
elif [ -n "$buildRepoName" ] && [[ "$buildRepoName" == *-* ]]; then
217+
repoOwner="${buildRepoName%%-*}"
218+
repoName="${buildRepoName#*-}"
219+
fi
220+
221+
if [ -n "${repoOwner:-}" ] && [ -n "${repoName:-}" ]; then
206222
if [ -z "$organization" ]; then organization="$repoOwner"; fi
207223
if [ -z "$repository" ]; then repository="$repoName"; fi
208224
fi

eng/common/core-templates/steps/publish-logs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ steps:
3131
-runtimeSourceFeed https://ci.dot.net/internal
3232
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
3333
'$(publishing-dnceng-devdiv-code-r-build-re)'
34-
'$(dn-bot-all-orgs-artifact-feeds-rw)'
3534
'$(akams-client-id)'
3635
'$(System.AccessToken)'
3736
${{parameters.CustomSensitiveDataList}}

eng/common/cross/build-rootfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ usage()
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
1010
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
1111
echo " for FreeBSD can be: freebsd14, freebsd15"
12-
echo " for OpenBSD can be: openbsd"
12+
echo " for OpenBSD can be: openbsd7.8, openbsd7.9"
1313
echo " for illumos can be: illumos"
1414
echo " for Haiku can be: haiku."
1515
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"

eng/common/tools.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,8 @@ function MSBuild() {
821821
}
822822

823823
if ($warnAsError -and $warnNotAsError) {
824-
$cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$warnNotAsError"
824+
$escapedWarnNotAsError = $warnNotAsError -replace ';', '%3B'
825+
$cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$escapedWarnNotAsError"
825826
}
826827

827828
foreach ($arg in $args) {

eng/common/tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,10 +595,10 @@ function MSBuild {
595595

596596
local warnnotaserror_switch=""
597597
if [[ -n "$warn_not_as_error" && "$warn_as_error" == true ]]; then
598-
warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error"
598+
warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=${warn_not_as_error//;/%3B}"
599599
fi
600600

601-
RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch "${logger_switch[@]}" /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
601+
RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch ${logger_switch[@]+"${logger_switch[@]}"} /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
602602
}
603603

604604
function GetDarc {

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"tools": {
3-
"dotnet": "11.0.100-preview.5.26302.115"
3+
"dotnet": "11.0.100-preview.6.26359.118"
44
},
55
"sdk": {
6-
"version": "11.0.100-preview.5.26302.115"
6+
"version": "11.0.100-preview.6.26359.118"
77
},
88
"msbuild-sdks": {
9-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26372.6"
9+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26381.1"
1010
}
1111
}

0 commit comments

Comments
 (0)