Skip to content

Commit 0df58f7

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/8.0.4xx] Update dependencies from dotnet/arcade (#45676)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 3422e38 commit 0df58f7

File tree

7 files changed

+47
-45
lines changed

7 files changed

+47
-45
lines changed

‎NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<!-- End: Package sources from dotnet-runtime -->
2929
<!-- Begin: Package sources from dotnet-templating -->
3030
<add key="darc-pub-dotnet-templating-b8edc79" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b8edc791/nuget/v3/index.json" />
31+
<add key="darc-pub-dotnet-templating-b8edc79-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b8edc791-3/nuget/v3/index.json" />
32+
<add key="darc-pub-dotnet-templating-b8edc79-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b8edc791-2/nuget/v3/index.json" />
33+
<add key="darc-pub-dotnet-templating-b8edc79-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b8edc791-1/nuget/v3/index.json" />
3134
<!-- End: Package sources from dotnet-templating -->
3235
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3336
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24570.5">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24623.2">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
496+
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24570.5">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24623.2">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
501+
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24570.5">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24623.2">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
505+
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24570.5">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24623.2">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
509+
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24570.5</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24623.2</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24570.5</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24623.2</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/cross/toolchain.cmake

Lines changed: 30 additions & 31 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)
@@ -95,7 +95,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
9595
elseif(LINUX)
9696
set(TOOLCHAIN "x86_64-linux-gnu")
9797
if(TIZEN)
98-
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
98+
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
9999
endif()
100100
elseif(FREEBSD)
101101
set(triple "x86_64-unknown-freebsd12")
@@ -112,7 +112,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
112112
set(TOOLCHAIN "i686-linux-gnu")
113113
endif()
114114
if(TIZEN)
115-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
115+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
116116
endif()
117117
else()
118118
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
@@ -124,26 +124,25 @@ endif()
124124

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

149148
if(ANDROID)
@@ -265,21 +264,21 @@ endif()
265264

266265
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
267266
if(TIZEN)
268-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
267+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
269268
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
270269
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
271-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
270+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
272271
endif()
273272
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
274273
if(TIZEN)
275-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
274+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
276275
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
277276
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
278-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
277+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
279278

280279
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
281280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
282-
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
281+
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
283282
endif()
284283
elseif(TARGET_ARCH_NAME STREQUAL "x86")
285284
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
@@ -288,10 +287,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
288287
endif()
289288
add_toolchain_linker_flag(-m32)
290289
if(TIZEN)
291-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
290+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
292291
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
293292
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
294-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
293+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
295294
endif()
296295
elseif(ILLUMOS)
297296
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
@@ -321,7 +321,7 @@ function InstallDotNet([string] $dotnetRoot,
321321
$variations += @($installParameters)
322322

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

327327
if ($runtimeSourceFeed) {

‎eng/common/tools.sh

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

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

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

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24570.5",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24570.5"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24623.2",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24623.2"
1919
}
2020
}

0 commit comments

Comments
 (0)