Skip to content

Commit a392d3e

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240119.2 (#871)
Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24066.3 -> To Version 9.0.0-beta.24069.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b2be1e5 commit a392d3e

File tree

6 files changed

+28
-11
lines changed

6 files changed

+28
-11
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<Sha>5f670e45d060b25d5b07646dfcd94eae31893191</Sha>
1212
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24066.3">
14+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24069.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>d5ee27a55ec6383c29790f3ec666e7c87f7da022</Sha>
16+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
1717
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1818
</Dependency>
1919
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="9.0.100-alpha.1.24072.1">

eng/common/build.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Param(
2020
[switch] $publish,
2121
[switch] $clean,
2222
[switch] $verticalBuild,
23+
[switch][Alias('pb')]$productBuild,
2324
[switch][Alias('bl')]$binaryLog,
2425
[switch][Alias('nobl')]$excludeCIBinarylog,
2526
[switch] $ci,
@@ -60,6 +61,7 @@ function Print-Usage() {
6061
Write-Host " -publish Publish artifacts (e.g. symbols)"
6162
Write-Host " -clean Clean the solution"
6263
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
64+
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
6365
Write-Host ""
6466

6567
Write-Host "Advanced settings:"
@@ -122,6 +124,7 @@ function Build {
122124
/p:Deploy=$deploy `
123125
/p:Test=$test `
124126
/p:Pack=$pack `
127+
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
125128
/p:ArcadeBuildVertical=$verticalBuild `
126129
/p:IntegrationTest=$integrationTest `
127130
/p:PerformanceTest=$performanceTest `

eng/common/build.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ usage()
2222
echo " --sourceBuild Source-build the solution (short: -sb)"
2323
echo " Will additionally trigger the following actions: --restore, --build, --pack"
2424
echo " If --configuration is not set explicitly, will also set it to 'Release'"
25+
echo " --productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
26+
echo " Will additionally trigger the following actions: --restore, --build, --pack"
27+
echo " If --configuration is not set explicitly, will also set it to 'Release'"
2528
echo " --rebuild Rebuild solution"
2629
echo " --test Run all unit tests in the solution (short: -t)"
2730
echo " --integrationTest Run all integration tests in the solution"
@@ -60,6 +63,7 @@ restore=false
6063
build=false
6164
source_build=false
6265
vertical_build=false
66+
product_build=false
6367
rebuild=false
6468
test=false
6569
integration_test=false
@@ -127,12 +131,20 @@ while [[ $# > 0 ]]; do
127131
-sourcebuild|-sb)
128132
build=true
129133
source_build=true
134+
product_build=true
135+
restore=true
136+
pack=true
137+
;;
138+
-productBuild|-pb)
139+
build=true
140+
product_build=true
130141
restore=true
131142
pack=true
132143
;;
133144
-verticalbuild|-vb)
134145
build=true
135146
vertical_build=true
147+
product_build=true
136148
restore=true
137149
pack=true
138150
;;
@@ -226,6 +238,7 @@ function Build {
226238
/p:RepoRoot="$repo_root" \
227239
/p:Restore=$restore \
228240
/p:Build=$build \
241+
/p:DotNetBuildRepo=$product_build \
229242
/p:ArcadeBuildFromSource=$source_build \
230243
/p:ArcadeBuildVertical=$vertical_build \
231244
/p:Rebuild=$rebuild \

eng/common/cross/build-rootfs.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ usage()
88
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
1010
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
11-
echo " for FreeBSD can be: freebsd12, freebsd13"
11+
echo " for FreeBSD can be: freebsd13, freebsd14"
1212
echo " for illumos can be: illumos"
1313
echo " for Haiku can be: haiku."
1414
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
@@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev"
7171
__AlpinePackages+=" openssl-dev"
7272
__AlpinePackages+=" zlib-dev"
7373

74-
__FreeBSDBase="12.4-RELEASE"
75-
__FreeBSDPkg="1.17.0"
76-
__FreeBSDABI="12"
74+
__FreeBSDBase="13.2-RELEASE"
75+
__FreeBSDPkg="1.20.0"
76+
__FreeBSDABI="13"
7777
__FreeBSDPackages="libunwind"
7878
__FreeBSDPackages+=" icu"
7979
__FreeBSDPackages+=" libinotify"
@@ -334,14 +334,14 @@ while :; do
334334
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
335335
fi
336336
;;
337-
freebsd12)
337+
freebsd13)
338338
__CodeName=freebsd
339339
__SkipUnmount=1
340340
;;
341-
freebsd13)
341+
freebsd14)
342342
__CodeName=freebsd
343-
__FreeBSDBase="13.2-RELEASE"
344-
__FreeBSDABI="13"
343+
__FreeBSDBase="14.0-RELEASE"
344+
__FreeBSDABI="14"
345345
__SkipUnmount=1
346346
;;
347347
illumos)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ steps:
9494
$baseOsArgs \
9595
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
9696
/p:ArcadeBuildFromSource=true \
97+
/p:DotNetBuildRepo=true \
9798
/p:AssetManifestFileName=$assetManifestFileName
9899
displayName: Build
99100

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "9.0.100-alpha.1.23615.4"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24066.3",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24069.2",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

0 commit comments

Comments
 (0)