Skip to content

Commit f2c8152

Browse files
author
Mirroring
committed
Merge commit '922bda4b04b3f9d424e33d04914168bb4b90371c'
2 parents f6f74e0 + 922bda4 commit f2c8152

22 files changed

Lines changed: 874 additions & 422 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
]

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -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.
@@ -84,22 +84,22 @@
8484
<!-- SDK dependencies (also used in wasm build tests -->
8585
<MicrosoftDotNetApiCompatTaskVersion>9.0.109</MicrosoftDotNetApiCompatTaskVersion>
8686
<!-- Arcade dependencies -->
87-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.26123.3</MicrosoftDotNetBuildTasksFeedVersion>
88-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.26123.3</MicrosoftDotNetCodeAnalysisVersion>
89-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.26123.3</MicrosoftDotNetGenAPIVersion>
90-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.26123.3</MicrosoftDotNetGenFacadesVersion>
91-
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.26123.3</MicrosoftDotNetXUnitAssertVersion>
92-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.26123.3</MicrosoftDotNetXUnitExtensionsVersion>
93-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.26123.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
94-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.26123.3</MicrosoftDotNetBuildTasksArchivesVersion>
95-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.26123.3</MicrosoftDotNetBuildTasksInstallersVersion>
96-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.26123.3</MicrosoftDotNetBuildTasksPackagingVersion>
97-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.26123.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.26123.3</MicrosoftDotNetBuildTasksTemplatingVersion>
99-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.26123.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.26123.3</MicrosoftDotNetRemoteExecutorVersion>
101-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.26123.3</MicrosoftDotNetVersionToolsTasksVersion>
102-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.26123.3</MicrosoftDotNetPackageTestingVersion>
87+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.26261.1</MicrosoftDotNetBuildTasksFeedVersion>
88+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.26261.1</MicrosoftDotNetCodeAnalysisVersion>
89+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.26261.1</MicrosoftDotNetGenAPIVersion>
90+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.26261.1</MicrosoftDotNetGenFacadesVersion>
91+
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.26261.1</MicrosoftDotNetXUnitAssertVersion>
92+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.26261.1</MicrosoftDotNetXUnitExtensionsVersion>
93+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.26261.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
94+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.26261.1</MicrosoftDotNetBuildTasksArchivesVersion>
95+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.26261.1</MicrosoftDotNetBuildTasksInstallersVersion>
96+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.26261.1</MicrosoftDotNetBuildTasksPackagingVersion>
97+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.26261.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.26261.1</MicrosoftDotNetBuildTasksTemplatingVersion>
99+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.26261.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.26261.1</MicrosoftDotNetRemoteExecutorVersion>
101+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.26261.1</MicrosoftDotNetVersionToolsTasksVersion>
102+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.26261.1</MicrosoftDotNetPackageTestingVersion>
103103
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
104104
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
105105
<!-- NuGet dependencies -->
@@ -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,8 +226,7 @@
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 -->
232231
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.18</MicrosoftNativeQuicMsQuicSchannelVersion>
233232
<!-- Mono LLVM -->

‎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.

‎eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,6 @@ jobs:
5555
runAOT: true
5656
alwaysRun: true
5757

58-
# Wasm Debugger tests - firefox
59-
- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
60-
parameters:
61-
platforms:
62-
- browser_wasm_firefox
63-
browser: firefox
64-
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
65-
## ff tests are unstable currently
66-
shouldContinueOnError: true
67-
alwaysRun: true
68-
6958
# Disabled for now
7059
#- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml
7160
#parameters:
@@ -240,42 +229,6 @@ jobs:
240229
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
241230
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
242231

243-
- ${{ if and(ne(parameters.isRollingBuild, true), or(ne(parameters.excludeNonLibTests, true), eq(parameters.debuggerTestsOnly, true))) }}:
244-
# Debugger tests
245-
- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
246-
parameters:
247-
platforms:
248-
- browser_wasm
249-
- browser_wasm_win
250-
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
251-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
252-
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
253-
254-
- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
255-
parameters:
256-
platforms:
257-
- browser_wasm_firefox
258-
browser: firefox
259-
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
260-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
261-
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
262-
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
263-
# ff tests are unstable currently
264-
shouldContinueOnError: true
265-
266-
# Active Issue https://github.com/dotnet/runtime/issues/98771
267-
# - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
268-
# parameters:
269-
# platforms:
270-
# - Browser_wasm
271-
# - Browser_wasm_win
272-
# extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
273-
# nameSuffix: DebuggerTests_MultiThreaded
274-
# alwaysRun: ${{ parameters.isWasmOnlyBuild }}
275-
# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
276-
# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
277-
# runOnlyOnWasmOnlyPipelines: true
278-
279232
# Disable for now
280233
#- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml
281234
#parameters:

‎eng/pipelines/runtime.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -907,15 +907,6 @@ extends:
907907
alwaysRun: ${{ variables.isRollingBuild }}
908908
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
909909

910-
# Wasm Debugger tests
911-
- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
912-
parameters:
913-
platforms:
914-
- browser_wasm
915-
- browser_wasm_win
916-
alwaysRun: ${{ variables.isRollingBuild }}
917-
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
918-
919910
# Wasm runtime tests
920911
- template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
921912
parameters:

‎eng/testing/tests.browser.targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,8 @@
245245
<Error Condition="'$(Scenario)' != 'WasmTestOnV8' and
246246
'$(Scenario)' != 'WasmTestOnChrome' and
247247
'$(Scenario)' != 'WasmTestOnFirefox' and
248-
'$(Scenario)' != 'WasmDebuggerTests' and
249248
'$(Scenario)' != 'BuildWasmApps'"
250-
Text="Only supported scenarios are WasmTestOnV8, WasmTestOnChrome, WasmTestOnFirefox, WasmDebuggerTests and BuildWasmApps at the moment. It was $(Scenario)." />
249+
Text="Only supported scenarios are WasmTestOnV8, WasmTestOnChrome, WasmTestOnFirefox and BuildWasmApps at the moment. It was $(Scenario)." />
251250

252251
<!-- Restore NPM packages -->
253252
<ItemGroup Condition="'$(OS)' != 'Windows_NT'">

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "9.0.113",
3+
"version": "9.0.116",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "9.0.113"
8+
"dotnet": "9.0.116"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26123.3",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26123.3",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.26123.3",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26261.1",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26261.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.26261.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"

‎src/coreclr/jit/loopcloning.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,17 +1331,17 @@ bool Compiler::optDeriveLoopCloningConditions(FlowGraphNaturalLoop* loop, LoopCl
13311331
// GT_LE loop test: (start <= end) ==> (end < arrLen)
13321332
//
13331333
// Decreasing loops
1334-
// GT_GT loop test: (end > start) ==> (end <= arrLen)
1335-
// GT_GE loop test: (end >= start) ==> (end < arrLen)
1334+
// Always check if iter var is less than array length.
13361335
genTreeOps opLimitCondition;
13371336
switch (iterInfo->TestOper())
13381337
{
13391338
case GT_LT:
1340-
case GT_GT:
1339+
13411340
opLimitCondition = GT_LE;
13421341
break;
13431342
case GT_LE:
13441343
case GT_GE:
1344+
case GT_GT:
13451345
opLimitCondition = GT_LT;
13461346
break;
13471347
default:

0 commit comments

Comments
 (0)