Skip to content

Commit 22ffa42

Browse files
v-wuzhaiv-wuzhai
authored
[main] Update dependencies from dotnet/arcade (#19548)
2 parents 94d9faf + fec622c commit 22ffa42

File tree

4 files changed

+33
-13
lines changed

4 files changed

+33
-13
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,17 @@
238238
</Dependency>
239239
</ProductDependencies>
240240
<ToolsetDependencies>
241-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.1">
241+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.5">
242242
<Uri>https://github.com/dotnet/arcade</Uri>
243-
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
243+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24219.1">
245+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24219.5">
246246
<Uri>https://github.com/dotnet/arcade</Uri>
247-
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
247+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.1">
249+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24219.5">
250250
<Uri>https://github.com/dotnet/arcade</Uri>
251-
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
251+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
252252
</Dependency>
253253
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24210.2">
254254
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -258,14 +258,14 @@
258258
<Uri>https://github.com/dotnet/arcade-services</Uri>
259259
<Sha>9ec07c3673acf5602234c244d9465bca48f49969</Sha>
260260
</Dependency>
261-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.1">
261+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24219.5">
262262
<Uri>https://github.com/dotnet/arcade</Uri>
263-
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
263+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
264264
</Dependency>
265265
<!-- Intermediate is necessary for source build. -->
266-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.1">
266+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24219.5">
267267
<Uri>https://github.com/dotnet/arcade</Uri>
268-
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
268+
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
269269
<SourceBuild RepoName="arcade" ManagedOnly="true" />
270270
</Dependency>
271271
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

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

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"cmake": "latest"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1",
15-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24219.1",
14+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5",
15+
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24219.5",
1616
"Microsoft.Build.NoTargets": "3.7.0"
1717
}
1818
}

0 commit comments

Comments
 (0)