8000 Merge pull request #111378 from carlossanlop/release/9.0-staging · dotnet/runtime@63b7284 · GitHub
[go: up one dir, main page]
Skip to content

Commit 63b7284

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #111378 from carlossanlop/release/9.0-staging
[manual] Merge release/9.0-staging into release/9.0
2 parents 55b2924 + d8b1554 commit 63b7284

File tree

120 files changed

+2618
-767
lines changed
  • pal_evp_pkey.c
  • tasks
  • tests

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    120 files changed

    +2618
    -767
    lines changed

    ‎.config/dotnet-tools.json

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -15,7 +15,7 @@
    1515
    ]
    1616
    },
    1717
    "microsoft.dotnet.xharness.cli": {
    18-
    "version": "9.0.0-prerelease.24575.3",
    18+
    "version": "9.0.0-prerelease.25057.1",
    1919
    "commands": [
    2020
    "xharness"
    2121
    ]

    ‎NuGet.config

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -9,10 +9,11 @@
    99
    <clear />
    1010
    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
    1111
    <!-- Begin: Package sources from dotnet-emsdk -->
    12+
    <add key="darc-pub-dotnet-emsdk-2c27e40" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405/nuget/v3/index.json" />
    1213
    <add key="darc-pub-dotnet-emsdk-4c9d1b1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11/nuget/v3/index.json" />
    1314
    <!-- End: Package sources from dotnet-emsdk -->
    1415
    <!-- Begin: Package sources from dotnet-sdk -->
    15-
    <add key="darc-pub-dotnet-sdk-cbec38b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-cbec38b1/nuget/v3/index.json" />
    16+
    <add key="darc-pub-dotnet-sdk-a345a00" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-a345a003/nuget/v3/index.json" />
    1617
    <!-- End: Package sources from dotnet-sdk -->
    1718
    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
    1819
    <!--

    ‎eng/Version.Details.xml

    Lines changed: 79 additions & 79 deletions
    Large diffs are not rendered by default.

    ‎eng/Versions.props

    Lines changed: 31 additions & 30 deletions
    Original file line numberDiff line numberDiff line change
    @@ -36,17 +36,17 @@
    3636
    </ItemGroup>
    3737
    <PropertyGroup>
    3838
    <!-- dotnet/roslyn-analyzers dependencies -->
    39-
    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24574.2</MicrosoftCodeAnalysisAnalyzersVersion>
    40-
    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24574.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
    39+
    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24629.2</MicrosoftCodeAnalysisAnalyzersVersion>
    40+
    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24629.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
    4141
    <!-- dotnet/roslyn dependencies -->
    4242
    <!--
    4343
    These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
    4444
    Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
    4545
    they do not break the local dev experience.
    4646
    -->
    47-
    <MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.24574.8</MicrosoftCodeAnalysisCSharpVersion>
    48-
    <MicrosoftCodeAnalysisVersion>4.12.0-3.24574.8</MicrosoftCodeAnalysisVersion>
    49-
    <MicrosoftNetCompilersToolsetVersion>4.12.0-3.24574.8</MicrosoftNetCompilersToolsetVersion>
    47+
    <MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.24631.1</MicrosoftCodeAnalysisCSharpVersion>
    48+
    <MicrosoftCodeAnalysisVersion>4.12.0-3.24631.1</MicrosoftCodeAnalysisVersion>
    49+
    <MicrosoftNetCompilersToolsetVersion>4.12.0-3.24631.1</MicrosoftNetCompilersToolsetVersion>
    5050
    </PropertyGroup>
    5151
    <!--
    5252
    For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
    @@ -85,22 +85,22 @@
    8585
    <!-- SDK dependencies (also used in wasm build tests -->
    8686
    <MicrosoftDotNetApiCompatTaskVersion>9.0.102</MicrosoftDotNetApiCompatTaskVersion>
    8787
    <!-- Arcade dependencies -->
    88-
    <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksFeedVersion>
    89-
    <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24572.2</MicrosoftDotNetCodeAnalysisVersion>
    90-
    <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24572.2</MicrosoftDotNetGenAPIVersion>
    91-
    <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24572.2</MicrosoftDotNetGenFacadesVersion>
    92-
    <MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24572.2</MicrosoftDotNetXUnitAssertVersion>
    93-
    <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24572.2</MicrosoftDotNetXUnitExtensionsVersion>
    94-
    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24572.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
    95-
    <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksArchivesVersion>
    96-
    <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksInstallersVersion>
    97-
    <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksPackagingVersion>
    98-
    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
    99-
    <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksTemplatingVersion>
    100-
    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
    101-
    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24572.2</MicrosoftDotNetRemoteExecutorVersion>
    102-
    <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24572.2</MicrosoftDotNetVersionToolsTasksVersion>
    103-
    <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24572.2</MicrosoftDotNetPackageTestingVersion>
    88+
    <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksFeedVersion>
    89+
    <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25058.5</MicrosoftDotNetCodeAnalysisVersion>
    90+
    <MicrosoftDotNetGenAPIVersion>9.0.0-beta.25058.5</MicrosoftDotNetGenAPIVersion>
    91+
    <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25058.5</MicrosoftDotNetGenFacadesVersion>
    92+
    <MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25058.5</MicrosoftDotNetXUnitAssertVersion>
    93+
    <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25058.5</MicrosoftDotNetXUnitExtensionsVersion>
    94+
    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25058.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
    95+
    <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksArchivesVersion>
    96+
    <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksInstallersVersion>
    97+
    <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksPackagingVersion>
    98+
    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
    99+
    <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksTemplatingVersion>
    100+
    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
    101+
    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25058.5</MicrosoftDotNetRemoteExecutorVersion>
    102+
    <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25058.5</MicrosoftDotNetVersionToolsTasksVersion>
    103+
    <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25058.5</MicrosoftDotNetPackageTestingVersion>
    104104
    <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
    105105
    <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
    106106
    <!-- NuGet dependencies -->
    @@ -184,10 +184,10 @@
    184184
    <!-- Testing -->
    185185
    <MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
    186186
    <MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
    187-
    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24575.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
    188-
    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24575.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
    189-
    <MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24575.3</MicrosoftDotNetXHarnessCLIVersion>
    190-
    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24561.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
    187+
    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25057.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
    188+
    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25057.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
    189+
    <MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25057.1</MicrosoftDotNetXHarnessCLIVersion>
    190+
    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25057.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
    191191
    <NUnitVersion>3.12.0</NUnitVersion>
    192192
    <NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
    193193
    <CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
    @@ -215,11 +215,11 @@
    215215
    <!-- Docs -->
    216216
    <MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
    217217
    <!-- Mono Cecil -->
    218-
    <MicrosoftDotNetCecilVersion>0.11.5-alpha.24602.1</MicrosoftDotNetCecilVersion>
    218+
    <MicrosoftDotNetCecilVersion>0.11.5-alpha.25056.3</MicrosoftDotNetCecilVersion>
    219219
    <!-- ILCompiler -->
    220220
    <MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24511.16</MicrosoftDotNetILCompilerVersion>
    221221
    <!-- ICU -->
    222-
    <MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24572.1</MicrosoftNETCoreRuntimeICUTransportVersion>
    222+
    <MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25061.1</MicrosoftNETCoreRuntimeICUTransportVersion>
    223223
    <MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>
    224224
    <!-- MsQuic -->
    225225
    <MicrosoftNativeQuicMsQuicSchannelVersion>2.4.3</MicrosoftNativeQuicMsQuicSchannelVersion>
    @@ -243,8 +243,8 @@
    243243
    Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
    244244
    like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport
    245245
    -->
    246-
    <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.1-servicing.24604.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
    247-
    <MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
    246+
    <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.2-servicing.25061.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
    247+
    <MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
    248248
    <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEms 10000 criptenCurrentManifest90100Version)</MicrosoftNETRuntimeEmscriptenVersion>
    249249
    <!-- workloads -->
    250250
    <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
    @@ -262,7 +262,8 @@
    262262
    <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
    263263
    <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
    264264
    <!-- sdk version, for testing workloads -->
    265-
    <SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
    265+
    <!--<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>-->
    266+
    <SdkVersionForWorkloadTesting>9.0.101</SdkVersionForWorkloadTesting>
    266267
    <runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
    267268
    <EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
    268269
    <NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

    ‎eng/common/cross/toolchain.cmake

    Lines changed: 31 additions & 36 deletions
    Original file line numberDiff line numberDiff line change
    @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
    4040
    set(TOOLCHAIN "arm-linux-gnueabihf")
    4141
    endif()
    4242
    if(TIZEN)
    43-
    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
    43+
    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf")
    4444
    endif()
    4545
    elseif(TARGET_ARCH_NAME STREQUAL "arm64")
    4646
    set(CMAKE_SYSTEM_PROCESSOR aarch64)
    @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
    4949
    elseif(LINUX)
    5050
    set(TOOLCHAIN "aarch64-linux-gnu")
    5151
    if(TIZEN)
    52-
    set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
    52+
    set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu")
    5353
    endif()
    5454
    elseif(FREEBSD)
    5555
    set(triple "aarch64-unknown-freebsd12")
    @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
    5858
    set(CMAKE_SYSTEM_PROCESSOR armv7l)
    5959
    set(TOOLCHAIN "arm-linux-gnueabi")
    6060
    if(TIZEN)
    61-
    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
    61+
    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi")
    6262
    endif()
    6363
    elseif(TARGET_ARCH_NAME STREQUAL "armv6")
    6464
    set(CMAKE_SYSTEM_PROCESSOR armv6l)
    @@ -81,7 +81,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
    8181
    else()
    8282
    set(TOOLCHAIN "riscv64-linux-gnu")
    8383
    if(TIZEN)
    84-
    set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
    84+
    set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu")
    8585
    endif()
    8686
    endif()
    8787
    elseif(TARGET_ARCH_NAME STREQUAL "s390x")
    @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
    9898
    elseif(LINUX)
    9999
    set(TOOLCHAIN "x86_64-linux-gnu")
    100100
    if(TIZEN)
    101-
    set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
    101+
    set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
    102102
    endif()
    103103
    elseif(FREEBSD)
    104104
    set(triple "x86_64-unknown-freebsd12")
    @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
    115115
    set(TOOLCHAIN "i686-linux-gnu")
    116116
    endif()
    117117
    if(TIZEN)
    118-
    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
    118+
    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
    119119
    endif()
    120120
    else()
    121121
    message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
    @@ -127,30 +127,25 @@ endif()
    127127

    128128
    # Specify include paths
    129129
    if(TIZEN)
    130-
    if(TARGET_ARCH_NAME STREQUAL "arm")
    131-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
    132-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
    133-
    endif()
    134-
    if(TARGET_ARCH_NAME STREQUAL "armel")
    135-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
    136-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
    137-
    endif()
    138-
    if(TARGET_ARCH_NAME STREQUAL "arm64")
    139-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
    140-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
    141-
    endif()
    142-
    if(TARGET_ARCH_NAME STREQUAL "x86")
    143-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
    144-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
    145-
    endif()
    146-
    if(TARGET_ARCH_NAME STREQUAL "x64")
    147-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
    148-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
    149-
    endif()
    150-
    if(TARGET_ARCH_NAME STREQUAL "riscv64")
    151-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
    152-
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
    130+
    function(find_toolchain_dir prefix)
    131+
    # Dynamically find the version subdirectory
    132+
    file(GLOB DIRECTORIES "${prefix}/*")
    133+
    list(GET DIRECTORIES 0 FIRST_MATCH)
    134+
    get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME)
    135+
    136+
    set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
    137+
    endfunction()
    138+
    139+
    if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
    140+
    find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
    141+
    else()
    142+
    find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
    153143
    endif()
    144+
    145+
    message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}")
    146+
    147+
    include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++)
    148+
    include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN})
    154149
    endif()
    155150

    156151
    if(ANDROID)
    @@ -272,21 +267,21 @@ endif()
    272267

    273268
    if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
    274269
    if(TIZEN)
    275-
    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
    270+
    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
    276271
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
    277272
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
    278-
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
    273+
    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
    279274
    endif()
    280275
    elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
    281276
    if(TIZEN)
    282-
    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
    277+
    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
    283278
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
    284279
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
    285-
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
    280+
    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
    286281

    287282
    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
    288283
    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
    289-
    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
    284+
    add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
    290285
    endif()
    291286
    elseif(TARGET_ARCH_NAME STREQUAL "s390x")
    292287
    add_toolchain_linker_flag("--target=${TOOLCHAIN}")
    @@ -297,10 +292,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
    297292
    endif()
    298293
    add_toolchain_linker_flag(-m32)
    299294
    if(TIZEN)
    300-
    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
    295+
    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
    301296
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
    302297
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
    303-
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
    298+
    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
    304299
    endif()
    305300
    elseif(ILLUMOS)
    306301
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")

    ‎eng/common/tools.ps1

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -320,7 +320,7 @@ function InstallDotNet([string] $dotnetRoot,
    320320
    $variations += @($installParameters)
    321321

    322322
    $dotnetBuilds = $installParameters.Clone()
    323-
    $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
    323+
    $dotnetbuilds.AzureFeed = "https://ci.dot.net/public"
    324324
    $variations += @($dotnetBuilds)
    325325

    326326
    if ($runtimeSourceFeed) {

    ‎eng/common/tools.sh

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -232,7 +232,7 @@ function InstallDotNet {
    232232
    local public_location=("${installParameters[@]}")
    233233
    variations+=(public_location)
    234234

    235-
    local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
    235+
    local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public")
    236236
    variations+=(dotnetbuilds)
    237237

    238238
    if [[ -n "${6:-}" ]]; then

    0 commit comments

    Comments
     (0)
    0