Skip to content

Commit 59c01a5

Browse files
AndriySvyrydAndriySvyryd
authoredJan 28, 2025··
Merge branch 'release/9.0' into 'release/9.0-staging' (#35542)
·
v10.0.0-preview.2.25163.8v9.0.3
2 parents 4185501 + 9e3cdc2 commit 59c01a5

8 files changed

+97
-96
lines changed
 

‎NuGet.config

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-int-dotnet-runtime-c8acea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-c8acea2-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-8/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-c8acea2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-3/nuget/v3/index.json" />
710
<!-- End: Package sources from dotnet-runtime -->
811
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
912
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,6 +23,9 @@
2023
<clear />
2124
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2225
<!-- Begin: Package sources from dotnet-runtime -->
26+
<add key="darc-int-dotnet-runtime-c8acea2-3" value="true" />
27+
<add key="darc-int-dotnet-runtime-c8acea2-8" value="true" />
28+
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
2329
<!-- End: Package sources from dotnet-runtime -->
2430
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2531
</disabledPackageSources>

‎eng/Version.Details.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.1">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
6+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.1">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
10-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
10+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
14-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
14+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.1">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
18+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.1">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
22+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.1">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
26+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.1">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
30+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24528.9">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.1-servicing.24610.10">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
34+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
38+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0">
40+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.1">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
42+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.0-rtm.24528.9">
44+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.1-servicing.24610.10">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
46+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
4747
</Dependency>
4848
<!--
4949
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
5050
All Runtime.$rid packages should have the same version.
5151
-->
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
54+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="9.0.0">
56+
<Dependency Name="System.Text.Json" Version="9.0.1">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
58+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Text.Encodings.Web" Version="9.0.0">
60+
<Dependency Name="System.Text.Encodings.Web" Version="9.0.1">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
62+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
6363
</Dependency>
64-
<Dependency Name="System.Formats.Asn1" Version="9.0.0">
64+
<Dependency Name="System.Formats.Asn1" Version="9.0.1">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
66+
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24572.2">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
72+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24572.2">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25065.2">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
76+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24572.2">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25065.2">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
80+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

‎eng/Versions.props

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<VersionPrefix>9.0.1</VersionPrefix>
3+
<VersionPrefix>9.0.2</VersionPrefix>
44
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
55
<PreReleaseVersionIteration>
66
</PreReleaseVersionIteration>
@@ -17,24 +17,24 @@
1717
<UsingToolXliff>False</UsingToolXliff>
1818
</PropertyGroup>
1919
<PropertyGroup Label="Dependencies from dotnet/runtime">
20-
<MicrosoftExtensionsCachingMemoryVersion>9.0.0</MicrosoftExtensionsCachingMemoryVersion>
21-
<MicrosoftExtensionsConfigurationVersion>9.0.0</MicrosoftExtensionsConfigurationVersion>
22-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
23-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0</MicrosoftExtensionsConfigurationJsonVersion>
25-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0</MicrosoftExtensionsDependencyInjectionVersion>
26-
<MicrosoftExtensionsDependencyModelVersion>9.0.0</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24528.9</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28-
<MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.0</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.0-rtm.24528.9</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32-
<SystemTextEncodingsWebVersion>9.0.0</SystemTextEncodingsWebVersion>
33-
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
34-
<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>
20+
<MicrosoftExtensionsCachingMemoryVersion>9.0.1</MicrosoftExtensionsCachingMemoryVersion>
21+
<MicrosoftExtensionsConfigurationVersion>9.0.1</MicrosoftExtensionsConfigurationVersion>
22+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
23+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.1</MicrosoftExtensionsConfigurationJsonVersion>
25+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.1</MicrosoftExtensionsDependencyInjectionVersion>
26+
<MicrosoftExtensionsDependencyModelVersion>9.0.1</MicrosoftExtensionsDependencyModelVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.1-servicing.24610.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28+
<MicrosoftExtensionsLoggingVersion>9.0.1</MicrosoftExtensionsLoggingVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.1</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.1-servicing.24610.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32+
<SystemTextEncodingsWebVersion>9.0.1</SystemTextEncodingsWebVersion>
33+
<SystemTextJsonVersion>9.0.1</SystemTextJsonVersion>
34+
<SystemFormatsAsn1Version>9.0.1</SystemFormatsAsn1Version>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Dependencies from dotnet/arcade">
37-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksTemplatingVersion>
37+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksTemplatingVersion>
3838
</PropertyGroup>
3939
<PropertyGroup Label="Other dependencies">
4040
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>

‎eng/common/cross/toolchain.cmake

+31-36
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/template-guidance.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extends:
5757
5858
Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
5959

60-
# Development notes
60+
## Development notes
6161

6262
**Folder / file structure**
6363

‎eng/common/tools.ps1

+1-1
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

+1-1
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

‎global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "9.0.102",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "9.0.100",
8+
"dotnet": "9.0.102",
99
"runtimes": {
1010
"dotnet": [
1111
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
1212
]
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2",
17-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24572.2"
16+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2",
17+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2"
1818
}
1919
}

0 commit comments

Comments
 (0)
Please sign in to comment.