Skip to content

Conversation

@adamsitnik
Copy link
Member

@adamsitnik adamsitnik commented Jan 28, 2025

This PR consists of #76851 (the maestro PR) and actual changes required to update S.CL.

dotnet-maestro bot and others added 4 commits January 22, 2025 05:02
…uild 20250121.2

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.607102
…uild 20250122.1

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.607201
@adamsitnik adamsitnik requested review from a team as code owners January 28, 2025 14:23
@ghost ghost added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Jan 28, 2025
@dotnet-policy-service dotnet-policy-service bot added Community The pull request was submitted by a contributor who is not a Microsoft employee. VSCode labels Jan 28, 2025
// LSP server doesn't have the pieces yet to support 'balanced' mode for source-generators. Hardcode us to
// 'automatic' for now.
var globalOptionService = exportProvider.GetExportedValue<IGlobalOptionService>();
var globalOptionService = exportProvider.GetExportedValue<Microsoft.CodeAnalysis.Options.IGlobalOptionService>();
Copy link
Member Author

Choose a reason for hiding this comment

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

After removing the Cli prefix (to make sure we don't break every single System.CommandLine user), Microsoft.CodeAnalysis.Options.Option<T> conflicts with System.CommandLine.Option<T>. I decided to remove the using Microsoft.CodeAnalysis.Options line and specify full name here as other solutions would require more changes.

@JoeRobich JoeRobich merged commit 1b6cd2a into dotnet:main Jan 28, 2025
28 checks passed
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Jan 28, 2025
@akhera99 akhera99 modified the milestones: Next, 17.14 P2 Feb 25, 2025
adamsitnik pushed a commit to adamsitnik/roslyn that referenced this pull request Apr 14, 2025
This PR consists of dotnet#76851 (the maestro PR) and actual changes required
to update S.CL.
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
ViktorHofer pushed a commit that referenced this pull request Apr 14, 2025
* Update dependencies from https://github.com/dotnet/command-line-api build 20250303.1

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.615301

* Update dependencies from https://github.com/dotnet/command-line-api build 20250317.1

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.616701

* Update dependencies from https://github.com/dotnet/command-line-api build 20250318.1

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.616801

* Update dependencies from https://github.com/dotnet/command-line-api build 20250320.1

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.617001

* Update dependencies from https://github.com/dotnet/command-line-api build 20250324.1

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.617401

* Update dependencies from https://github.com/dotnet/command-line-api build 20250408.1

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.620801

* Update dependencies from https://github.com/dotnet/command-line-api build 20250409.2

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.620902

* Update dependencies from https://github.com/dotnet/command-line-api build 20250410.1

Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine
 From Version 0.1.552801 -> To Version 0.1.621001

* System.CommandLine update (#76948)

This PR consists of #76851 (the maestro PR) and actual changes required
to update S.CL.
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props

* fix the build?

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Joey Robichaud <jorobich@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure Community The pull request was submitted by a contributor who is not a Microsoft employee. untriaged Issues and PRs which have not yet been triaged by a lead VSCode

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants