Skip to content

Commit ff23735

Browse files
agockeagocke
authored
Merge pull request #67771 from dotnet/darc-main-31d4c308-6782-4440-8589-61f58f239059
[main] Update dependencies from dotnet/arcade
2 parents 3e5517b + 9b73f24 commit ff23735

File tree

43 files changed

+409
-308
lines changed

Some content is hidden

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

43 files changed

+409
-308
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
5454
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
5555

56-
<NetCoreAppToolCurrentVersion>6.0</NetCoreAppToolCurrentVersion>
56+
<NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
5757
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
5858
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
5959

6060
<NetCoreAppLatestStableVersion>6.0</NetCoreAppLatestStableVersion>
6161
<NetCoreAppLatestStablePackageBaselineVersion>$(NetCoreAppLatestStableVersion).0</NetCoreAppLatestStablePackageBaselineVersion>
6262
<NetCoreAppLatestStable>net$(NetCoreAppLatestStableVersion)</NetCoreAppLatestStable>
6363

64-
<AspNetCoreAppCurrentVersion>6.0</AspNetCoreAppCurrentVersion>
64+
<AspNetCoreAppCurrentVersion>7.0</AspNetCoreAppCurrentVersion>
6565
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>
6666

6767
<NetFrameworkMinimum>net462</NetFrameworkMinimum>
@@ -74,9 +74,6 @@
7474
<TargetFrameworkForNETFrameworkTasks Condition="'$(DotNetBuildFromSource)' == 'true'" />
7575

7676
<TargetFrameworkForNETCoreTasks>$(NetCoreAppToolCurrent)</TargetFrameworkForNETCoreTasks>
77-
78-
<!-- TODO (#68024): remove this once we're using a 7.0 SDK -->
79-
<XHarnessTargetFramework>net6.0</XHarnessTargetFramework>
8077
</PropertyGroup>
8178

8279
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 74 additions & 74 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,22 @@
5353
<!-- SDK dependencies -->
5454
<MicrosoftDotNetCompatibilityVersion>2.0.0-alpha.1.21525.11</MicrosoftDotNetCompatibilityVersion>
5555
<!-- Arcade dependencies -->
56-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22179.1</MicrosoftDotNetApiCompatVersion>
57-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksFeedVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22179.1</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22179.1</MicrosoftDotNetGenAPIVersion>
60-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22179.1</MicrosoftDotNetGenFacadesVersion>
61-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22179.1</MicrosoftDotNetXUnitExtensionsVersion>
62-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22179.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
63-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksArchivesVersion>
64-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksInstallersVersion>
65-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksPackagingVersion>
66-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksTemplatingVersion>
68-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22179.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22179.1</MicrosoftDotNetRemoteExecutorVersion>
70-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22179.1</MicrosoftDotNetVersionToolsTasksVersion>
71-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22179.1</MicrosoftDotNetPackageTestingVersion>
56+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22255.2</MicrosoftDotNetApiCompatVersion>
57+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksFeedVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22255.2</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22255.2</MicrosoftDotNetGenAPIVersion>
60+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22255.2</MicrosoftDotNetGenFacadesVersion>
61+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22255.2</MicrosoftDotNetXUnitExtensionsVersion>
62+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22255.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
63+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksArchivesVersion>
64+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksInstallersVersion>
65+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksPackagingVersion>
66+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksTemplatingVersion>
68+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22255.2</MicrosoftDotNetRemoteExecutorVersion>
70+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22255.2</MicrosoftDotNetVersionToolsTasksVersion>
71+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22255.2</MicrosoftDotNetPackageTestingVersion>
7272
<!-- NuGet dependencies -->
7373
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7474
<!-- Installer dependencies -->
@@ -78,14 +78,14 @@
7878
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
7979
<!-- CoreClr dependencies -->
8080
<MicrosoftNETCoreILAsmVersion>7.0.0-preview.5.22226.6</MicrosoftNETCoreILAsmVersion>
81-
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
82-
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
83-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
84-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>
85-
<runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>
86-
<runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>
87-
<runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>
88-
<runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22204.1</runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>
81+
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22215.3</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
82+
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22215.3</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
83+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22215.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
84+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22215.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>
85+
<runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22215.3</runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>
86+
<runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22215.3</runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>
87+
<runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22215.3</runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>
88+
<runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22215.3</runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>
8989
<!-- Libraries dependencies -->
9090
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
9191
<MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion>
@@ -153,7 +153,7 @@
153153
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22214.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
154154
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22214.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
155155
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22214.2</MicrosoftDotNetXHarnessCLIVersion>
156-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.22178.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
156+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.22206.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
157157
<XUnitVersion>2.4.2-pre.22</XUnitVersion>
158158
<XUnitAnalyzersVersion>0.12.0-pre.20</XUnitAnalyzersVersion>
159159
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -168,21 +168,21 @@
168168
<!-- Docs -->
169169
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20220429.1</MicrosoftPrivateIntellisenseVersion>
170170
<!-- ILLink -->
171-
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22255.1</MicrosoftNETILLinkTasksVersion>
171+
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22256.1</MicrosoftNETILLinkTasksVersion>
172172
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
173173
<!-- ICU -->
174174
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-preview.4.22214.2</MicrosoftNETCoreRuntimeICUTransportVersion>
175175
<!-- MsQuic -->
176176
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22181.2</SystemNetMsQuicTransportVersion>
177177
<!-- Mono LLVM -->
178-
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22213.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
179-
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22213.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
180-
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22213.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
181-
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22213.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
182-
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22213.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
183-
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22213.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
184-
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22213.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
185-
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22213.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
178+
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22215.4</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
179+
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22215.4</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
180+
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22215.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
181+
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22215.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
182+
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22215.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
183+
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22215.4</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
184+
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22215.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
185+
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22215.4</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
186186
<!-- emscripten / Node -->
187187
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.4.22215.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
188188
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ set -e
44

55
usage()
66
{
7-
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
7+
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
88
echo "BuildArch can be: arm(default), armel, arm64, x86"
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
1010
echo " for FreeBSD can be: freebsd12, freebsd13"
1111
echo " for illumos can be: illumos."
1212
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
13+
echo "llvmx[.y] - optional, LLVM version for LLVM related packages."
1314
echo "--skipunmount - optional, will skip the unmount of rootfs folder."
1415
echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
1516
exit 1
@@ -48,6 +49,7 @@ __AlpinePackages+=" gettext-dev"
4849
__AlpinePackages+=" icu-dev"
4950
__AlpinePackages+=" libunwind-dev"
5051
__AlpinePackages+=" lttng-ust-dev"
52+
__AlpinePackages+=" compiler-rt-static"
5153

5254
# CoreFX dependencies
5355
__UbuntuPackages+=" libcurl4-openssl-dev"
@@ -164,6 +166,15 @@ while :; do
164166
no-lldb)
165167
unset __LLDB_Package
166168
;;
169+
llvm*)
170+
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
171+
parts=(${version//./ })
172+
__LLVM_MajorVersion="${parts[0]}"
173+
__LLVM_MinorVersion="${parts[1]}"
174+
if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then
175+
__LLVM_MinorVersion=0;
176+
fi
177+
;;
167178
xenial) # Ubuntu 16.04
168179
if [ "$__CodeName" != "jessie" ]; then
169180
__CodeName=xenial
@@ -261,6 +272,10 @@ if [ "$__BuildArch" == "armel" ]; then
261272
fi
262273
__UbuntuPackages+=" ${__LLDB_Package:-}"
263274

275+
if [ ! -z "$__LLVM_MajorVersion" ]; then
276+
__UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev"
277+
fi
278+
264279
if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then
265280
__RootfsDir=$ROOTFS_DIR
266281
fi

‎eng/common/dotnet-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ done
5252
# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
5353
cpuname=$(uname -m)
5454
case $cpuname in
55-
aarch64)
55+
arm64|aarch64)
5656
buildarch=arm64
5757
;;
5858
loongarch64)
@@ -64,7 +64,7 @@ case $cpuname in
6464
armv*l)
6565
buildarch=arm
6666
;;
67-
i686)
67+
i[3-6]86)
6868
buildarch=x86
6969
;;
7070
*)

0 commit comments

Comments
 (0)