Skip to content

Commit bda5e2a

Browse files
dotnet-maestro[bot]Mike McLaughlin
andauthored
[main] Update dependencies from dotnet/arcade (#5092)
This pull request updates the following dependencies [marker]: <> (Begin:6d3f346d-45bf-4275-0e83-08d8e40a189f) ## From https://github.com/dotnet/arcade - **Subscription**: 6d3f346d-45bf-4275-0e83-08d8e40a189f - **Build**: 20241206.6 - **Date Produced**: December 6, 2024 10:46:21 PM UTC - **Commit**: 61b8f746424762d2e3173ebfaab19346224d591c - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 10.0.0-beta.24578.2 to 10.0.0-beta.24606.6][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 10.0.0-beta.24578.2 to 10.0.0-beta.24606.6][1] - **Microsoft.DotNet.CodeAnalysis**: [from 10.0.0-beta.24578.2 to 10.0.0-beta.24606.6][1] [1]: dotnet/arcade@e8de341...61b8f74 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 10.0.100-alpha.1.24573.1 [marker]: <> (End:6d3f346d-45bf-4275-0e83-08d8e40a189f) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Mike McLaughlin <mikem@microsoft.com>
1 parent 13357e7 commit bda5e2a

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
</Dependency>
1111
</ProductDependencies>
1212
<ToolsetDependencies>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24578.2">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24606.6">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
15+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
1616
</Dependency>
1717
<!-- Intermediate is necessary for source build. -->
18-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24578.2">
18+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24606.6">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
20+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
2121
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24578.2">
23+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24606.6">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
25+
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
2626
</Dependency>
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
2828
<Uri>https://github.com/dotnet/arcade</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
5656
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
5757
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24578.2</MicrosoftDotNetCodeAnalysisVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24606.6</MicrosoftDotNetCodeAnalysisVersion>
5959
<StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
6060
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
6161
<cdbsosversion>10.0.26100.1</cdbsosversion>

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
},
1313
"msbuild-sdks": {
1414
"Microsoft.Build.NoTargets": "3.5.0",
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24578.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6"
1616
}
1717
}

0 commit comments

Comments
 (0)