Skip to content

Commit b6edc5b

Browse files
[main] Source code updates from dotnet/dotnet (#15204)
[main] Source code updates from dotnet/dotnet
1 parent f01cd30 commit b6edc5b

7 files changed

Lines changed: 118 additions & 90 deletions

File tree

‎eng/Version.Details.props‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26473.114</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26473.114</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>12.0.0-beta.26473.114</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>12.0.0-beta.26473.114</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26473.114</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>12.0.0-beta.26473.114</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>12.0.0-beta.26473.114</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16-
<MicrosoftNETSdkILPackageVersion>12.0.0-alpha.1.26473.114</MicrosoftNETSdkILPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>12.0.0-alpha.1.26473.114</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26473.114</MicrosoftNETCoreILAsmPackageVersion>
19-
<MicrosoftNETCoreILDAsmPackageVersion>12.0.0-alpha.1.26473.114</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftWin32SystemEventsPackageVersion>12.0.0-alpha.1.26473.114</MicrosoftWin32SystemEventsPackageVersion>
21-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26473.114</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
22-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26473.114</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
23-
<SystemCodeDomPackageVersion>12.0.0-alpha.1.26473.114</SystemCodeDomPackageVersion>
24-
<SystemConfigurationConfigurationManagerPackageVersion>12.0.0-alpha.1.26473.114</SystemConfigurationConfigurationManagerPackageVersion>
25-
<SystemDiagnosticsDiagnosticSourcePackageVersion>12.0.0-alpha.1.26473.114</SystemDiagnosticsDiagnosticSourcePackageVersion>
26-
<SystemFormatsNrbfPackageVersion>12.0.0-alpha.1.26473.114</SystemFormatsNrbfPackageVersion>
27-
<SystemIOHashingPackageVersion>12.0.0-alpha.1.26473.114</SystemIOHashingPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>12.0.0-alpha.1.26473.114</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>12.0.0-alpha.1.26473.114</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>12.0.0-alpha.1.26473.114</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemTextEncodingsWebPackageVersion>12.0.0-alpha.1.26473.114</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>12.0.0-alpha.1.26473.114</SystemTextJsonPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>12.0.0-alpha.1.26473.114</SystemWindowsExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26477.101</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26477.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>12.0.0-beta.26477.101</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>12.0.0-beta.26477.101</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26477.101</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>12.0.0-beta.26477.101</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>12.0.0-beta.26477.101</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16+
<MicrosoftNETSdkILPackageVersion>12.0.0-alpha.1.26477.101</MicrosoftNETSdkILPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>12.0.0-alpha.1.26477.101</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26477.101</MicrosoftNETCoreILAsmPackageVersion>
19+
<MicrosoftNETCoreILDAsmPackageVersion>12.0.0-alpha.1.26477.101</MicrosoftNETCoreILDAsmPackageVersion>
20+
<MicrosoftWin32SystemEventsPackageVersion>12.0.0-alpha.1.26477.101</MicrosoftWin32SystemEventsPackageVersion>
21+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26477.101</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
22+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>12.0.0-alpha.1.26477.101</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
23+
<SystemCodeDomPackageVersion>12.0.0-alpha.1.26477.101</SystemCodeDomPackageVersion>
24+
<SystemConfigurationConfigurationManagerPackageVersion>12.0.0-alpha.1.26477.101</SystemConfigurationConfigurationManagerPackageVersion>
25+
<SystemDiagnosticsDiagnosticSourcePackageVersion>12.0.0-alpha.1.26477.101</SystemDiagnosticsDiagnosticSourcePackageVersion>
26+
<SystemFormatsNrbfPackageVersion>12.0.0-alpha.1.26477.101</SystemFormatsNrbfPackageVersion>
27+
<SystemIOHashingPackageVersion>12.0.0-alpha.1.26477.101</SystemIOHashingPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>12.0.0-alpha.1.26477.101</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>12.0.0-alpha.1.26477.101</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>12.0.0-alpha.1.26477.101</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemTextEncodingsWebPackageVersion>12.0.0-alpha.1.26477.101</SystemTextEncodingsWebPackageVersion>
32+
<SystemTextJsonPackageVersion>12.0.0-alpha.1.26477.101</SystemTextJsonPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>12.0.0-alpha.1.26477.101</SystemWindowsExtensionsPackageVersion>
3434
</PropertyGroup>
3535
<!--Property group for alternate package version names-->
3636
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="c567e8ff13b8ada7c5285c60bc2ac1111ae602e7" BarId="333699" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="c38d0900682e8ee67cf6eb5dcff6b35de9019c7e" BarId="334156" />
1010
<ProductDependencies>
11-
<Dependency Name="System.Resources.Extensions" Version="12.0.0-alpha.1.26473.114">
11+
<Dependency Name="System.Resources.Extensions" Version="12.0.0-alpha.1.26477.101">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
13+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Windows.Extensions" Version="12.0.0-alpha.1.26473.114">
15+
<Dependency Name="System.Windows.Extensions" Version="12.0.0-alpha.1.26477.101">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
17+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="12.0.0-alpha.1.26473.114">
19+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="12.0.0-alpha.1.26477.101">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
21+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26473.114">
23+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26477.101">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
25+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
2626
</Dependency>
27-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26473.114">
27+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26477.101">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
29+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26473.114">
31+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="12.0.0-alpha.1.26477.101">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
33+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
3434
</Dependency>
35-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="12.0.0-alpha.1.26473.114">
35+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="12.0.0-alpha.1.26477.101">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
37+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="12.0.0-alpha.1.26473.114">
39+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="12.0.0-alpha.1.26477.101">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
41+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
4242
</Dependency>
43-
<Dependency Name="System.Text.Encodings.Web" Version="12.0.0-alpha.1.26473.114">
43+
<Dependency Name="System.Text.Encodings.Web" Version="12.0.0-alpha.1.26477.101">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
45+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Json" Version="12.0.0-alpha.1.26473.114">
47+
<Dependency Name="System.Text.Json" Version="12.0.0-alpha.1.26477.101">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
49+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
5050
</Dependency>
51-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="12.0.0-alpha.1.26473.114">
51+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="12.0.0-alpha.1.26477.101">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
53+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
5454
</Dependency>
55-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="12.0.0-alpha.1.26473.114">
55+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="12.0.0-alpha.1.26477.101">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
57+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="12.0.0-alpha.1.26473.114">
59+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="12.0.0-alpha.1.26477.101">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
61+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
6262
</Dependency>
63-
<Dependency Name="System.CodeDom" Version="12.0.0-alpha.1.26473.114">
63+
<Dependency Name="System.CodeDom" Version="12.0.0-alpha.1.26477.101">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
65+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
6666
</Dependency>
67-
<Dependency Name="System.Configuration.ConfigurationManager" Version="12.0.0-alpha.1.26473.114">
67+
<Dependency Name="System.Configuration.ConfigurationManager" Version="12.0.0-alpha.1.26477.101">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
69+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="12.0.0-alpha.1.26473.114">
71+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="12.0.0-alpha.1.26477.101">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
73+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="12.0.0-alpha.1.26473.114">
75+
<Dependency Name="System.Formats.Nrbf" Version="12.0.0-alpha.1.26477.101">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
77+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="12.0.0-alpha.1.26473.114">
79+
<Dependency Name="System.IO.Hashing" Version="12.0.0-alpha.1.26477.101">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
81+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26473.114">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26477.101">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
88+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="12.0.0-beta.26473.114">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="12.0.0-beta.26477.101">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
92+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="12.0.0-beta.26473.114">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="12.0.0-beta.26477.101">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
96+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26473.114">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26477.101">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
100+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="12.0.0-beta.26473.114">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="12.0.0-beta.26477.101">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
104+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="12.0.0-beta.26473.114">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="12.0.0-beta.26477.101">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
108+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="12.0.0-beta.26473.114">
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="12.0.0-beta.26477.101">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>c567e8ff13b8ada7c5285c60bc2ac1111ae602e7</Sha>
112+
<Sha>c38d0900682e8ee67cf6eb5dcff6b35de9019c7e</Sha>
113113
</Dependency>
114114
</ToolsetDependencies>
115115
</Dependencies>

‎eng/common/core-templates/job/helix-job-monitor.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,12 @@ parameters:
9494
type: boolean
9595
default: false
9696

97-
# When true, test results are reported to Azure DevOps using the fully qualified test name
98-
# (Namespace.Type.Method) as the stable automatedTestName and the visible title is qualified as
99-
# well (--use-fully-qualified-test-name). Opt-in because it changes AzDO test identity and display;
100-
# primarily useful for frameworks like MSTest whose display name is only the method name.
97+
# When true (the default), test results are reported to Azure DevOps using the fully qualified test
98+
# name (Namespace.Type.Method) as the stable automatedTestName and the visible title is qualified as
99+
# well (--use-fully-qualified-test-name). Set to false to preserve framework-provided display names.
101100
- name: useFullyQualifiedTestName
102101
type: boolean
103-
default: false
102+
default: true
104103

105104
# Controls per-test output attachments. Defaults to Failed.
106105
- name: testResultAttachmentMode

‎eng/common/cross/toolchain.cmake‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ unset(FREEBSD)
66
unset(OPENBSD)
77
unset(ILLUMOS)
88
unset(ANDROID)
9+
unset(OPENHARMONY)
910
unset(TIZEN)
1011
unset(HAIKU)
1112

@@ -35,6 +36,8 @@ if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release)
3536
set(TIZEN 1)
3637
elseif(EXISTS ${CROSS_ROOTFS}/android_platform)
3738
set(ANDROID 1)
39+
elseif(EXISTS ${CROSS_ROOTFS}/../build/cmake/ohos.toolchain.cmake)
40+
set(OPENHARMONY 1)
3841
endif()
3942

4043
if(TARGET_ARCH_NAME STREQUAL "arm")
@@ -204,6 +207,17 @@ if(ANDROID)
204207

205208
# include official NDK toolchain script
206209
include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
210+
elseif(OPENHARMONY)
211+
if(TARGET_ARCH_NAME STREQUAL "arm")
212+
set(OHOS_ARCH armeabi-v7a)
213+
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
214+
set(OHOS_ARCH arm64-v8a)
215+
elseif(TARGET_ARCH_NAME STREQUAL "x64")
216+
set(OHOS_ARCH x86_64)
217+
endif()
218+
219+
# include official OHOS NDK toolchain script
220+
include(${CROSS_ROOTFS}/../build/cmake/ohos.toolchain.cmake)
207221
elseif(FREEBSD OR OPENBSD)
208222
# we cross-compile by instructing clang
209223
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
@@ -308,7 +322,7 @@ endif()
308322

309323
# Specify compile options
310324

311-
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU)
325+
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT OPENHARMONY AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU)
312326
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
313327
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
314328
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

‎eng/common/native/init-distro-rid.sh‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ getNonPortableDistroRid()
4141
nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
4242
elif [ "$targetOs" = "openbsd" ]; then
4343
nonPortableRid="openbsd.$(uname -r)-${targetArch}"
44+
elif [ "$targetOs" = "openharmony" ] && command -v param >/dev/null && param get const.ohos.fullname 2>/dev/null | grep -qi '^openharmony'; then
45+
__openharmony_api_version=$(param get const.ohos.apiversion | tr -d '[:space:]')
46+
nonPortableRid="openharmony.$__openharmony_api_version-${targetArch}"
4447
elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
4548
__android_sdk_version=$(getprop ro.build.version.sdk)
4649
nonPortableRid="android.$__android_sdk_version-${targetArch}"
@@ -101,10 +104,14 @@ initDistroRidGlobal()
101104
STRINGS="$(command -v llvm-strings || true)"
102105
fi
103106

104-
# Check for musl-based distros (e.g. Alpine Linux, Void Linux).
105-
if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
106-
( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
107-
__PortableTargetOS="linux-musl"
107+
# Check for musl-based distros (e.g. Alpine Linux, Void Linux). Only linux targets
108+
# have a musl/glibc portable flavor; skip the check for other targets so that a
109+
# musl-based build host does not clobber their portable OS (e.g. openharmony).
110+
if [ "$targetOs" = "linux" ]; then
111+
if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
112+
( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
113+
__PortableTargetOS="linux-musl"
114+
fi
108115
fi
109116
fi
110117

0 commit comments

Comments
 (0)