Skip to content

Commit a778fd0

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20241206.6 (#59390)
[main] Update dependencies from dotnet/arcade
1 parent 61be94c commit a778fd0

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -384,39 +384,39 @@
384384
<Uri>https://github.com/dotnet/runtime</Uri>
385385
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24578.2">
387+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24606.6">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
389+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
390390
</Dependency>
391391
<!-- Intermediate is necessary for source build. -->
392-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24578.2">
392+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24606.6">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
394+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
395395
<SourceBuild RepoName="arcade" ManagedOnly="true" />
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24578.2">
397+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24606.6">
398398
<Uri>https://github.com/dotnet/arcade</Uri>
399-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
399+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24578.2">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24606.6">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
403+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24578.2">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24606.6">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
407+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24578.2">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24606.6">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
411+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24578.2">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24606.6">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
415+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24578.2">
417+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24606.6">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
419+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
420420
</Dependency>
421421
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24577.1">
422422
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24578.2</MicrosoftDotNetBuildTasksArchivesVersion>
169-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24578.2</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24578.2</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24578.2</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24578.2</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24606.6</MicrosoftDotNetBuildTasksArchivesVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24606.6</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24606.6</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24606.6</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24606.6</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.0-alpha.1.24575.3</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 4 additions & 4 deletions
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24578.2",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24578.2",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24578.2",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24606.6",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24606.6",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)