Skip to content

Commit ba3841c

Browse files
ViktorHoferViktorHofer
authored
Merge branch 'release/9.0.2xx' => 'main' with arcade (#45563)
2 parents cd67f10 + e3adb51 commit ba3841c

File tree

240 files changed

+2875
-750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+2875
-750
lines changed

‎eng/Version.Details.xml

+32-32
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,43 @@
9797
<Sha>5af96504f10836eca6ce804ab3cdd28c042fa35a</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.24603.5">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.24617.3">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
102+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.24603.5">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.24617.3">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
107+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.24603.5">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.24617.3">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
112+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.24603.5">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.24617.3">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
116+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.24603.5">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.24617.3">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
120+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.24603.5">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.24617.3">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
124+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.24603.5">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.24617.3">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
128+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.24603.5">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.24617.3">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
132+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.24603.5">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.24617.3">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
136+
<Sha>f9ccce030d8fdcc2ea095e095b71316d243c5b35</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24617.2">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -559,34 +559,34 @@
559559
</Dependency>
560560
</ProductDependencies>
561561
<ToolsetDependencies>
562-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24604.4">
562+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24617.2">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
564+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24604.4">
566+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24617.2">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
568+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24604.4">
570+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24617.2">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
572+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24604.4">
574+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24617.2">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
576+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24604.4">
578+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24617.2">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
580+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
581581
</Dependency>
582-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24604.4">
582+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24617.2">
583583
<Uri>https://github.com/dotnet/arcade</Uri>
584-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
584+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
585585
</Dependency>
586586
<!-- Intermediate is necessary for source build. -->
587-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24604.4">
587+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24617.2">
588588
<Uri>https://github.com/dotnet/arcade</Uri>
589-
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
589+
<Sha>4f2968fce08735a7e22fca6bd4c99d003221d716</Sha>
590590
<SourceBuild RepoName="arcade" ManagedOnly="true" />
591591
</Dependency>
592592
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24617.3">

‎eng/Versions.props

+12-12
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,14 @@
209209
</PropertyGroup>
210210
<PropertyGroup>
211211
<!-- Dependencies from https://github.com/dotnet/roslyn -->
212-
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.24603.5</MicrosoftNetCompilersToolsetVersion>
213-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.24603.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisPackageVersion>
215-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpPackageVersion>
216-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
212+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.24617.3</MicrosoftNetCompilersToolsetVersion>
213+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.24617.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214+
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.24617.3</MicrosoftCodeAnalysisPackageVersion>
215+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.24617.3</MicrosoftCodeAnalysisCSharpPackageVersion>
216+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.24617.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.24617.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.24617.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.24617.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -262,10 +262,10 @@
262262
</PropertyGroup>
263263
<PropertyGroup>
264264
<!-- Dependencies from https://github.com/dotnet/arcade -->
265-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24604.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
266-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24604.4</MicrosoftDotNetSignToolVersion>
267-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24604.4</MicrosoftDotNetXliffTasksVersion>
268-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24604.4</MicrosoftDotNetXUnitExtensionsVersion>
265+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24617.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
266+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24617.2</MicrosoftDotNetSignToolVersion>
267+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24617.2</MicrosoftDotNetXliffTasksVersion>
268+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24617.2</MicrosoftDotNetXUnitExtensionsVersion>
269269
</PropertyGroup>
270270
<PropertyGroup>
271271
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/core-templates/steps/get-delegation-sas.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,7 @@ steps:
3131
# Calculate the expiration of the SAS token and convert to UTC
3232
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3333
34-
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
35-
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
36-
$sas = ""
37-
do {
38-
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
39-
if ($LASTEXITCODE -ne 0) {
40-
Write-Error "Failed to generate SAS token."
41-
exit 1
42-
}
43-
} while($sas.IndexOf('/') -ne -1)
34+
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
4435
4536
if ($LASTEXITCODE -ne 0) {
4637
Write-Error "Failed to generate SAS token."

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

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

+7-15
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,12 @@ __UbuntuPackages+=" symlinks"
5252
__UbuntuPackages+=" libicu-dev"
5353
__UbuntuPackages+=" liblttng-ust-dev"
5454
__UbuntuPackages+=" libunwind8-dev"
55-
__UbuntuPackages+=" libnuma-dev"
5655

5756
__AlpinePackages+=" gettext-dev"
5857
__AlpinePackages+=" icu-dev"
5958
__AlpinePackages+=" libunwind-dev"
6059
__AlpinePackages+=" lttng-ust-dev"
6160
__AlpinePackages+=" compiler-rt"
62-
__AlpinePackages+=" numactl-dev"
6361

6462
# runtime libraries' dependencies
6563
__UbuntuPackages+=" libcurl4-openssl-dev"
@@ -73,8 +71,8 @@ __AlpinePackages+=" krb5-dev"
7371
__AlpinePackages+=" openssl-dev"
7472
__AlpinePackages+=" zlib-dev"
7573

76-
__FreeBSDBase="13.3-RELEASE"
77-
__FreeBSDPkg="1.17.0"
74+
__FreeBSDBase="13.4-RELEASE"
75+
__FreeBSDPkg="1.21.3"
7876
__FreeBSDABI="13"
7977
__FreeBSDPackages="libunwind"
8078
__FreeBSDPackages+=" icu"
@@ -371,7 +369,7 @@ while :; do
371369
;;
372370
freebsd14)
373371
__CodeName=freebsd
374-
__FreeBSDBase="14.0-RELEASE"
372+
__FreeBSDBase="14.2-RELEASE"
375373
__FreeBSDABI="14"
376374
__SkipUnmount=1
377375
;;
@@ -424,13 +422,12 @@ case "$__AlpineVersion" in
424422
elif [[ "$__AlpineArch" == "riscv64" ]]; then
425423
__AlpineLlvmLibsLookup=1
426424
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
425+
elif [[ -n "$__AlpineMajorVersion" ]]; then
426+
# use whichever alpine version is provided and select the latest toolchain libs
427+
__AlpineLlvmLibsLookup=1
427428
else
428429
__AlpineVersion=3.13 # 3.13 to maximize compatibility
429430
__AlpinePackages+=" llvm10-libs"
430-
431-
if [[ "$__AlpineArch" == "armv7" ]]; then
432-
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
433-
fi
434431
fi
435432
esac
436433

@@ -444,11 +441,6 @@ if [[ "$__BuildArch" == "armel" ]]; then
444441
__LLDB_Package="lldb-3.5-dev"
445442
fi
446443

447-
if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then
448-
# libnuma-dev is not available on armhf for xenial
449-
__UbuntuPackages="${__UbuntuPackages//libnuma-dev/}"
450-
fi
451-
452444
__UbuntuPackages+=" ${__LLDB_Package:-}"
453445

454446
if [[ -z "$__UbuntuRepo" ]]; then
@@ -574,7 +566,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
574566
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
575567
fi
576568
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
569+
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
578570
mkdir -p "$__RootfsDir"/tmp
579571
# get and build package manager
580572
if [[ "$__hasWget" == 1 ]]; then

0 commit comments

Comments
 (0)