dotnet
/
windowsdesktop
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2024-04-20 12:38:16 +00:00 коммит произвёл GitHub
Родитель 7ace18239f
Коммит c730f1cc15
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 36 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
eng/Version.Details.xml
Просмотреть файл

@ -152,29 +152,29 @@
</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.Build.Tasks.Feed" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" 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.SharedFramework.Sdk" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.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.Archives" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" 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.VersionTools.Tasks" Version="9.0.0-beta.24219.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24219.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b4f4d40741f161e2c0d96c19c51a4013850ef65f</Sha>
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

4
eng/Versions.props
Просмотреть файл

@ -11,8 +11,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- arcade -->
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24219.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24219.5</MicrosoftDotNetBuildTasksInstallersVersion>
<!-- corefx -->
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>

20
eng/common/cross/toolchain.cmake
Просмотреть файл

@ -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
Просмотреть файл

@ -3,8 +3,8 @@
"dotnet": "9.0.100-preview.3.24204.13"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24219.1",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24219.5",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}