Update dependencies from https://github.com/dotnet/arcade build 20240419.5 (#773)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
19c9523f5c
Коммит
9d28301f6a
|
|
@ -207,38 +207,38 @@
|
|||
<Uri>https://github.com/dotnet/llvm-project</Uri>
|
||||
<Sha>26f8c30340764cfa7fa9090dc01a36c222bf09c1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24212.4">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
|
||||
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24212.4">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24219.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
|
||||
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24212.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24219.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
|
||||
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24212.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
|
||||
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24212.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24219.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
|
||||
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24212.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24219.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
|
||||
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24212.4">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
|
||||
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24212.4">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>87b015b938e5400d6e57afd7650348c17a764b73</Sha>
|
||||
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ Param(
|
|||
[switch] $pack,
|
||||
[switch] $publish,
|
||||
[switch] $clean,
|
||||
[switch] $verticalBuild,
|
||||
[switch][Alias('pb')]$productBuild,
|
||||
[switch][Alias('bl')]$binaryLog,
|
||||
[switch][Alias('nobl')]$excludeCIBinarylog,
|
||||
|
|
@ -60,7 +59,6 @@ function Print-Usage() {
|
|||
Write-Host " -sign Sign build outputs"
|
||||
Write-Host " -publish Publish artifacts (e.g. symbols)"
|
||||
Write-Host " -clean Clean the solution"
|
||||
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
|
||||
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
|
||||
Write-Host ""
|
||||
|
||||
|
|
@ -124,7 +122,7 @@ function Build {
|
|||
/p:Deploy=$deploy `
|
||||
/p:Test=$test `
|
||||
/p:Pack=$pack `
|
||||
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
|
||||
/p:DotNetBuildRepo=$productBuild `
|
||||
/p:IntegrationTest=$integrationTest `
|
||||
/p:PerformanceTest=$performanceTest `
|
||||
/p:Sign=$sign `
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
|
|||
restore=false
|
||||
build=false
|
||||
source_build=false
|
||||
vertical_build=false
|
||||
product_build=false
|
||||
rebuild=false
|
||||
test=false
|
||||
|
|
@ -141,13 +140,6 @@ while [[ $# > 0 ]]; do
|
|||
restore=true
|
||||
pack=true
|
||||
;;
|
||||
-verticalbuild|-vb)
|
||||
build=true
|
||||
vertical_build=true
|
||||
product_build=true
|
||||
restore=true
|
||||
pack=true
|
||||
;;
|
||||
-test|-t)
|
||||
test=true
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -382,6 +382,26 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
|
|||
endif()
|
||||
endif()
|
||||
|
||||
# Set C++ standard library options if specified
|
||||
set(CLR_CMAKE_CXX_STANDARD_LIBRARY "" CACHE STRING "Standard library flavor to link against. Only supported with the Clang compiler.")
|
||||
if (CLR_CMAKE_CXX_STANDARD_LIBRARY)
|
||||
add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,Clang>:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>)
|
||||
add_link_options($<$<LINK_LANG_AND_ID:CXX,Clang>:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>)
|
||||
endif()
|
||||
|
||||
option(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC "Statically link against the C++ standard library" OFF)
|
||||
if(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC)
|
||||
add_link_options($<$<LINK_LANGUAGE:CXX>:-static-libstdc++>)
|
||||
endif()
|
||||
|
||||
set(CLR_CMAKE_CXX_ABI_LIBRARY "" CACHE STRING "C++ ABI implementation library to link against. Only supported with the Clang compiler.")
|
||||
if (CLR_CMAKE_CXX_ABI_LIBRARY)
|
||||
# The user may specify the ABI library with the 'lib' prefix, like 'libstdc++'. Strip the prefix here so the linker finds the right library.
|
||||
string(REGEX REPLACE "^lib(.+)" "\\1" CLR_CMAKE_CXX_ABI_LIBRARY ${CLR_CMAKE_CXX_ABI_LIBRARY})
|
||||
# We need to specify this as a linker-backend option as Clang will filter this option out when linking to libc++.
|
||||
add_link_options("LINKER:-l${CLR_CMAKE_CXX_ABI_LIBRARY}")
|
||||
endif()
|
||||
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ jobs:
|
|||
- task: 1ES.PublishPipelineArtifact@1
|
||||
inputs:
|
||||
targetPath: 'artifacts/log'
|
||||
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
|
||||
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }}
|
||||
displayName: 'Publish logs'
|
||||
continueOnError: true
|
||||
condition: always()
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ jobs:
|
|||
# If it's not devdiv, it's dnceng
|
||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
||||
steps:
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ jobs:
|
|||
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
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')]
|
||||
image: 1es-mariner-2-pt
|
||||
image: 1es-mariner-2
|
||||
os: linux
|
||||
|
||||
${{ if ne(parameters.platform.pool, '') }}:
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ stages:
|
|||
# If it's not devdiv, it's dnceng
|
||||
${{ else }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
||||
steps:
|
||||
|
|
@ -150,7 +150,7 @@ stages:
|
|||
# If it's not devdiv, it's dnceng
|
||||
${{ else }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
steps:
|
||||
- template: setup-maestro-vars.yml
|
||||
|
|
@ -208,7 +208,7 @@ stages:
|
|||
# If it's not devdiv, it's dnceng
|
||||
${{ else }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
steps:
|
||||
- template: setup-maestro-vars.yml
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#
|
||||
# pool:
|
||||
# name: $(DncEngInternalBuildPool)
|
||||
# image: 1es-windows-2022-pt
|
||||
# image: 1es-windows-2022
|
||||
|
||||
variables:
|
||||
# Coalesce the target and source branches so we know when a PR targets a release branch
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "9.0.100-preview.1.24101.2"
|
||||
"dotnet": "9.0.100-preview.3.24204.13"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24212.4",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.5",
|
||||
"Microsoft.Build.Traversal": "3.4.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче