Skip to content

Commit 2495fae

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20241223.3 (#7797)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24623.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 23ba7af commit 2495fae

9 files changed

+58
-94
lines changed

‎NuGet.config

-26
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,8 @@
1010
<clear />
1111
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1212
<!-- Begin: Package sources from dotnet-aspnetcore -->
13-
<add key="darc-int-dotnet-aspnetcore-af22eff" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-aspnetcore-af22eff-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-9/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-aspnetcore-af22eff-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-8/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-aspnetcore-af22eff-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-7/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-aspnetcore-af22eff-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-6/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-aspnetcore-af22eff-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-5/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-aspnetcore-af22eff-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-4/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-aspnetcore-af22eff-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-12/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-aspnetcore-af22eff-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-11/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-aspnetcore-af22eff-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-10/nuget/v3/index.json" />
2313
<!-- End: Package sources from dotnet-aspnetcore -->
2414
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-9d5a6a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-runtime-9d5a6a9-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a-9/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-runtime-9d5a6a9-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a-12/nuget/v3/index.json" />
2815
<!-- End: Package sources from dotnet-runtime -->
2916
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3017
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
@@ -43,21 +30,8 @@
4330
<clear />
4431
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4532
<!-- Begin: Package sources from dotnet-aspnetcore -->
46-
<add key="darc-int-dotnet-aspnetcore-af22eff-10" value="true" />
47-
<add key="darc-int-dotnet-aspnetcore-af22eff-11" value="true" />
48-
<add key="darc-int-dotnet-aspnetcore-af22eff-12" value="true" />
49-
<add key="darc-int-dotnet-aspnetcore-af22eff-4" value="true" />
50-
<add key="darc-int-dotnet-aspnetcore-af22eff-5" value="true" />
51-
<add key="darc-int-dotnet-aspnetcore-af22eff-6" value="true" />
52-
<add key="darc-int-dotnet-aspnetcore-af22eff-7" value="true" />
53-
<add key="darc-int-dotnet-aspnetcore-af22eff-8" value="true" />
54-
<add key="darc-int-dotnet-aspnetcore-af22eff-9" value="true" />
55-
<add key="darc-int-dotnet-aspnetcore-af22eff" value="true" />
5633
<!-- End: Package sources from dotnet-aspnetcore -->
5734
<!-- Begin: Package sources from dotnet-runtime -->
58-
<add key="darc-int-dotnet-runtime-9d5a6a9-12" value="true" />
59-
<add key="darc-int-dotnet-runtime-9d5a6a9-9" value="true" />
60-
<add key="darc-int-dotnet-runtime-9d5a6a9" value="true" />
6135
<!-- End: Package sources from dotnet-runtime -->
6236
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6337
</disabledPackageSources>

‎eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24623.3">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
27+
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24516.2">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24623.3">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
31+
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24516.2">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24623.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
35+
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24516.2">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24623.3">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
39+
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24516.2">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24623.3">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
43+
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.553101">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>

‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24516.2</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24516.2</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24623.3</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24623.3</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24623.3</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24529.3</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>

‎eng/common/core-templates/steps/get-delegation-sas.yml

+6-11
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ steps:
2828
scriptType: 'pscore'
2929
scriptLocation: 'inlineScript'
3030
inlineScript: |
31-
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32-
# of correlation payloads. See https://github.com/dotnet/dnceng/issues/3484
33-
$sas = ""
34-
do {
35-
# Calculate the expiration of the SAS token and convert to UTC
36-
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
31+
# Calculate the expiration of the SAS token and convert to UTC
32+
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3733
3834
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
3935
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
@@ -46,11 +42,10 @@ steps:
4642
}
4743
} while($sas.IndexOf('/') -ne -1)
4844
49-
if ($LASTEXITCODE -ne 0) {
50-
Write-Error "Failed to generate SAS token."
51-
exit 1
52-
}
53-
} while($sas.IndexOf('/') -ne -1)
45+
if ($LASTEXITCODE -ne 0) {
46+
Write-Error "Failed to generate SAS token."
47+
exit 1
48+
}
5449
5550
if ('${{ parameters.base64Encode }}' -eq 'true') {
5651
$sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas))

‎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/sdk-task.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1

+3-3
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) {
@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
383383

384384
# If the version of msbuild is going to be xcopied,
385385
# use this version. Version matches a package here:
386-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
387-
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
386+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
387+
$defaultXCopyMSBuildVersion = '17.12.0'
388388

389389
if (!$vsRequirements) {
390390
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-rc.2.24474.11",
3+
"dotnet": "9.0.100",
44
"runtimes": {
55
"aspnetcore": [
66
"$(MicrosoftAspNetCoreApp60Version)",
@@ -31,7 +31,7 @@
3131
},
3232
"msbuild-sdks": {
3333
"Microsoft.Build.NoTargets": "3.7.0",
34-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
35-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2"
34+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24623.3",
35+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24623.3"
3636
}
3737
}

0 commit comments

Comments
 (0)