Skip to content

Commit 6cfd675

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#53528)
[main] Update dependencies from dotnet/arcade - Merge branch 'main' into darc-main-b53c7ee8-482a-44eb-8859-45b8b9099279 - Fix Version.Details.xml - Fix incorrect shas from manual merge. - Pass DotNetBuildSourceOnly through to repo tasks build - Pass DotNetBuildSourceOnly through to repo tasks build - Merge remote-tracking branch 'upstream/main' into darc-main-b53c7ee8-482a-44eb-8859-45b8b9099279 - Propagate some additional properties - Unpropagate some additional properties - Only add if not already added. - Only add if not already added. - Keep Duplicates=false. - Odd - New approach - More feeling - Attempt using 17,8 - Revert "Attempt using 17,8" This reverts commit 7ccf516. - Temporarily switch to VS preview queues - Merge remote-tracking branch 'upstream/main' into darc-main-b53c7ee8-482a-44eb-8859-45b8b9099279 - Revert googletest
1 parent 1641d49 commit 6cfd675

22 files changed

+173
-136
lines changed

‎.azure/pipelines/jobs/default-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ jobs:
124124
${{ if eq(parameters.agentOs, 'Windows') }}:
125125
${{ if eq(variables['System.TeamProject'], 'public') }}:
126126
name: $(DncEngPublicBuildPool)
127-
demands: ImageOverride -equals 1es-windows-2022-open
127+
demands: ImageOverride -equals windows.vs2022preview.amd64.open
128128
${{ if eq(variables['System.TeamProject'], 'internal') }}:
129129
name: $(DncEngInternalBuildPool)
130130
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
131-
demands: ImageOverride -equals 1es-windows-2022
131+
demands: ImageOverride -equals windows.vs2022preview.amd64
132132
${{ if ne(parameters.container, '') }}:
133133
container: ${{ parameters.container }}
134134
${{ if ne(parameters.disableComponentGovernance, '') }}:

‎eng/Dependencies.props

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -100,38 +100,41 @@ and are generated based on the last package release.
100100
<LatestPackageReference Include="System.ValueTuple" />
101101

102102
<!-- Runtime packages required for crossgen -->
103-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x64" />
104-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x86" />
105-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-arm" />
106-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-arm64" />
107-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.osx-x64" />
108-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.osx-arm64" />
109-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-x64" />
110-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-arm" />
111-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-arm64" />
112-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-x64" />
113-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm" />
114-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm64" />
115-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-x64" />
116-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-arm64" />
117-
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.$(TargetRuntimeIdentifier)" Condition=" '$(DotNetBuildSourceOnly)' == 'true' " />
103+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.win-x64" />
104+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.win-x86" />
105+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.win-arm" />
106+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.win-arm64" />
107+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.osx-x64" />
108+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.osx-arm64" />
109+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.linux-x64" />
110+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.linux-arm" />
111+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.linux-arm64" />
112+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-x64" />
113+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm" />
114+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm64" />
115+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-x64" />
116+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-arm64" />
117+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Runtime.$(TargetRuntimeIdentifier)" Condition=" '$(DotNetBuildSourceOnly)' == 'true'" />
118118

119119
<!-- Crossgen2 compiler -->
120-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.osx-x64" />
121-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.osx-arm64" />
122-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-arm" />
123-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-arm64" />
124-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-musl-arm" />
125-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" />
126-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-musl-x64" />
127-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-x64" />
128-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.win-x64" />
129-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.win-x86" />
130-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.win-arm" />
131-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.win-arm64" />
132-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.freebsd-x64" />
133-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.freebsd-arm64" />
134-
<LatestPackageReference Include="Microsoft.NETCore.App.Crossgen2.$(TargetRuntimeIdentifier)" Condition=" '$(DotNetBuildSourceOnly)' == 'true' " />
120+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.win-x64" />
121+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.win-x86" />
122+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.win-arm" />
123+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.win-arm64" />
124+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.osx-x64" />
125+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.osx-arm64" />
126+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-x64" />
127+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-arm" />
128+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-arm64" />
129+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-musl-x64" />
130+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-musl-arm" />
131+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" />
132+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.freebsd-x64" />
133+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.freebsd-arm64" />
134+
<_LatestRuntimePackageReference Include="Microsoft.NETCore.App.Crossgen2.$(TargetRuntimeIdentifier)" Condition=" '$(DotNetBuildSourceOnly)' == 'true' " />
135+
136+
<!-- Remove duplicates potentially introduced by the 'unknown' target runtime identifier in source-only modes. -->
137+
<LatestPackageReference Include="@(_LatestRuntimePackageReference->Distinct())" />
135138
</ItemGroup>
136139

137140
<ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildFromSource)' != 'true'">
@@ -232,6 +235,7 @@ and are generated based on the last package release.
232235
</ItemGroup>
233236

234237
<ItemGroup Label="Dependencies with versions.">
238+
235239
<!-- Get name prefixes for version properties. -->
236240
<LatestPackageReference Update="@(LatestPackageReference)">
237241
<VersionName>$([System.String]::new('%(Identity)').Replace('.',''))</VersionName>

‎eng/SourceBuild.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<InnerBuildEnv Condition="'$(FullAssemblySigningSupported)' != ''" Include="FullAssemblySigningSupported=$(FullAssemblySigningSupported)" />
4949
<InnerBuildEnv Include="DotNetBuildFromSource=$(ArcadeBuildFromSource)" />
5050
<InnerBuildEnv Include="DotNetBuildVertical=$(ArcadeBuildVertical)" />
51+
<InnerBuildEnv Include="DotNetBuildSourceOnly=$(DotNetBuildSourceOnly)" />
5152
</ItemGroup>
5253

5354
<!-- Call the build.sh script to build the repo tasks. Set IgnoreStandardErrorWarningFormat

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -383,31 +383,31 @@
383383
<Uri>https://github.com/dotnet/winforms</Uri>
384384
<Sha>dd5ae276be5f5e8c2203fd5f07bdc725a9891945</Sha>
385385
</Dependency>
386-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24062.5">
386+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24129.2">
387387
<Uri>https://github.com/dotnet/arcade</Uri>
388-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
388+
<Sha>85ae8b264f3312aac5ca08dcab039556e99fcb00</Sha>
389389
</Dependency>
390390
<!-- Intermediate is necessary for source build. -->
391-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24062.5">
391+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24129.2">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
393+
<Sha>85ae8b264f3312aac5ca08dcab039556e99fcb00</Sha>
394394
<SourceBuild RepoName="arcade" ManagedOnly="true" />
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24062.5">
396+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24129.2">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
398+
<Sha>85ae8b264f3312aac5ca08dcab039556e99fcb00</Sha>
399399
</Dependency>
400-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24062.5">
400+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24129.2">
401401
<Uri>https://github.com/dotnet/arcade</Uri>
402-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
402+
<Sha>85ae8b264f3312aac5ca08dcab039556e99fcb00</Sha>
403403
</Dependency>
404-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24062.5">
404+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24129.2">
405405
<Uri>https://github.com/dotnet/arcade</Uri>
406-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
406+
<Sha>85ae8b264f3312aac5ca08dcab039556e99fcb00</Sha>
407407
</Dependency>
408-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24062.5">
408+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24129.2">
409409
<Uri>https://github.com/dotnet/arcade</Uri>
410-
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
410+
<Sha>85ae8b264f3312aac5ca08dcab039556e99fcb00</Sha>
411411
</Dependency>
412412
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.2.24123.2">
413413
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@
159159
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
160160
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
161161
<!-- Packages from dotnet/arcade -->
162-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24062.5</MicrosoftDotNetBuildTasksInstallersVersion>
163-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24062.5</MicrosoftDotNetBuildTasksTemplatingVersion>
164-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24062.5</MicrosoftDotNetRemoteExecutorVersion>
165-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24062.5</MicrosoftSourceBuildIntermediatearcadeVersion>
162+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24129.2</MicrosoftDotNetBuildTasksInstallersVersion>
163+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24129.2</MicrosoftDotNetBuildTasksTemplatingVersion>
164+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24129.2</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24129.2</MicrosoftSourceBuildIntermediatearcadeVersion>
166166
<!-- Packages from dotnet/source-build-externals -->
167167
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24112.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168168
<!-- Packages from dotnet/source-build-reference-packages -->

‎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: 14 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,7 +238,9 @@ 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 \
243+
/p:DotNetBuildSourceOnly=$source_build \
230244
/p:ArcadeBuildVertical=$vertical_build \
231245
/p:Rebuild=$rebuild \
232246
/p:Test=$test \

‎eng/common/cross/build-rootfs.sh

Lines changed: 7 additions & 7 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"
74+
__FreeBSDBase="13.2-RELEASE"
7575
__FreeBSDPkg="1.17.0"
76-
__FreeBSDABI="12"
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)

0 commit comments

Comments
 (0)