From f317b2826a17b271b2a3208f91b321ae4148f236 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Jul 2025 02:37:19 +0000 Subject: [PATCH 1/2] [VMR] Codeflow 63bb7cb-63bb7cb [[ commit created by automation ]] --- eng/Publishing.props | 19 +++++++++++++-- .../Program.cs | 23 +++++++++---------- .../Program.cs | 2 +- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 2a0c88ef1b25c..a0e65bf332553 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -17,11 +17,14 @@ + Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' or '$(DotNetBuildSourceOnly)' == 'true' "> + <_NuGetPackagesToPush Include="@(ItemsToPushToBlobFeed)" @@ -30,13 +33,25 @@ <_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)" Condition="$([System.String]::Copy(%(FullPath)).EndsWith('.symbols.nupkg'))" /> + <_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)" + Condition="$([System.String]::Copy(%(FullPath)).Contains('.Symbols.'))" /> + + + + + + + + - + + + diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs index a0660a5fe4844..435c54303a75f 100644 --- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs +++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs @@ -32,8 +32,15 @@ WindowsErrorReporting.SetErrorModeOnWindows(); -var parser = CreateCommandLineParser(); -return await parser.Parse(args).InvokeAsync(CancellationToken.None); +var command = CreateCommand(); +var invocationConfiguration = new InvocationConfiguration() +{ + // By default, System.CommandLine will catch all exceptions, log them to the console, and return a non-zero exit code. + // Unfortunately this makes .NET's crash dump collection environment variables (e.g. 'DOTNET_DbgEnableMiniDump') + // entirely useless as it never detects an actual crash. Disable this behavior so we can collect crash dumps when asked to. + EnableDefaultExceptionHandler = false +}; +return await command.Parse(args).InvokeAsync(invocationConfiguration, CancellationToken.None); static async Task RunAsync(ServerConfiguration serverConfiguration, CancellationToken cancellationToken) { @@ -167,7 +174,7 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation } } -static CommandLineConfiguration CreateCommandLineParser() +static RootCommand CreateCommand() { var debugOption = new Option("--debug") { @@ -294,15 +301,7 @@ static CommandLineConfiguration CreateCommandLineParser() return RunAsync(serverConfiguration, cancellationToken); }); - var config = new CommandLineConfiguration(rootCommand) - { - // By default, System.CommandLine will catch all exceptions, log them to the console, and return a non-zero exit code. - // Unfortunately this makes .NET's crash dump collection environment variables (e.g. 'DOTNET_DbgEnableMiniDump') - // entirely useless as it never detects an actual crash. Disable this behavior so we can collect crash dumps when asked to. - EnableDefaultExceptionHandler = false - }; - - return config; + return rootCommand; } static (string clientPipe, string serverPipe) CreateNewPipeNames() diff --git a/src/RoslynAnalyzers/Tools/GenerateDocumentationAndConfigFiles/Program.cs b/src/RoslynAnalyzers/Tools/GenerateDocumentationAndConfigFiles/Program.cs index deae10986e16e..5d31f6a311644 100644 --- a/src/RoslynAnalyzers/Tools/GenerateDocumentationAndConfigFiles/Program.cs +++ b/src/RoslynAnalyzers/Tools/GenerateDocumentationAndConfigFiles/Program.cs @@ -257,7 +257,7 @@ public static Task Main(string[] args) return HandleAsync(commandLineArgs, cancellationToken); }); - return rootCommand.Parse(args).InvokeAsync(CancellationToken.None); + return rootCommand.Parse(args).InvokeAsync(null, CancellationToken.None); } private static async Task HandleAsync(CommandLineArgs args, CancellationToken cancellationToken) From 322747194a5ee49887aa0b5539a5b0215c4eff9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Jul 2025 02:37:21 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/dotnet build 276450 Updated Dependencies: System.CommandLine (Version 2.0.0-beta7.25372.103 -> 2.0.0-beta7.25373.104) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 356739031c8b9..68107c2ef0d67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,15 +1,15 @@ - + https://github.com/dotnet/roslyn ae1fff344d46976624e68ae17164e0607ab68b10 - + https://github.com/dotnet/dotnet - 96ac952a7886b565e83acc4c9cef656954ed0686 + c0e325f90fb79db0da6be5128dc292f2aabb264f diff --git a/eng/Versions.props b/eng/Versions.props index d2bc3734a1176..540580b3c22d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ Versions managed by Arcade (see Versions.Details.xml) --> - 2.0.0-beta7.25372.103 + 2.0.0-beta7.25373.104 9.0.0 9.0.0 9.0.0