diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4553484ef05f73..81b9dc541bcf8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,9 +99,9 @@ badf9f97aaf4c2166b17bd6475ca73958c11e309 - + https://github.com/dotnet/source-build-reference-packages - 449148366d9105de8a6470ebc4ba198926e9a30a + 44b5b62182b48c34c4b6aef28943ec3f3e82f214 @@ -354,9 +354,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 67613417f5e1af250e6ddfba79f8f2885d8e90fb - + https://github.com/dotnet/hotreload-utils - e7e99065bbd4a7b911d5cfa56b23d873d9675355 + 6074d7872b31463f8b6741589ba543c8d80ce42d https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 71f9bd38ab0018..9f3768ffab74f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -201,7 +201,7 @@ 8.0.0-prerelease.25516.2 8.0.0-prerelease.25516.2 8.0.0-prerelease.25516.2 - 8.0.0-alpha.0.25625.3 + 8.0.0-alpha.0.26076.2 2.4.2 1.0.0 2.4.5 @@ -234,7 +234,7 @@ 8.0.0-rtm.25625.2 - 2.4.8 + 2.4.16 16.0.5-alpha.1.25311.1 16.0.5-alpha.1.25311.1 diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 3b678b14066879..5dec2f7a0cc98e 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -56,12 +56,11 @@ jobs: # iOS devices - ${{ if in(parameters.platform, 'ios_arm64') }}: - - OSX.13.Amd64.Iphone.Open + - OSX.15.Amd64.Iphone.Open # tvOS devices - ${{ if in(parameters.platform, 'tvos_arm64') }}: - - OSX.13.Amd64.AppleTV.Open - + - OSX.15.Amd64.AppleTV.Open # Linux arm - ${{ if eq(parameters.platform, 'linux_arm') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 22f7b0e5102ac5..1df5b90baf86bd 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -98,12 +98,11 @@ jobs: # iOS devices - ${{ if in(parameters.platform, 'ios_arm64') }}: - - OSX.13.Amd64.Iphone.Open + - OSX.15.Amd64.Iphone.Open # tvOS devices - ${{ if in(parameters.platform, 'tvos_arm64') }}: - - OSX.13.Amd64.AppleTV.Open - + - OSX.15.Amd64.AppleTV.Open # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: # netcoreapp diff --git a/src/mono/mono/component/hot_reload.c b/src/mono/mono/component/hot_reload.c index 2245fcb4a1578e..ce2b555438fa49 100644 --- a/src/mono/mono/component/hot_reload.c +++ b/src/mono/mono/component/hot_reload.c @@ -2574,9 +2574,11 @@ hot_reload_apply_changes (int origin, MonoImage *image_base, gconstpointer dmeta if (!assembly_update_supported (image_base, error)) { return; } - + if (dmeta_bytes == 0 && dil_bytes_orig == 0) // we may receive empty updates + { + return; + } static int first_origin = -1; - if (first_origin < 0) { first_origin = origin; }