Skip to content
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

Jump to bottom

[main] Update dependencies from dotnet/roslyn #48088

Merged
merged 15 commits into from
Apr 10, 2025
Merged

[main] Update dependencies from dotnet/roslyn #48088

merged 15 commits into from
Apr 10, 2025
+134 −105

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Apr 2, 2025 •
edited
Loading

This pull request updates the following dependencies

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

@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
b101be8 
…401.19

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25201.19
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-CodeFlow untriaged Request triage from a team member labels Apr 2, 2025
@JoeRobich JoeRobich mentioned this pull request Apr 2, 2025
Open
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

dotnet-maestro bot commented Apr 2, 2025

Notification for subscribed users from https://github.com/dotnet/roslyn:

@dotnet/roslyn-infrastructure

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

  • This pull request contains changes from your source repo (https://github.com/dotnet/roslyn) and seems to have failed checks in this PR. Please take a peek at the failures and comment if they seem relevant to your changes.
  • If you're being tagged in this comment it is due to an entry in the related Maestro Subscription of the Build Asset Registry. If you feel this entry has added your GitHub login or your GitHub team in error, please update the subscription to reflect this.
  • For more details, please read the Arcade Darc documentation

@JoeRobich
Copy link
Member

@ViktorHofer I broke it. I am wondering if I need to duplicate the library's dependencies in the package project because of transitive version pinning.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
1d4bcb1 
…401.23

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25201.23
@JoeRobich
Copy link
Member

@dotnet/source-build What should I be doing differently?

@NikolaMilosavljevic
Copy link
Member

@dotnet/source-build What should I be doing differently?

Taking a look...

@NikolaMilosavljevic
Copy link
Member

@JoeRobich I'm not sure I understand the reason for adding the following packages, if they are produced in roslyn repo, i.e. https://github.com/dotnet/roslyn/blob/faabe50d9c07fdd3e46621776f56a455a3e2ad6a/eng/Directory.Packages.props#L326C5-L326C79

<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />

This was added with dotnet/roslyn#77617

Since this package is built in roslyn repo, it would make sense for source-build to consume the live package. Otherwise, what we see resolved here is a reference assembly package built in SBRP repo and that is likely not the intent.

dotnet-maestro bot added 2 commits April 4, 2025 05:02
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
214ef12 
…403.5

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25203.5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
5499067 
…404.7

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25204.7
@ViktorHofer
Copy link
Member

ViktorHofer commented Apr 6, 2025 •
edited
Loading

Before roslyn-analyzers got merged into roslyn, they were depending on the PSB (previously source built) artifacts for CodeAnalysis package dependencies. Apparently that isn't the case anymore. Any idea why?

Live would be ideal of course for source-build but I think that will take longer to support in roslyn's infra.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
bacd701 
…406.1

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25206.1
@build-analysis build-analysis bot mentioned this pull request Apr 7, 2025
Open
3 tasks
@ViktorHofer
Copy link
Member

OK, I understand the problem better now. The difference between roslyn and roslyn-analyzers here is that the former uses NuGet Central Package Management with transitive pinning enabled.

 *Microsoft.CodeAnalysis.Analyzers.Package* -> *Microsoft.CodeAnalysis.Analyzers.csproj* -> Microsoft.CodeAnalysis.Common (>= 4.14.0-3.25176.10) 
 *Microsoft.CodeAnalysis.Analyzers.Package* -> Microsoft.CodeAnalysis.Common (>= 4.1.0)

Here NuGet complains that due to the use of transitive pinning, the version 4.1.0 version is referenced by CPM, but there's a higher transitive version coming in:

(Microsoft.CodeAnalysis.Analyzers.Package.csproj -> Microsoft.CodeAnalysis.Analyzers.csproj -> Microsoft.CodeAnalysis.Common (package))

This is a bit weird. I would try disabling transitive pinning under src/RoslynAnalyzers. It didn't use that feature before so it shouldn't need it now.

@NikolaMilosavljevic
Copy link
Member

@ellahathaway

@JoeRobich
Copy link
Member

I would try disabling transitive pinning under src/RoslynAnalyzers

@ViktorHofer Just to be sure, I need to make that change in Roslyn and it'll flow in?

@NikolaMilosavljevic
Copy link
Member

I would try disabling transitive pinning under src/RoslynAnalyzers

@ViktorHofer Just to be sure, I need to make that change in Roslyn and it'll flow in?

Yes, roslyn repo flows daily, and it will update this same PR with the new changes.

@JoeRobich JoeRobich mentioned this pull request Apr 8, 2025
Merged
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
7c65076 
…407.8

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25207.8
JoeRobich added a commit to dotnet/roslyn that referenced this pull request Apr 8, 2025
@JoeRobich
Disable TransitiveVersioningPinning for RoslynAnalyzers. (#78037)
7f414bc 
Transitive pinning is breaking source-build in SDK insertions. See
dotnet/sdk#48088


Changes to MissingRulesDocumentation are automated.
dotnet-maestro bot and others added 3 commits April 8, 2025 08:16
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
1e8b39d 
…407.9

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25207.9
@ViktorHofer
Merge branch 'main' into darc-main-a33347be-45f2-4d0a-8558-17109ed677cd
a378145
@ViktorHofer
Delete src/SourceBuild/patches/roslyn/0001-Update-maintenance-package…
40646ab 
…s-versions-78005.patch
@ViktorHofer ViktorHofer requested review from a team as code owners April 8, 2025 08:37
@ViktorHofer
Copy link
Member

dotnet/roslyn#78037 (comment)

@jjonescz jjonescz mentioned this pull request Apr 9, 2025
Merged
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
eba322e 
…409.6

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25209.6
@build-analysis build-analysis bot mentioned this pull request Apr 10, 2025
Open
3 tasks
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20250…
c3fc8e7 
…409.15

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.14.0-3.25179.1 -> To Version 5.0.0-1.25209.15
@ViktorHofer ViktorHofer mentioned this pull request Apr 10, 2025
Merged
@ViktorHofer
Copy link
Member

@JoeRobich your changes worked 👍

@dotnet-maestro dotnet-maestro bot merged commit 4c96873 into main Apr 10, 2025
43 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-a33347be-45f2-4d0a-8558-17109ed677cd branch April 10, 2025 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ViktorHofer ViktorHofer ViktorHofer approved these changes

Assignees
No one assigned
Labels
Area-CodeFlow untriaged Request triage from a team member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JoeRobich @NikolaMilosavljevic @ViktorHofer