Skip to content

Merge branch 'release/8.0-staging' => 'release/8.0' (resolve conflicts) #124316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 24 commits into from
Feb 12, 2026
Merged

Merge branch 'release/8.0-staging' => 'release/8.0' (resolve conflicts) #124316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ff97795
[release/8.0] Backport improvements to Http and Ssl stress tests (#12…
MihaZupan Dec 9, 2025
2064f12
[release/8.0-staging] Use explicit versions for MSBuild properties (#…
NikolaMilosavljevic Dec 15, 2025
73ce8d6
[release/8.0-staging] Update dependencies from dotnet/icu (#122514)
dotnet-maestro[bot] Dec 22, 2025
b897411
[release/8.0-staging] Update dependencies from dotnet/hotreload-utils…
dotnet-maestro[bot] Dec 29, 2025
b4fd99d
[release/8.0-staging] Update dependencies from dotnet/runtime-assets …
dotnet-maestro[bot] Dec 29, 2025
1b2d5f6
[release/8.0-staging] Update dependencies from dotnet/icu (#122737)
dotnet-maestro[bot] Dec 29, 2025
9fcd3e7
Merge branch 'release/8.0-staging' into merge/release/8.0-to-release/…
jeffhandley Dec 29, 2025
2331020
[release/8.0-staging] Update OpenSSL dependency for openSUSE and SLES…
NikolaMilosavljevic Jan 6, 2026
40f0bb4
Merge branch 'release/8.0-staging' into merge/release/8.0-to-release/…
jeffhandley Jan 8, 2026
3380e5d
[release/8.0-staging] Add fetchTags: false to checkout steps in pipel…
Copilot Jan 8, 2026
8742c04
[release/8.0-staging] Fix analyzer crash on C# 14 extensions (#122199)
Copilot Jan 8, 2026
8e8c0c7
[release/8.0] Move default build images to macos 15 (and xcode 16) (#…
agocke Jan 12, 2026
f30b517
Merge branch 'release/8.0-staging' into merge/release/8.0-to-release/…
jeffhandley Jan 13, 2026
f0f6a8a
Revert "[release/8.0] Update dependencies from dotnet/arcade" (#122943)
jozkee Jan 7, 2026
f9b9060
[release/8.0-staging] Update dependencies from dotnet/source-build-re…
dotnet-maestro[bot] Jan 20, 2026
8136db4
[release/8.0-staging] [mono][hotreload] Ignore if we receive an empty…
github-actions[bot] Jan 29, 2026
6aaca78
[release/8.0-staging] Bump iOS & tvOS queues (#123768)
steveisok Feb 2, 2026
8991678
[release/8.0-staging] Update MsQuicSchannelVersion to 2.4.16 (#123937)
ManickaP Feb 4, 2026
2c7e757
[release/8.0-staging] Update dependencies from dotnet/hotreload-utils…
dotnet-maestro[bot] Feb 5, 2026
0221472
[automated] Merge branch 'release/8.0' => 'release/8.0-staging' (#122…
akoeplinger Feb 10, 2026
c85bfd3
[automated] Merge branch 'release/8.0' => 'release/8.0-staging' (#124…
github-actions[bot] Feb 12, 2026
1584969
Revert "[automated] Merge branch 'release/8.0' => 'release/8.0-stagin…
rbhanda Feb 12, 2026
2ff1444
Revert "[automated] Merge branch 'release/8.0' => 'release/8.0-stagin…
rbhanda Feb 12, 2026
475f999
Merge remote-tracking branch 'upstream/release/8.0-staging' into rele…
jkotas Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
<Sha>badf9f97aaf4c2166b17bd6475ca73958c11e309</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25522.3">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25615.3">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>449148366d9105de8a6470ebc4ba198926e9a30a</Sha>
<Sha>44b5b62182b48c34c4b6aef28943ec3f3e82f214</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
Expand Down Expand Up @@ -354,9 +354,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25625.3">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.26076.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>e7e99065bbd4a7b911d5cfa56b23d873d9675355</Sha>
<Sha>6074d7872b31463f8b6741589ba543c8d80ce42d</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25625.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25625.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.26076.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
Expand Down Expand Up @@ -234,7 +234,7 @@
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.25625.2</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.16</MicrosoftNativeQuicMsQuicSchannelVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.25311.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>16.0.5-alpha.1.25311.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Copilot AI Feb 12, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tvOS device queue entry is indented differently than the other conditional queue lists (extra indentation before the dash). This makes the YAML harder to read and can be error-prone in template expansions; please align the indentation with the iOS devices block above (same nesting level under the conditional).

Suggested change
- OSX.15.Amd64.AppleTV.Open
- OSX.15.Amd64.AppleTV.Open

Copilot uses AI. Check for mistakes.
# Linux arm
- ${{ if eq(parameters.platform, 'linux_arm') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/mono/mono/component/hot_reload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Copilot AI Feb 12, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The empty-update guard checks pointer values (dmeta_bytes/dil_bytes_orig) instead of the lengths. Callers like debugger-agent pass non-NULL pointers even for empty MonoArray payloads, so this condition won’t trigger and we’ll hit image_open_dmeta_from_data() with dmeta_length==0, which asserts (status != MONO_IMAGE_OK / dmeta_image == NULL). Consider guarding on dmeta_length/dil_length (and dpdb_length if relevant) and/or validating that any non-zero length has a non-NULL pointer, rather than comparing pointers to 0.

Suggested change
if (dmeta_bytes == 0 && dil_bytes_orig == 0) // we may receive empty updates
/* we may receive empty updates */
if (dmeta_length == 0 && dil_length == 0 && dpdb_length == 0)

Copilot uses AI. Check for mistakes.
{
return;
}
static int first_origin = -1;

if (first_origin < 0) {
first_origin = origin;
}
Expand Down
Loading