Skip to content

Commit fb2a781

Browse files
[main] Update dependencies from dotnet/arcade (#10149)
* Update dependencies from https://github.com/dotnet/arcade build 20241205.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24605.1 * Update dependencies from https://github.com/dotnet/arcade build 20241206.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24606.6 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent c6bff27 commit fb2a781

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24604.4">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24606.6">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
170+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24604.4">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24606.6">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
174+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24604.4">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24606.6">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
178+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24604.4">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24606.6">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
186+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ __AlpinePackages+=" krb5-dev"
7373
__AlpinePackages+=" openssl-dev"
7474
__AlpinePackages+=" zlib-dev"
7575

76-
__FreeBSDBase="13.3-RELEASE"
77-
__FreeBSDPkg="1.17.0"
76+
__FreeBSDBase="13.4-RELEASE"
77+
__FreeBSDPkg="1.21.3"
7878
__FreeBSDABI="13"
7979
__FreeBSDPackages="libunwind"
8080
__FreeBSDPackages+=" icu"
@@ -371,7 +371,7 @@ while :; do
371371
;;
372372
freebsd14)
373373
__CodeName=freebsd
374-
__FreeBSDBase="14.0-RELEASE"
374+
__FreeBSDBase="14.2-RELEASE"
375375
__FreeBSDABI="14"
376376
__SkipUnmount=1
377377
;;
@@ -574,7 +574,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
574574
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
575575
fi
576576
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
577+
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
578578
mkdir -p "$__RootfsDir"/tmp
579579
# get and build package manager
580580
if [[ "$__hasWget" == 1 ]]; then

global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100",
3+
"dotnet": "10.0.100-alpha.1.24573.1",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4",
16-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24604.4"
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6",
16+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24606.6"
1717
},
1818
"sdk": {
19-
"version": "9.0.100"
19+
"version": "10.0.100-alpha.1.24573.1"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.38.0.1",

0 commit comments

Comments
 (0)