Skip to content

Commit af30d30

Browse files
LoopedBard3LoopedBard3
authored
Update channel main to net10 (#4610)
* Update main channel branch to using net10.0 * Take arcade and runtime darc updates. * Add net10 package feeds. * Add global.net9.json for net9.0 runs. * Added net10 condition to Microbenchmarks.csproj. * One more missed net9.0 -> net10.0 replacement.
1 parent 88d1a80 commit af30d30

14 files changed

+148
-137
lines changed

‎NuGet.config

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<add key="darc-pub-dotnet-android-ab7d7dc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-ab7d7dc0/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-android -->
1212
<!-- Begin: Package sources from dotnet-runtime -->
13-
<add key="darc-pub-dotnet-runtime-756e620" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-756e6205/nuget/v3/index.json" />
1413
<!-- End: Package sources from dotnet-runtime -->
1514
<!-- Begin: Package sources from dotnet-windowsdesktop -->
1615
<add key="darc-pub-dotnet-windowsdesktop-5936e9c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-5936e9c6/nuget/v3/index.json" />
@@ -22,6 +21,9 @@
2221
<!-- End: Package sources from dotnet-aspnetcore -->
2322
<!-- Begin: Package sources from dotnet-emsdk -->
2423
<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" />
24+
<add key="darc-pub-dotnet-emsdk-4c9d1b1-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-8/nuget/v3/index.json" />
25+
<add key="darc-pub-dotnet-emsdk-4c9d1b1-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-7/nuget/v3/index.json" />
26+
<add key="darc-pub-dotnet-emsdk-4c9d1b1-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-6/nuget/v3/index.json" />
2527
<add key="darc-pub-dotnet-emsdk-4c9d1b1-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-5/nuget/v3/index.json" />
2628
<add key="darc-pub-dotnet-emsdk-4c9d1b1-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-4/nuget/v3/index.json" />
2729
<add key="darc-pub-dotnet-emsdk-4c9d1b1-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-3/nuget/v3/index.json" />
@@ -32,6 +34,8 @@
3234
<!-- End: Package sources from dotnet-maui -->
3335
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3436
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
37+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
38+
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
3539
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
3640
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
3741
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />

‎eng/Version.Details.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.1">
4+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.24617.3">
55
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>756e62050722c168cd3b753be73b7cbcd93f06d6</Sha>
6+
<Sha>040cbe276907174316e2cc07b35814b3069874a6</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.1-servicing.24610.11">
8+
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-alpha.1.24617.3">
99
<Uri>https://github.com/dotnet/runtime</Uri>
10-
<Sha>756e62050722c168cd3b753be73b7cbcd93f06d6</Sha>
10+
<Sha>040cbe276907174316e2cc07b35814b3069874a6</Sha>
1111
</Dependency>
12-
<Dependency Name="System.Threading.Channels" Version="9.0.1">
12+
<Dependency Name="System.Threading.Channels" Version="10.0.0-alpha.1.24617.3">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>756e62050722c168cd3b753be73b7cbcd93f06d6</Sha>
14+
<Sha>040cbe276907174316e2cc07b35814b3069874a6</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.1">
16+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-alpha.1.24617.3">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>756e62050722c168cd3b753be73b7cbcd93f06d6</Sha>
18+
<Sha>040cbe276907174316e2cc07b35814b3069874a6</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.1">
2121
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -31,13 +31,13 @@
3131
</Dependency>
3232
</ProductDependencies>
3333
<ToolsetDependencies>
34-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24605.1">
34+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24617.2">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
36+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24605.1">
38+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24617.2">
3939
<Uri>https://github.com/dotnet/arcade</Uri>
40-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
40+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
4141
</Dependency>
4242
<!--
4343
Maui Rollback Version mappings, default means generated from sdk version. Allows for manual override of version similar to https://github.com/dotnet/maui/blob/df8cfcf635a590955a8cc3d6cf7ae6280449dd3f/eng/Versions.props#L138-L146, where the logic comes from:

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88
<!--Package versions-->
99
<PropertyGroup>
10-
<MicrosoftNETILLinkTasksVersion>9.0.1</MicrosoftNETILLinkTasksVersion>
11-
<MicrosoftNETILLinkPackageVersion>9.0.1-servicing.24610.11</MicrosoftNETILLinkPackageVersion>
12-
<SystemThreadingChannelsPackageVersion>9.0.1</SystemThreadingChannelsPackageVersion>
13-
<MicrosoftExtensionsLoggingPackageVersion>9.0.1</MicrosoftExtensionsLoggingPackageVersion>
10+
<MicrosoftNETILLinkTasksVersion>10.0.0-alpha.1.24617.3</MicrosoftNETILLinkTasksVersion>
11+
<MicrosoftNETILLinkPackageVersion>10.0.0-alpha.1.24617.3</MicrosoftNETILLinkPackageVersion>
12+
<SystemThreadingChannelsPackageVersion>10.0.0-alpha.1.24617.3</SystemThreadingChannelsPackageVersion>
13+
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-alpha.1.24617.3</MicrosoftExtensionsLoggingPackageVersion>
1414
<BenchmarkDotNetVersion>0.14.1-nightly.20240924.187</BenchmarkDotNetVersion>
1515
<MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>9.0.1</MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>
1616
</PropertyGroup>

‎eng/common/core-templates/steps/source-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ steps:
7878
7979
portableBuildArgs=
8080
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
81-
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
81+
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8282
fi
8383
8484
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \

‎eng/common/cross/build-rootfs.sh

+7-15
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,12 @@ __UbuntuPackages+=" symlinks"
5252
__UbuntuPackages+=" libicu-dev"
5353
__UbuntuPackages+=" liblttng-ust-dev"
5454
__UbuntuPackages+=" libunwind8-dev"
55-
__UbuntuPackages+=" libnuma-dev"
5655

5756
__AlpinePackages+=" gettext-dev"
5857
__AlpinePackages+=" icu-dev"
5958
__AlpinePackages+=" libunwind-dev"
6059
__AlpinePackages+=" lttng-ust-dev"
6160
__AlpinePackages+=" compiler-rt"
62-
__AlpinePackages+=" numactl-dev"
6361

6462
# runtime libraries' dependencies
6563
__UbuntuPackages+=" libcurl4-openssl-dev"
@@ -73,8 +71,8 @@ __AlpinePackages+=" krb5-dev"
7371
__AlpinePackages+=" openssl-dev"
7472
__AlpinePackages+=" zlib-dev"
7573

76-
__FreeBSDBase="13.3-RELEASE"
77-
__FreeBSDPkg="1.17.0"
74+
__FreeBSDBase="13.4-RELEASE"
75+
__FreeBSDPkg="1.21.3"
7876
__FreeBSDABI="13"
7977
__FreeBSDPackages="libunwind"
8078
__FreeBSDPackages+=" icu"
@@ -371,7 +369,7 @@ while :; do
371369
;;
372370
freebsd14)
373371
__CodeName=freebsd
374-
__FreeBSDBase="14.0-RELEASE"
372+
__FreeBSDBase="14.2-RELEASE"
375373
__FreeBSDABI="14"
376374
__SkipUnmount=1
377375
;;
@@ -424,13 +422,12 @@ case "$__AlpineVersion" in
424422
elif [[ "$__AlpineArch" == "riscv64" ]]; then
425423
__AlpineLlvmLibsLookup=1
426424
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
425+
elif [[ -n "$__AlpineMajorVersion" ]]; then
426+
# use whichever alpine version is provided and select the latest toolchain libs
427+
__AlpineLlvmLibsLookup=1
427428
else
428429
__AlpineVersion=3.13 # 3.13 to maximize compatibility
429430
__AlpinePackages+=" llvm10-libs"
430-
431-
if [[ "$__AlpineArch" == "armv7" ]]; then
432-
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
433-
fi
434431
fi
435432
esac
436433

@@ -444,11 +441,6 @@ if [[ "$__BuildArch" == "armel" ]]; then
444441
__LLDB_Package="lldb-3.5-dev"
445442
fi
446443

447-
if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then
448-
# libnuma-dev is not available on armhf for xenial
449-
__UbuntuPackages="${__UbuntuPackages//libnuma-dev/}"
450-
fi
451-
452444
__UbuntuPackages+=" ${__LLDB_Package:-}"
453445

454446
if [[ -z "$__UbuntuRepo" ]]; then
@@ -574,7 +566,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
574566
curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
575567
fi
576568
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
577-
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
569+
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
578570
mkdir -p "$__RootfsDir"/tmp
579571
# get and build package manager
580572
if [[ "$__hasWget" == 1 ]]; then

0 commit comments

Comments
 (0)