Skip to content

[main] Source code updates from dotnet/dotnet #14536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotnet-maestro wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[main] Source code updates from dotnet/dotnet #14536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dd8311
Update dependencies from build 313814
dotnet-maestro[bot] May 12, 2026
c45b7d9
Merge main into darc-main-e51938bd-f081-4a0e-bc85-61ee6ffb1f19
dotnet-maestro[bot] May 14, 2026
7a3b7a2
Update dependencies from build 314245
dotnet-maestro[bot] May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26258.110</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.5.26258.110</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26258.110</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26258.110</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.5.26258.110</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.5.26258.110</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.5.26258.110</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26258.110</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26258.110</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.5.26258.110</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.5.26258.110</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.5.26258.110</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.5.26258.110</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.5.26258.110</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.5.26258.110</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.5.26258.110</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.5.26258.110</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.5.26258.110</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.5.26258.110</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.5.26258.110</SystemWindowsExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26263.112</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26263.112</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26263.112</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26263.112</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26263.112</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26263.112</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26263.112</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.5.26263.112</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26263.112</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26263.112</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.5.26263.112</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.5.26263.112</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.5.26263.112</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26263.112</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.5.26263.112</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.5.26263.112</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.5.26263.112</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.5.26263.112</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.5.26263.112</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.5.26263.112</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.5.26263.112</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.5.26263.112</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.5.26263.112</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.5.26263.112</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.5.26263.112</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.5.26263.112</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
106 changes: 53 additions & 53 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,114 +6,114 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168" BarId="313660" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="0d945d08da237ae1726e34e0dba13aabba06e593" BarId="314245" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26258.110">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26258.110">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Text.Json" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.5.26258.110">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.CodeDom" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.5.26258.110">
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.5.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26258.110">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26263.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>2c9bec4ec0be4c22ce27ece0c2ca0a8a4d481168</Sha>
<Sha>0d945d08da237ae1726e34e0dba13aabba06e593</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
5 changes: 5 additions & 0 deletions eng/common/AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# `eng/common`

Files under `eng/common` come from [Arcade](https://github.com/dotnet/arcade).
Edits in `eng/common` will be overwritten by automation unless the changes are made directly in the Arcade repository.
For more information, see the [Arcade documentation](https://github.com/dotnet/arcade/tree/main/Documentation).
3 changes: 3 additions & 0 deletions eng/common/core-templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ parameters:
GitHubOrg: dotnet
MirrorRepo: ''
MirrorBranch: main
xLocCustomPowerShellScript: ''
condition: ''
JobNameSuffix: ''
is1ESPipeline: ''
Expand Down Expand Up @@ -97,6 +98,8 @@ jobs:
gitHubOrganization: ${{ parameters.GitHubOrg }}
mirrorRepo: ${{ parameters.MirrorRepo }}
mirrorBranch: ${{ parameters.MirrorBranch }}
${{ if ne(parameters.xLocCustomPowerShellScript, '') }}:
xLocCustomPowerShellScript: ${{ parameters.xLocCustomPowerShellScript }}
condition: ${{ parameters.condition }}

# Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
Expand Down
12 changes: 9 additions & 3 deletions eng/common/cross/toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,19 @@ elseif(ILLUMOS)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

locate_toolchain_exec(gcc CMAKE_C_COMPILER)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
if ($ENV{CCC_CC} MATCHES ".*gcc.*")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
locate_toolchain_exec(gcc CMAKE_C_COMPILER)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
else()
set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
endif()

# let CMake set up the correct search paths
include(Platform/Haiku)
Expand Down
6 changes: 5 additions & 1 deletion eng/common/dotnet-install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ Param(

. $PSScriptRoot\tools.ps1

$dotnetRoot = Join-Path $RepoRoot '.dotnet'
if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) {
$dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR
} else {
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
}

$installdir = $dotnetRoot
try {
Expand Down
6 changes: 5 additions & 1 deletion eng/common/dotnet-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ case $cpuname in
;;
esac

dotnetRoot="${repo_root}.dotnet"
if [[ -n "${DOTNET_GLOBAL_INSTALL_DIR:-}" ]]; then
dotnetRoot="$DOTNET_GLOBAL_INSTALL_DIR"
else
dotnetRoot="${repo_root}.dotnet"
fi
if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
dotnetRoot="$dotnetRoot/$architecture"
fi
Expand Down
Loading
Loading