mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#19548)

Browse source
This commit is contained in:
v-wuzhai 2024-04-21 19:17:33 -07:00 committed by GitHub
commit 22ffa42d6c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -238,17 +238,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24219.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24210.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -258,14 +258,14 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>9ec07c3673acf5602234c244d9465bca48f49969</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

2
eng/Versions.props
View file

@ -39,7 +39,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

20
eng/common/cross/toolchain.cmake
View file

@ -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)

4
global.json
View file

@ -11,8 +11,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24219.1",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24219.5",
"Microsoft.Build.NoTargets": "3.7.0"
}
}