Skip to content

Commit 9bd8753

Browse files
committed
Merge remote-tracking branch 'upstream/release/8.0' into darc-release/8.0-4fe19c1f-78a3-40bb-b4ed-036ab5e32fea
2 parents ed31c92 + 20950fc commit 9bd8753

83 files changed

Lines changed: 4394 additions & 856 deletions

File tree

Some content is hidden

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

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "8.0.0-prerelease.25516.2",
18+
"version": "11.0.0-prerelease.26180.1",
1919
"commands": [
2020
"xharness"
2121
]

.github/workflows/markdownlint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v6
2121
- name: Use Node.js
22-
uses: actions/setup-node@v1
22+
uses: actions/setup-node@v6
2323
with:
24-
node-version: 16.x
24+
node-version: '22.x'
2525
- name: Run Markdownlint
2626
run: |
2727
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-35ebe6f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-35ebe6f3/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-emsdk -->
1314
<!-- Begin: Package sources from dotnet-sdk -->
1415
<!-- End: Package sources from dotnet-sdk -->

docs/workflow/building/coreclr/cross-building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ docker run --rm \
155155
-v <RUNTIME_REPO_PATH>:/runtime \
156156
-w /runtime \
157157
-e ROOTFS_DIR=/crossrootfs/arm64 \
158-
mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 \
158+
mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-arm64 \
159159
./build.sh --subset clr --cross --arch arm64
160160
```
161161

docs/workflow/building/coreclr/linux-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To do cross-building using Docker, you need to use either specific images design
5353
This table of images might often become stale as we change our images as our requirements change. The images used for our official builds can be found in [the pipeline resources](/eng/pipelines/common/templates/pipeline-with-resources.yml) of our Azure DevOps builds under the `container` key of the platform you plan to build. These image tags don't include version numbers, and our build infrastructure will automatically use the latest version of the image. You can ensure you are using the latest version by using `docker pull`, for example:
5454

5555
```
56-
docker pull mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
56+
docker pull mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-arm64
5757
```
5858

5959
All official builds are cross-builds with a rootfs for the target OS, and will use the clang version available on the container.

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>8.0.26</ProductVersion>
4+
<ProductVersion>8.0.29</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>8</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>26</PatchVersion>
8+
<PatchVersion>29</PatchVersion>
99
<SdkBandVersion>8.0.100</SdkBandVersion>
1010
<PackageVersionNet7>7.0.20</PackageVersionNet7>
1111
<PackageVersionNet6>6.0.36</PackageVersionNet6>
@@ -88,21 +88,21 @@
8888
<!-- SDK dependencies -->
8989
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
9090
<!-- Arcade dependencies -->
91-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksFeedVersion>
92-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.26112.1</MicrosoftDotNetCodeAnalysisVersion>
93-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.26112.1</MicrosoftDotNetGenAPIVersion>
94-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.26112.1</MicrosoftDotNetGenFacadesVersion>
95-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.26112.1</MicrosoftDotNetXUnitExtensionsVersion>
96-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.26112.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
97-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksArchivesVersion>
98-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksInstallersVersion>
99-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksPackagingVersion>
100-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
101-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksTemplatingVersion>
102-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.26112.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
103-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.26112.1</MicrosoftDotNetRemoteExecutorVersion>
104-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.26112.1</MicrosoftDotNetVersionToolsTasksVersion>
105-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.26112.1</MicrosoftDotNetPackageTestingVersion>
91+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.26224.3</MicrosoftDotNetBuildTasksFeedVersion>
92+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.26224.3</MicrosoftDotNetCodeAnalysisVersion>
93+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.26224.3</MicrosoftDotNetGenAPIVersion>
94+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.26224.3</MicrosoftDotNetGenFacadesVersion>
95+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.26224.3</MicrosoftDotNetXUnitExtensionsVersion>
96+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.26224.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
97+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.26224.3</MicrosoftDotNetBuildTasksArchivesVersion>
98+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.26224.3</MicrosoftDotNetBuildTasksInstallersVersion>
99+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.26224.3</MicrosoftDotNetBuildTasksPackagingVersion>
100+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.26224.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
101+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.26224.3</MicrosoftDotNetBuildTasksTemplatingVersion>
102+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.26224.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
103+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.26224.3</MicrosoftDotNetRemoteExecutorVersion>
104+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.26224.3</MicrosoftDotNetVersionToolsTasksVersion>
105+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.26224.3</MicrosoftDotNetPackageTestingVersion>
106106
<!-- NuGet dependencies -->
107107
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
108108
<!-- Installer dependencies -->
@@ -154,20 +154,20 @@
154154
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
155155
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
156156
<!-- Runtime-Assets dependencies -->
157-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25625.3</SystemRuntimeNumericsTestDataVersion>
158-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25625.3</SystemComponentModelTypeConverterTestDataVersion>
159-
<SystemDataCommonTestDataVersion>8.0.0-beta.25625.3</SystemDataCommonTestDataVersion>
160-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25625.3</SystemDrawingCommonTestDataVersion>
161-
<SystemFormatsTarTestDataVersion>8.0.0-beta.25625.3</SystemFormatsTarTestDataVersion>
162-
<SystemIOCompressionTestDataVersion>8.0.0-beta.25625.3</SystemIOCompressionTestDataVersion>
163-
<SystemIOPackagingTestDataVersion>8.0.0-beta.25625.3</SystemIOPackagingTestDataVersion>
164-
<SystemNetTestDataVersion>8.0.0-beta.25625.3</SystemNetTestDataVersion>
165-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25625.3</SystemPrivateRuntimeUnicodeDataVersion>
166-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25625.3</SystemRuntimeTimeZoneDataVersion>
167-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25625.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
168-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25625.3</SystemTextRegularExpressionsTestDataVersion>
169-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25625.3</SystemWindowsExtensionsTestDataVersion>
170-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25625.3</MicrosoftDotNetCilStripSourcesVersion>
157+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.26153.1</SystemRuntimeNumericsTestDataVersion>
158+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.26153.1</SystemComponentModelTypeConverterTestDataVersion>
159+
<SystemDataCommonTestDataVersion>8.0.0-beta.26153.1</SystemDataCommonTestDataVersion>
160+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.26153.1</SystemDrawingCommonTestDataVersion>
161+
<SystemFormatsTarTestDataVersion>8.0.0-beta.26153.1</SystemFormatsTarTestDataVersion>
162+
<SystemIOCompressionTestDataVersion>8.0.0-beta.26153.1</SystemIOCompressionTestDataVersion>
163+
<SystemIOPackagingTestDataVersion>8.0.0-beta.26153.1</SystemIOPackagingTestDataVersion>
164+
<SystemNetTestDataVersion>8.0.0-beta.26153.1</SystemNetTestDataVersion>
165+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.26153.1</SystemPrivateRuntimeUnicodeDataVersion>
166+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.26153.1</SystemRuntimeTimeZoneDataVersion>
167+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.26153.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
168+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.26153.1</SystemTextRegularExpressionsTestDataVersion>
169+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.26153.1</SystemWindowsExtensionsTestDataVersion>
170+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.26153.1</MicrosoftDotNetCilStripSourcesVersion>
171171
<!-- dotnet-optimization dependencies -->
172172
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
173173
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -197,10 +197,10 @@
197197
<!-- Testing -->
198198
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
199199
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
200-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
201-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
202-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessCLIVersion>
203-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.26116.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
200+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>11.0.0-prerelease.26180.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
201+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>11.0.0-prerelease.26180.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
202+
<MicrosoftDotNetXHarnessCLIVersion>11.0.0-prerelease.26180.1</MicrosoftDotNetXHarnessCLIVersion>
203+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.26202.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
204204
<XUnitVersion>2.4.2</XUnitVersion>
205205
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
206206
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -231,9 +231,9 @@
231231
<!-- ILCompiler -->
232232
<MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23406.6</MicrosoftDotNetILCompilerVersion>
233233
<!-- ICU -->
234-
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.25625.2</MicrosoftNETCoreRuntimeICUTransportVersion>
234+
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.26256.1</MicrosoftNETCoreRuntimeICUTransportVersion>
235235
<!-- MsQuic -->
236-
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.16</MicrosoftNativeQuicMsQuicSchannelVersion>
236+
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.18</MicrosoftNativeQuicMsQuicSchannelVersion>
237237
<!-- Mono LLVM -->
238238
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.25311.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
239239
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.25311.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
@@ -253,7 +253,7 @@
253253
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
254254
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
255255
-->
256-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.26</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
256+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.28</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
257257
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
258258
<!-- SdkVersionForWorkloadTesting is used to compute the sdk band and version for workload testing.
259259
The published manifests are built in dotnet/sdk so these values are for testing purposes only.

eng/pipelines/common/evaluate-default-paths.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -212,21 +212,6 @@ jobs:
212212
exclude:
213213
- ${{ parameters._const_paths._always_exclude }}
214214

215-
- subset: wasmdebuggertests
216-
combined: true
217-
include:
218-
- eng/testing/ProvisioningVersions.props
219-
- src/libraries/System.Runtime.InteropServices/*
220-
- src/libraries/System.Runtime.InteropServices.JavaScript/*
221-
- src/mono/mono/*
222-
- src/mono/wasm/debugger/*
223-
- src/mono/wasm/runtime/*
224-
- ${{ parameters._const_paths._wasm_src_native }}
225-
- ${{ parameters._const_paths._wasm_pipelines }}
226-
exclude:
227-
- src/mono/nuget/*
228-
- ${{ parameters._const_paths._always_exclude }}
229-
230215
# wasm/runtimetests need to be run
231216
- subset: wasm_runtimetests
232217
combined: true

eng/pipelines/common/platform-matrix.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,6 @@ jobs:
4444
crossBuild: true
4545
${{ insert }}: ${{ parameters.jobParameters }}
4646

47-
# Linux armv6
48-
- ${{ if containsValue(parameters.platforms, 'linux_armv6') }}:
49-
- template: xplat-setup.yml
50-
parameters:
51-
jobTemplate: ${{ parameters.jobTemplate }}
52-
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
53-
variables: ${{ parameters.variables }}
54-
osGroup: linux
55-
archType: armv6
56-
targetRid: linux-armv6
57-
platform: linux_armv6
58-
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
59-
container: linux_armv6
60-
jobParameters:
61-
runtimeFlavor: ${{ parameters.runtimeFlavor }}
62-
buildConfig: ${{ parameters.buildConfig }}
63-
helixQueueGroup: ${{ parameters.helixQueueGroup }}
64-
crossBuild: true
65-
${{ insert }}: ${{ parameters.jobParameters }}
66-
6747
# Linux arm64
6848

6949
- ${{ if or(containsValue(parameters.platforms, 'linux_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:

eng/pipelines/common/templates/pipeline-with-resources.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ extends:
2121
env:
2222
ROOTFS_DIR: /crossrootfs/arm
2323

24-
linux_armv6:
25-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10
26-
env:
27-
ROOTFS_DIR: /crossrootfs/armv6
28-
2924
linux_arm64:
3025
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-arm64
3126
env:

0 commit comments

Comments
 (0)