diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ed12617c02e2c3..85ccb51f7fa3d9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -186,57 +186,57 @@
https://github.com/dotnet/arcade
4b95fb1a9307265eb75f62d4937be50e6786e94e
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
https://github.com/dotnet/llvm-project
@@ -359,9 +359,9 @@
https://github.com/dotnet/hotreload-utils
d51568ac5594873815971cb9e3e7ee2d463a01ef
-
+
https://github.com/dotnet/runtime-assets
- 5d4912b6997bc8f15c9d75f0ec51cfd22295ef90
+ 96ec5190831f0b214f15b3a7b6aab8b8b565d820
https://github.com/dotnet/roslyn
diff --git a/eng/Versions.props b/eng/Versions.props
index 85be789a5832eb..5d32a4641b95b2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -154,20 +154,20 @@
4.5.0
8.0.0-rc.1.23406.6
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
- 8.0.0-beta.26153.1
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
+ 8.0.0-beta.26302.3
1.0.0-prerelease.23566.3
1.0.0-prerelease.23566.3
diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
index a58c7fea23ee47..6688550039601d 100644
--- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml
+++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -36,7 +36,7 @@ jobs:
# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
- - OSX.14.Arm64.Open
+ - OSX.15.Arm64.Open
# iOS/tvOS Simulator x64 & MacCatalyst x64
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
@@ -106,16 +106,16 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- - OSX.14.ARM64.Open
+ - OSX.15.ARM64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- - OSX.14.ARM64
+ - OSX.15.ARM64
# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- - OSX.14.Amd64.Open
+ - OSX.15.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- - OSX.14.Amd64
+ - OSX.15.Amd64
# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
index 0e526a82d7fc4b..4156cfbcf47e67 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
@@ -108,20 +108,21 @@ jobs:
alwaysRun: ${{ parameters.isWasmOnlyBuild }}
# Wasi - run only smoke tests by default
- - template: /eng/pipelines/common/templates/wasm-library-tests.yml
- parameters:
- platforms:
- - wasi_wasm
- - wasi_wasm_win
- nameSuffix: '_Smoke'
- extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- shouldRunSmokeOnly: true
- # ignore test failures for runtime-extra-platforms, but not when this
- # is run as part of a wasm specific pipeline like runtime-wasm
- shouldContinueOnError: ${{ not(parameters.isWasmOnlyBuild) }}
- alwaysRun: ${{ variables.isRollingBuild }}
- scenarios:
- - WasmTestOnWasmtime
+ # Disabled: https://github.com/dotnet/runtime/issues/128772
+ # - template: /eng/pipelines/common/templates/wasm-library-tests.yml
+ # parameters:
+ # platforms:
+ # - wasi_wasm
+ # - wasi_wasm_win
+ # nameSuffix: '_Smoke'
+ # extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+ # shouldRunSmokeOnly: true
+ # # ignore test failures for runtime-extra-platforms, but not when this
+ # # is run as part of a wasm specific pipeline like runtime-wasm
+ # shouldContinueOnError: ${{ not(parameters.isWasmOnlyBuild) }}
+ # alwaysRun: ${{ variables.isRollingBuild }}
+ # scenarios:
+ # - WasmTestOnWasmtime
# Hybrid Globalization tests
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
@@ -186,14 +187,15 @@ jobs:
- browser_wasm_win
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
- parameters:
- platforms:
- - wasi_wasm
- - wasi_wasm_win
- extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
- isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
+ # Disabled: https://github.com/dotnet/runtime/issues/128772
+ # - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
+ # parameters:
+ # platforms:
+ # - wasi_wasm
+ # - wasi_wasm_win
+ # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+ # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
+ # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
- template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
parameters:
@@ -209,16 +211,17 @@ jobs:
#runProfile: 'v8'
#onlySanityCheck: true
-- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeOptional, true)) }}:
- - template: /eng/pipelines/common/templates/wasm-library-tests.yml
- parameters:
- platforms:
- - wasi_wasm
- - wasi_wasm_win
- extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- # always run for wasm only pipelines
- alwaysRun: ${{ parameters.isWasmOnlyBuild }}
- isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
- isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
- scenarios:
- - normal
+# Disabled: https://github.com/dotnet/runtime/issues/128772
+# - ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeOptional, true)) }}:
+# - template: /eng/pipelines/common/templates/wasm-library-tests.yml
+# parameters:
+# platforms:
+# - wasi_wasm
+# - wasi_wasm_win
+# extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+# # always run for wasm only pipelines
+# alwaysRun: ${{ parameters.isWasmOnlyBuild }}
+# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
+# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
+# scenarios:
+# - normal
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index 6a4a5df8c12950..5d89f35c5d2b9e 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -75,11 +75,11 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- - OSX.14.ARM64.Open
+ - OSX.15.ARM64.Open
# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- - OSX.14.Amd64.Open
+ - OSX.15.Amd64.Open
# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
@@ -89,7 +89,7 @@ jobs:
# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
- - OSX.14.Arm64.Open
+ - OSX.15.Arm64.Open
# iOS/tvOS Simulator x64 & MacCatalyst x64
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 4c0dfa762c3ad3..bbca24180bc304 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -550,27 +550,28 @@ extends:
- WasmTestOnBrowser
# WASI/WASM
-
- - template: /eng/pipelines/common/templates/wasm-library-tests.yml
- parameters:
- platforms:
- - wasi_wasm
- - wasi_wasm_win
- nameSuffix: '_Smoke'
- extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- shouldContinueOnError: true
- shouldRunSmokeOnly: true
- alwaysRun: ${{ variables.isRollingBuild }}
- scenarios:
- - normal
-
- - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
- parameters:
- platforms:
- - wasi_wasm
- - wasi_wasm_win
- extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
- alwaysRun: ${{ variables.isRollingBuild }}
+ # Disabled: https://github.com/dotnet/runtime/issues/128772
+
+ # - template: /eng/pipelines/common/templates/wasm-library-tests.yml
+ # parameters:
+ # platforms:
+ # - wasi_wasm
+ # - wasi_wasm_win
+ # nameSuffix: '_Smoke'
+ # extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+ # shouldContinueOnError: true
+ # shouldRunSmokeOnly: true
+ # alwaysRun: ${{ variables.isRollingBuild }}
+ # scenarios:
+ # - normal
+
+ # - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
+ # parameters:
+ # platforms:
+ # - wasi_wasm
+ # - wasi_wasm_win
+ # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+ # alwaysRun: ${{ variables.isRollingBuild }}
#
# Android devices
diff --git a/src/coreclr/jit/optimizer.cpp b/src/coreclr/jit/optimizer.cpp
index 40d59554f3d6cf..a083c5c3a0e86e 100644
--- a/src/coreclr/jit/optimizer.cpp
+++ b/src/coreclr/jit/optimizer.cpp
@@ -7150,14 +7150,21 @@ void Compiler::optRecordLoopMemoryDependence(GenTree* tree, BasicBlock* block, V
updateLoopNum = updateParentLoopNum;
}
- // If the update block is not the header of a loop containing
- // block, we can also ignore the update.
+ // If the memory definition is part of an ancestor loop of `loopNum` then
+ // `tree` depends on memory defined in that ancestor loop. Walk up the parent
+ // chain of `updateLoopNum` looking for such an ancestor. Otherwise ignore
+ // the update.
//
- if (!optLoopContains(updateLoopNum, loopNum))
+ while ((updateLoopNum != BasicBlock::NOT_IN_LOOP) && !optLoopContains(updateLoopNum, loopNum))
{
- JITDUMP(" ==> Not updating loop memory dependence of [%06u]/" FMT_LP ", memory " FMT_VN "/" FMT_LP
- " is not defined in an enclosing loop\n",
- dspTreeID(tree), loopNum, memoryVN, updateLoopNum);
+ updateLoopNum = optLoopTable[updateLoopNum].lpParent;
+ }
+
+ if (updateLoopNum == BasicBlock::NOT_IN_LOOP)
+ {
+ JITDUMP(" ==> Not updating loop memory dependence of [%06u]/" FMT_LP ", memory " FMT_VN
+ " is not dependent on an ancestor loop\n",
+ dspTreeID(tree), loopNum, memoryVN);
return;
}
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs
index 62ae02d3aa4a4c..595b19155d6b68 100644
--- a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs
+++ b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs
@@ -10,21 +10,24 @@ public class NumberFormatInfoNumberGroupSizes
{
public static IEnumerable