Skip to content

Commit d5c3624

Browse files
committed
Merge remote-tracking branch 'upstream/release/9.0' into darc-release/9.0-6708c2af-77b3-4e66-ae1b-751c4738ebf5
2 parents fb50ecc + de378dd commit d5c3624

25 files changed

Lines changed: 926 additions & 440 deletions

File tree

.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": "11.0.0-prerelease.26168.1",
18+
"version": "11.0.0-prerelease.26230.4",
1919
"commands": [
2020
"xharness"
2121
]

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-b634e00" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b634e009/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 -->

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 47 additions & 48 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>9.0.16</ProductVersion>
4+
<ProductVersion>9.0.18</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>9</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>16</PatchVersion>
8+
<PatchVersion>18</PatchVersion>
99
<SdkBandVersion>9.0.100</SdkBandVersion>
1010
<PackageVersionNet8>8.0.$([MSBuild]::Add($(PatchVersion),11))</PackageVersionNet8>
1111
<PackageVersionNet7>7.0.20</PackageVersionNet7>
@@ -35,8 +35,8 @@
3535
</ItemGroup>
3636
<PropertyGroup>
3737
<!-- dotnet/roslyn-analyzers dependencies -->
38-
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.26057.1</MicrosoftCodeAnalysisAnalyzersVersion>
39-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.26057.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
38+
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.26075.3</MicrosoftCodeAnalysisAnalyzersVersion>
39+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.26075.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
4040
<!-- dotnet/roslyn dependencies -->
4141
<!--
4242
These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
@@ -146,20 +146,20 @@
146146
<SystemTextEncodingsWebToolsetVersion>8.0.0</SystemTextEncodingsWebToolsetVersion>
147147
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
148148
<!-- Runtime-Assets dependencies -->
149-
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25625.4</SystemRuntimeNumericsTestDataVersion>
150-
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25625.4</SystemComponentModelTypeConverterTestDataVersion>
151-
<SystemDataCommonTestDataVersion>9.0.0-beta.25625.4</SystemDataCommonTestDataVersion>
152-
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25625.4</SystemDrawingCommonTestDataVersion>
153-
<SystemFormatsTarTestDataVersion>9.0.0-beta.25625.4</SystemFormatsTarTestDataVersion>
154-
<SystemIOCompressionTestDataVersion>9.0.0-beta.25625.4</SystemIOCompressionTestDataVersion>
155-
<SystemIOPackagingTestDataVersion>9.0.0-beta.25625.4</SystemIOPackagingTestDataVersion>
156-
<SystemNetTestDataVersion>9.0.0-beta.25625.4</SystemNetTestDataVersion>
157-
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25625.4</SystemPrivateRuntimeUnicodeDataVersion>
158-
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25625.4</SystemRuntimeTimeZoneDataVersion>
159-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25625.4</SystemSecurityCryptographyX509CertificatesTestDataVersion>
160-
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25625.4</SystemTextRegularExpressionsTestDataVersion>
161-
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25625.4</SystemWindowsExtensionsTestDataVersion>
162-
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25625.4</MicrosoftDotNetCilStripSourcesVersion>
149+
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.26071.2</SystemRuntimeNumericsTestDataVersion>
150+
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.26071.2</SystemComponentModelTypeConverterTestDataVersion>
151+
<SystemDataCommonTestDataVersion>9.0.0-beta.26071.2</SystemDataCommonTestDataVersion>
152+
<SystemDrawingCommonTestDataVersion>9.0.0-beta.26071.2</SystemDrawingCommonTestDataVersion>
153+
<SystemFormatsTarTestDataVersion>9.0.0-beta.26071.2</SystemFormatsTarTestDataVersion>
154+
<SystemIOCompressionTestDataVersion>9.0.0-beta.26071.2</SystemIOCompressionTestDataVersion>
155+
<SystemIOPackagingTestDataVersion>9.0.0-beta.26071.2</SystemIOPackagingTestDataVersion>
156+
<SystemNetTestDataVersion>9.0.0-beta.26071.2</SystemNetTestDataVersion>
157+
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.26071.2</SystemPrivateRuntimeUnicodeDataVersion>
158+
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.26071.2</SystemRuntimeTimeZoneDataVersion>
159+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.26071.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
160+
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.26071.2</SystemTextRegularExpressionsTestDataVersion>
161+
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.26071.2</SystemWindowsExtensionsTestDataVersion>
162+
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.26071.2</MicrosoftDotNetCilStripSourcesVersion>
163163
<!-- dotnet-optimization dependencies -->
164164
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx64MIBCRuntimeVersion>
165165
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -190,9 +190,9 @@
190190
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
191191
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
192192
<!-- xharness -->
193-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>11.0.0-prerelease.26168.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
194-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>11.0.0-prerelease.26168.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
195-
<MicrosoftDotNetXHarnessCLIVersion>11.0.0-prerelease.26168.1</MicrosoftDotNetXHarnessCLIVersion>
193+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>11.0.0-prerelease.26230.4</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
194+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>11.0.0-prerelease.26230.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
195+
<MicrosoftDotNetXHarnessCLIVersion>11.0.0-prerelease.26230.4</MicrosoftDotNetXHarnessCLIVersion>
196196
<!-- hotreload-utils -->
197197
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.26152.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
198198
<NUnitVersion>3.12.0</NUnitVersion>
@@ -226,31 +226,30 @@
226226
<!-- ILCompiler -->
227227
<MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24511.16</MicrosoftDotNetILCompilerVersion>
228228
<!-- ICU -->
229-
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25627.1</MicrosoftNETCoreRuntimeICUTransportVersion>
230-
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>
229+
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.26261.1</MicrosoftNETCoreRuntimeICUTransportVersion>
231230
<!-- MsQuic -->
232-
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.17</MicrosoftNativeQuicMsQuicSchannelVersion>
231+
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.18</MicrosoftNativeQuicMsQuicSchannelVersion>
233232
<!-- Mono LLVM -->
234-
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26202.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
235-
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26202.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
236-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26202.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
237-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26202.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
238-
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26202.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
239-
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26202.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
240-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26202.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
241-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26202.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
242-
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26202.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
243-
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26202.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
244-
<runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26202.3</runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
245-
<runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26202.3</runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
246-
<runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26202.3</runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
247-
<runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26202.3</runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
233+
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26256.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
234+
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26256.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
235+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26256.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
236+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26256.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
237+
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26256.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
238+
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26256.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
239+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26256.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
240+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26256.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
241+
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26256.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
242+
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26256.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
243+
<runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26256.3</runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
244+
<runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26256.3</runtimeosxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
245+
<runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.26256.3</runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
246+
<runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.26256.3</runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
248247
<!-- emscripten / Node
249248
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
250249
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport
251250
-->
252-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.16-servicing.26221.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
253-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.16</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
251+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.17-servicing.26258.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
252+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.17</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
254253
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version)</MicrosoftNETRuntimeEmscriptenVersion>
255254
<!-- SdkVersionForWorkloadTesting is used to compute the sdk band and version for workload testing.
256255
The published manifests are built in dotnet/sdk so these values are for testing purposes only.
@@ -268,14 +267,14 @@
268267
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
269268
<WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
270269
<!-- JIT Tools -->
271-
<runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26202.3</runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
272-
<runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26202.3</runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>
273-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26202.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsVersion>
274-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26202.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsVersion>
275-
<runtimewinarm64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26202.3</runtimewinarm64MicrosoftNETCoreRuntimeJITToolsVersion>
276-
<runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26202.3</runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>
277-
<runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26202.3</runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
278-
<runtimeosxx64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26202.3</runtimeosxx64MicrosoftNETCoreRuntimeJITToolsVersion>
270+
<runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26256.3</runtimelinuxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
271+
<runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26256.3</runtimelinuxx64MicrosoftNETCoreRuntimeJITToolsVersion>
272+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26256.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeJITToolsVersion>
273+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26256.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeJITToolsVersion>
274+
<runtimewinarm64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26256.3</runtimewinarm64MicrosoftNETCoreRuntimeJITToolsVersion>
275+
<runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26256.3</runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>
276+
<runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26256.3</runtimeosxarm64MicrosoftNETCoreRuntimeJITToolsVersion>
277+
<runtimeosxx64MicrosoftNETCoreRuntimeJITToolsVersion>19.1.0-alpha.1.26256.3</runtimeosxx64MicrosoftNETCoreRuntimeJITToolsVersion>
279278
<!-- BrowserDebugProxy libs -->
280279
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
281280
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -258,22 +258,6 @@ jobs:
258258
- ${{ parameters._const_paths._always_exclude }}
259259
- ${{ parameters._const_paths._perf_pipeline_specific_only }}
260260

261-
- subset: wasmdebuggertests
262-
combined: true
263-
include:
264-
- ${{ parameters._const_paths._wasm_chrome }}
265-
- src/libraries/System.Runtime.InteropServices/*
266-
- src/libraries/System.Runtime.InteropServices.JavaScript/*
267-
- src/mono/mono/*
268-
- src/mono/browser/debugger/*
269-
- src/mono/browser/runtime/*
270-
- ${{ parameters._const_paths._wasm_src_native }}
271-
- ${{ parameters._const_paths._wasm_pipelines }}
272-
exclude:
273-
- src/mono/nuget/*
274-
- ${{ parameters._const_paths._always_exclude }}
275-
- ${{ parameters._const_paths._perf_pipeline_specific_only }}
276-
277261
# wasm/runtimetests need to be run
278262
- subset: wasm_runtimetests
279263
combined: true

eng/pipelines/common/templates/wasm-debugger-tests.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)