Skip to content

Commit 4c44e92

Browse files
dotnet-maestro[bot]ericstj
dotnet-maestro[bot]
and
ericstj
authored
[main] Update dependencies from dotnet/arcade (#6969)
* Update dependencies from https://github.com/dotnet/arcade build 20240119.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24062.5 -> To Version 9.0.0-beta.24069.2 * Prefer XUnitVersion property from arcade --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eric StJohn <[email protected]>
1 parent 54fa44f commit 4c44e92

File tree

9 files changed

+44
-28
lines changed

9 files changed

+44
-28
lines changed

‎eng/Version.Details.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24062.5">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24069.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
12+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24062.5">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24069.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
16+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24062.5">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24069.2">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
20+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24062.5">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24069.2">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
24+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24062.5">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24069.2">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
28+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3131
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -39,9 +39,9 @@
3939
<Uri>https://github.com/dotnet/xharness</Uri>
4040
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24062.5">
42+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24069.2">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
44+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
4545
</Dependency>
4646
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
4747
<Uri>https://github.com/dotnet/roslyn</Uri>
@@ -63,9 +63,9 @@
6363
<Uri>https://github.com/dotnet/symreader-converter</Uri>
6464
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24062.5">
66+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24069.2">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
68+
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
6969
</Dependency>
7070
</ToolsetDependencies>
7171
</Dependencies>

‎eng/Versions.props

+1-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
8282
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8383
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
84-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24062.5</MicrosoftDotNetXUnitExtensionsVersion>
84+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24069.2</MicrosoftDotNetXUnitExtensionsVersion>
8585
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8686
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8787
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
@@ -91,7 +91,6 @@
9191
<SystemDataSqlClientVersion>4.8.5</SystemDataSqlClientVersion>
9292
<SystemDataSQLiteCoreVersion>1.0.118</SystemDataSQLiteCoreVersion>
9393
<XunitCombinatorialVersion>1.2.7</XunitCombinatorialVersion>
94-
<XUnitVersion>2.6.3</XUnitVersion>
9594
<!-- Opt-out repo features -->
9695
<UsingToolXliff>false</UsingToolXliff>
9796
</PropertyGroup>

‎eng/common/build.ps1

+3
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

+13
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

+8-8
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/post-build/common-variables.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variables:
1818
- name: SymbolToolVersion
1919
value: 1.0.1
2020
- name: BinlogToolVersion
21-
value: 1.0.9
21+
value: 1.0.11
2222

2323
- name: runCodesignValidationInjection
2424
value: false

‎eng/common/templates/steps/publish-logs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
JobLabel: ''
44
CustomSensitiveDataList: ''
55
# A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed
6-
BinlogToolVersion: '1.0.9'
6+
BinlogToolVersion: '1.0.11'
77

88
steps:
99
- task: Powershell@2

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

+1
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24062.5",
17-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24062.5",
16+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24069.2",
17+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24069.2",
1818
"Microsoft.Build.Traversal": "3.2.0",
1919
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
2020
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"

0 commit comments

Comments
 (0)