Skip to content

Commit f18510c

Browse files
dotnet-maestro[bot]pavelsavara
dotnet-maestro[bot]
and
pavelsavara
authored
[main] Update dependencies from dotnet/arcade (#55274)
* Update dependencies from https://github.com/dotnet/arcade build 20240419.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.24212.4 -> To Version 9.0.0-beta.24219.5 * disable MT tests --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Pavel Savara <[email protected]>
1 parent 576f7cb commit f18510c

File tree

13 files changed

+50
-36
lines changed

13 files changed

+50
-36
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -384,31 +384,31 @@
384384
<Uri>https://github.com/dotnet/winforms</Uri>
385385
<Sha>f6d03b688f2e21d4a702f1293b3c4a89bb7f5cd7</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24212.4">
387+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.5">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
389+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
390390
</Dependency>
391391
<!-- Intermediate is necessary for source build. -->
392-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24212.4">
392+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.5">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
394+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
395395
<SourceBuild RepoName="arcade" ManagedOnly="true" />
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24212.4">
397+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.5">
398398
<Uri>https://github.com/dotnet/arcade</Uri>
399-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
399+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24212.4">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24219.5">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
403+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24212.4">
405+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24219.5">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
407+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
409+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24219.5">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
411+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
412412
</Dependency>
413413
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.4.24220.1">
414414
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@
160160
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
161161
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
162162
<!-- Packages from dotnet/arcade -->
163-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksInstallersVersion>
164-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
165-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24212.4</MicrosoftDotNetRemoteExecutorVersion>
166-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24212.4</MicrosoftSourceBuildIntermediatearcadeVersion>
163+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksInstallersVersion>
164+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksTemplatingVersion>
165+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24219.5</MicrosoftDotNetRemoteExecutorVersion>
166+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24219.5</MicrosoftSourceBuildIntermediatearcadeVersion>
167167
<!-- Packages from dotnet/source-build-externals -->
168168
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24216.3</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
169169
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/build.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Param(
1919
[switch] $pack,
2020
[switch] $publish,
2121
[switch] $clean,
22-
[switch] $verticalBuild,
2322
[switch][Alias('pb')]$productBuild,
2423
[switch][Alias('bl')]$binaryLog,
2524
[switch][Alias('nobl')]$excludeCIBinarylog,
@@ -60,7 +59,6 @@ function Print-Usage() {
6059
Write-Host " -sign Sign build outputs"
6160
Write-Host " -publish Publish artifacts (e.g. symbols)"
6261
Write-Host " -clean Clean the solution"
63-
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
6462
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
6563
Write-Host ""
6664

@@ -124,7 +122,7 @@ function Build {
124122
/p:Deploy=$deploy `
125123
/p:Test=$test `
126124
/p:Pack=$pack `
127-
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
125+
/p:DotNetBuildRepo=$productBuild `
128126
/p:IntegrationTest=$integrationTest `
129127
/p:PerformanceTest=$performanceTest `
130128
/p:Sign=$sign `

‎eng/common/build.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
6262
restore=false
6363
build=false
6464
source_build=false
65-
vertical_build=false
6665
product_build=false
6766
rebuild=false
6867
test=false
@@ -141,13 +140,6 @@ while [[ $# > 0 ]]; do
141140
restore=true
142141
pack=true
143142
;;
144-
-verticalbuild|-vb)
145-
build=true
146-
vertical_build=true
147-
product_build=true
148-
restore=true
149-
pack=true
150-
;;
151143
-test|-t)
152144
test=true
153145
;;

‎eng/common/cross/toolchain.cmake

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,26 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
382382
endif()
383383
endif()
384384

385+
# Set C++ standard library options if specified
386+
set(CLR_CMAKE_CXX_STANDARD_LIBRARY "" CACHE STRING "Standard library flavor to link against. Only supported with the Clang compiler.")
387+
if (CLR_CMAKE_CXX_STANDARD_LIBRARY)
388+
add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,Clang>:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>)
389+
add_link_options($<$<LINK_LANG_AND_ID:CXX,Clang>:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>)
390+
endif()
391+
392+
option(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC "Statically link against the C++ standard library" OFF)
393+
if(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC)
394+
add_link_options($<$<LINK_LANGUAGE:CXX>:-static-libstdc++>)
395+
endif()
396+
397+
set(CLR_CMAKE_CXX_ABI_LIBRARY "" CACHE STRING "C++ ABI implementation library to link against. Only supported with the Clang compiler.")
398+
if (CLR_CMAKE_CXX_ABI_LIBRARY)
399+
# The user may specify the ABI library with the 'lib' prefix, like 'libstdc++'. Strip the prefix here so the linker finds the right library.
400+
string(REGEX REPLACE "^lib(.+)" "\\1" CLR_CMAKE_CXX_ABI_LIBRARY ${CLR_CMAKE_CXX_ABI_LIBRARY})
401+
# We need to specify this as a linker-backend option as Clang will filter this option out when linking to libc++.
402+
add_link_options("LINKER:-l${CLR_CMAKE_CXX_ABI_LIBRARY}")
403+
endif()
404+
385405
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
386406
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
387407
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
- task: 1ES.PublishPipelineArtifact@1
211211
inputs:
212212
targetPath: 'artifacts/log'
213-
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
213+
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }}
214214
displayName: 'Publish logs'
215215
continueOnError: true
216216
condition: always()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# If it's not devdiv, it's dnceng
5757
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5858
name: $(DncEngInternalBuildPool)
59-
image: 1es-windows-2022-pt
59+
image: 1es-windows-2022
6060
os: windows
6161

6262
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5454
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
55-
image: 1es-mariner-2-pt
55+
image: 1es-mariner-2
5656
os: linux
5757

5858
${{ if ne(parameters.platform.pool, '') }}:

‎eng/common/templates-official/post-build/post-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ stages:
110110
# If it's not devdiv, it's dnceng
111111
${{ else }}:
112112
name: $(DncEngInternalBuildPool)
113-
image: 1es-windows-2022-pt
113+
image: 1es-windows-2022
114114
os: windows
115115

116116
steps:
@@ -150,7 +150,7 @@ stages:
150150
# If it's not devdiv, it's dnceng
151151
${{ else }}:
152152
name: $(DncEngInternalBuildPool)
153-
image: 1es-windows-2022-pt
153+
image: 1es-windows-2022
154154
os: windows
155155
steps:
156156
- template: setup-maestro-vars.yml
@@ -208,7 +208,7 @@ stages:
208208
# If it's not devdiv, it's dnceng
209209
${{ else }}:
210210
name: $(DncEngInternalBuildPool)
211-
image: 1es-windows-2022-pt
211+
image: 1es-windows-2022
212212
os: windows
213213
steps:
214214
- template: setup-maestro-vars.yml

‎eng/common/templates-official/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# image: 1es-windows-2022-pt
26+
# image: 1es-windows-2022
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"jdk": "11.0.22"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24212.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.5"
3232
}
3333
}

‎src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public void CounterPageCanUseThreads()
8585
}
8686

8787
[Fact]
88+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54761")]
8889
public void HasFetchDataPage()
8990
{
9091
// Navigate to "Fetch data"

‎src/Components/test/E2ETest/Tests/ThreadingAppTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ protected override void InitializeAsyncCore()
2828
}
2929

3030
[Fact]
31+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")]
3132
public void HasTitle()
3233
{
3334
Assert.Equal("Blazor standalone", Browser.Title);
@@ -68,6 +69,7 @@ public void NavMenuHighlightsCurrentLocation()
6869
}
6970

7071
[Fact]
72+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")]
7173
public void CounterPageCanUseThreads()
7274
{
7375
// Navigate to "Counter"
@@ -85,6 +87,7 @@ public void CounterPageCanUseThreads()
8587
}
8688

8789
[Fact]
90+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")]
8891
public void HasFetchDataPage()
8992
{
9093
// Navigate to "Fetch data"

0 commit comments

Comments
 (0)