Skip to content

[main] Source code updates from dotnet/dotnet#81779

Merged
dotnet-maestro[bot] merged 6 commits intomainfrom
darc-main-f67ffc25-9e81-4233-bb97-60feb8662bb4
Dec 22, 2025
Merged

[main] Source code updates from dotnet/dotnet#81779
dotnet-maestro[bot] merged 6 commits intomainfrom
darc-main-f67ffc25-9e81-4233-bb97-60feb8662bb4

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Dec 20, 2025

Note

This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Updated Dependencies

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:5661a2c0a84a3fd32916395b254ce50e5ad7e9fe..https://github.com/dotnet/roslyn:darc-main-f67ffc25-9e81-4233-bb97-60feb8662bb4

@dotnet-maestro
Copy link
Contributor Author

Caution

There are conflicts with the main branch in this PR.
Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="b19c81879fc29ed33a78f44da2501e48494f2c67" BarId="295229" />

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a comment

Choose a reason for hiding this comment

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

Auto-approve

}
```

## Warn for redundant pattern in simple `or` patterns
Copy link
Member

Choose a reason for hiding this comment

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

This seems to be reverting changes

Updated Dependencies:
System.CommandLine (Version 3.0.0-alpha.1.25618.115 -> 3.0.0-alpha.1.25619.109)
@dotnet-maestro
Copy link
Contributor Author

Caution

There are conflicts with the main branch in this PR.
Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="5661a2c0a84a3fd32916395b254ce50e5ad7e9fe" BarId="295411" />

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

public const EventTask AnalyzerAssemblyLoader = (EventTask)5;
}

private CodeAnalysisEventSource() { }
Copy link
Member

Choose a reason for hiding this comment

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

📝 This change was made in the VMR in dotnet/dotnet@3308ada.

@dotnet-maestro dotnet-maestro bot merged commit 4c540e6 into main Dec 22, 2025
35 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-f67ffc25-9e81-4233-bb97-60feb8662bb4 branch December 22, 2025 14:42
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Dec 22, 2025
@davidwengier davidwengier modified the milestones: Next, 18.3 Jan 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants