[automated] Merge branch 'release/10.0.4xx' => 'main' - #55273
Merged
Conversation
…ation key Backport of #55127. Use the proper Application Insights connection string (including IngestionEndpoint, LiveEndpoint, and ApplicationId) instead of an instrumentation-key-only connection string. Resolving the endpoints from a bare instrumentation key requires an extra network round-trip; supplying the full connection string shaves 200+ms off the cost to POST telemetry. See #55127 for motivation and measurements. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 52c27b6)
…stead of instrumentation key (#55178)
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…der on shutdown (#55242) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tmat <41759+tmat@users.noreply.github.com>
[release/10.0.4xx] Source code updates from dotnet/dotnet
github-actions
Bot
requested review from
a team,
lbussell,
mthalman and
tmat
as code owners
July 14, 2026 16:46
Resolve conflicts by keeping main (ours) for the diverged dependency-flow
and Arcade-owned files, and keeping Telemetry.cs deleted (main removed it
in the OpenTelemetry migration; its AppInsights full-connection-string
intent is already present in main's Telemetry/TelemetryClient.cs):
Kept main version (ours):
NuGet.config, eng/Version.Details.props, eng/Version.Details.xml,
eng/Versions.props, global.json, and eng/common/* (Arcade-owned;
main has newer Arcade 11.0.0-beta.26363.117 vs 10.0.0-beta.26360.115)
Kept deleted (modify/delete, deleted in main):
src/Cli/dotnet/Telemetry/Telemetry.cs
Real changes flowing forward (clean auto-merge): dotnet-watch Hot Reload
refactor (RunningProjectsManager/ManagedCodeWorkspace/ProjectUpdatesBuilder,
static web asset hot reload) and related tests.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 59570d89-a7e3-4993-baa9-3fb1f442a617
dsplaisted
force-pushed
the
merge/release/10.0.4xx-to-main
branch
from
July 16, 2026 17:20
c22250e to
7a4cb23
Compare
Member
|
Note This comment was generated by GitHub Copilot (AI) on behalf of @nagilson. Retriggering CI to get a fresh signal (previous build logs have aged out of retention / to confirm whether the failures reproduce). /azp run dotnet-sdk-public-ci |
Member
|
/azp run dotnet-sdk-public-ci |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Member
|
It looks like hot reload added some tests via xunit and those tests need to be converted to the new MS Test framework. I will see if this can be resolved cc @tmat |
These two test files were added on release/10.0.4xx after main migrated Microsoft.DotNet.HotReload.Client.Tests to MSTest.Sdk (a133386), so the release/10.0.4xx -> main merge left them using xUnit attributes against an MSTest.Sdk project, breaking compilation (CS0246/CS0103) on all legs. - [Theory]/[InlineData] -> [TestMethod]/[DataRow]; [Fact] -> [TestMethod] - PlatformSpecificTheory(TestPlatforms.Windows) -> [OSCondition(OperatingSystems.Windows)] - PlatformSpecificTheory(TestPlatforms.AnyUnix) -> [OSCondition(ConditionMode.Exclude, OperatingSystems.Windows)] - Assert.Equal/NotNull/Contains/DoesNotContain -> MSTest equivalents - AssertEx.SequenceEqual -> Assert.AreSequenceEqual; ITestOutputHelper -> TestContext Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: b327c465-be4c-495a-9b57-3d96848ac577
nagilson
approved these changes
Jul 29, 2026
nagilson
enabled auto-merge
July 29, 2026 20:13
marcpopMSFT
approved these changes
Jul 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/10.0.4xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/10.0.4xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/10.0.4xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.