Skip to content

Commit 14af086

Browse files
616b2f616b2f
authored
chore: update dependencies (#23)
* chore: update dependencies * chore: use latest stable System.CommandLine package
1 parent 4b456c3 commit 14af086

7 files changed

Lines changed: 263 additions & 270 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageVersion Include="Microsoft.Build" Version="18.0.2 " />
10-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.1" />
10+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.2" />
1111
<PackageVersion Include="Microsoft.Build.Framework" Version="18.0.2" />
1212
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />
1313
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.0.2" />
1414
<PackageVersion Include="Microsoft.NET.StringTools" Version="18.0.2" />
15-
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" />
16-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
17-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
18-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
19-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
20-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.5" />
16+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.5" />
17+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
18+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.5" />
19+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
20+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.5" />
2121
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2222
<PackageVersion Include="Microsoft.TestPlatform" Version="18.0.1" />
2323
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="18.0.1" />
2424
<PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="18.0.1" />
2525
<PackageVersion Include="StreamJsonRpc" Version="2.22.23" />
26-
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24528.1" />
27-
<PackageVersion Include="System.ComponentModel.Composition" Version="10.0.0" />
26+
<PackageVersion Include="System.CommandLine" Version="2.0.5" />
27+
<PackageVersion Include="System.ComponentModel.Composition" Version="10.0.5" />
2828
<PackageVersion Include="xunit" Version="2.9.3" />
29-
<PackageVersion Include="xunit.analyzers" Version="1.25.0"/>
29+
<PackageVersion Include="xunit.analyzers" Version="1.25.0" />
3030
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
31-
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
31+
<PackageVersion Include="coverlet.collector" Version="8.0.1" />
3232
</ItemGroup>
3333
</Project>

‎nuget.config‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,5 @@
33
<packageSources>
44
<clear />
55
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
6-
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
76
</packageSources>
8-
<packageSourceMapping>
9-
<packageSource key="nuget">
10-
<package pattern="*" />
11-
</packageSource>
12-
<packageSource key="dotnet-libraries">
13-
<package pattern="System.CommandLine" />
14-
</packageSource>
15-
</packageSourceMapping>
167
</configuration>

‎src/bp/packages.lock.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
"net8.0": {
55
"Microsoft.Extensions.DependencyInjection": {
66
"type": "Direct",
7-
"requested": "[10.0.0, )",
8-
"resolved": "10.0.0",
9-
"contentHash": "f0RBabswJq+gRu5a+hWIobrLWiUYPKMhCD9WO3sYBAdSy3FFH14LMvLVFZc2kPSCimBLxSuitUhsd6tb0TAY6A==",
7+
"requested": "[10.0.5, )",
8+
"resolved": "10.0.5",
9+
"contentHash": "v1SVsowG6YE1YnHVGmLWz57YTRCQRx9pH5ebIESXfm5isI9gA3QaMyg/oMTzPpXYZwSAVDzYItGJKfmV+pqXkQ==",
1010
"dependencies": {
11-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0"
11+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5"
1212
}
1313
},
1414
"Microsoft.Extensions.Logging": {
1515
"type": "Direct",
16-
"requested": "[10.0.0, )",
17-
"resolved": "10.0.0",
18-
"contentHash": "BStFkd5CcnEtarlcgYDBcFzGYCuuNMzPs02wN3WBsOFoYIEmYoUdAiU+au6opzoqfTYJsMTW00AeqDdnXH2CvA==",
16+
"requested": "[10.0.5, )",
17+
"resolved": "10.0.5",
18+
"contentHash": "+XTMKQyDWg4ODoNHU/BN3BaI1jhGO7VCS+BnzT/4IauiG6y2iPAte7MyD7rHKS+hNP0TkFkjrae8DFjDUxtcxg==",
1919
"dependencies": {
20-
"Microsoft.Extensions.DependencyInjection": "10.0.0",
21-
"Microsoft.Extensions.Logging.Abstractions": "10.0.0",
22-
"Microsoft.Extensions.Options": "10.0.0"
20+
"Microsoft.Extensions.DependencyInjection": "10.0.5",
21+
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
22+
"Microsoft.Extensions.Options": "10.0.5"
2323
}
2424
},
2525
"StreamJsonRpc": {
@@ -52,22 +52,22 @@
5252
},
5353
"Microsoft.Extensions.DependencyInjection.Abstractions": {
5454
"type": "Transitive",
55-
"resolved": "10.0.0",
56-
"contentHash": "L3AdmZ1WOK4XXT5YFPEwyt0ep6l8lGIPs7F5OOBZc77Zqeo01Of7XXICy47628sdVl0v/owxYJTe86DTgFwKCA=="
55+
"resolved": "10.0.5",
56+
"contentHash": "iVMtq9eRvzyhx8949EGT0OCYJfXi737SbRVzWXE5GrOgGj5AaZ9eUuxA/BSUfmOMALKn/g8KfFaNQw0eiB3lyA=="
5757
},
5858
"Microsoft.Extensions.Options": {
5959
"type": "Transitive",
60-
"resolved": "10.0.0",
61-
"contentHash": "8oCAgXOow5XDrY9HaXX1QmH3ORsyZO/ANVHBlhLyCeWTH5Sg4UuqZeOTWJi6484M+LqSx0RqQXDJtdYy2BNiLQ==",
60+
"resolved": "10.0.5",
61+
"contentHash": "MDaQMdUplw0AIRhWWmbLA7yQEXaLIHb+9CTroTiNS8OlI0LMXS4LCxtopqauiqGCWlRgJ+xyraVD8t6veRAFbw==",
6262
"dependencies": {
63-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
64-
"Microsoft.Extensions.Primitives": "10.0.0"
63+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
64+
"Microsoft.Extensions.Primitives": "10.0.5"
6565
}
6666
},
6767
"Microsoft.Extensions.Primitives": {
6868
"type": "Transitive",
69-
"resolved": "10.0.0",
70-
"contentHash": "inRnbpCS0nwO/RuoZIAqxQUuyjaknOOnCEZB55KSMMjRhl0RQDttSmLSGsUJN3RQ3ocf5NDLFd2mOQViHqMK5w=="
69+
"resolved": "10.0.5",
70+
"contentHash": "/HUHJ0tw/LQvD0DZrz50eQy/3z7PfX7WWEaXnjKTV9/TNdcgFlNTZGo49QhS7PTmhDqMyHRMqAXSBxLh0vso4g=="
7171
},
7272
"Microsoft.VisualStudio.Threading.Only": {
7373
"type": "Transitive",
@@ -99,8 +99,8 @@
9999
},
100100
"System.Diagnostics.DiagnosticSource": {
101101
"type": "Transitive",
102-
"resolved": "10.0.0",
103-
"contentHash": "0KdBK+h7G13PuOSC2R/DalAoFMvdYMznvGRuICtkdcUMXgl/gYXsG6z4yUvTxHSMACorWgHCU1Faq0KUHU6yAQ=="
102+
"resolved": "10.0.5",
103+
"contentHash": "CCbzHQ26L3jskdwHh+4bxxW84lUMIrAAmeSlpO69AlrQV0DKbj1/I+feLaLSuZeqXPr9UlSy0OcgZoXOk2a6/g=="
104104
},
105105
"System.IO.Pipelines": {
106106
"type": "Transitive",
@@ -119,12 +119,12 @@
119119
},
120120
"Microsoft.Extensions.Logging.Abstractions": {
121121
"type": "CentralTransitive",
122-
"requested": "[10.0.0, )",
123-
"resolved": "10.0.0",
124-
"contentHash": "FU/IfjDfwaMuKr414SSQNTIti/69bHEMb+QKrskRb26oVqpx3lNFXMjs/RC9ZUuhBhcwDM2BwOgoMw+PZ+beqQ==",
122+
"requested": "[10.0.5, )",
123+
"resolved": "10.0.5",
124+
"contentHash": "9HOdqlDtPptVcmKAjsQ/Nr5Rxfq6FMYLdhvZh1lVmeKR738qeYecQD7+ldooXf+u2KzzR1kafSphWngIM3C6ug==",
125125
"dependencies": {
126-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
127-
"System.Diagnostics.DiagnosticSource": "10.0.0"
126+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
127+
"System.Diagnostics.DiagnosticSource": "10.0.5"
128128
}
129129
},
130130
"Microsoft.NET.StringTools": {

‎src/bsp-server/Program.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// WindowsErrorReporting.SetErrorModeOnWindows();
99

1010
var parser = CreateCommandLineParser();
11-
return await parser.Parse(args).InvokeAsync(CancellationToken.None);
11+
return await parser.Parse(args).InvokeAsync();
1212

1313
static async Task<int> RunAsync(ServerConfiguration serverConfiguration, CancellationToken cancellationToken)
1414
{
@@ -85,39 +85,41 @@ static async Task<int> RunAsync(ServerConfiguration serverConfiguration, Cancell
8585
}
8686
}
8787

88-
static CliRootCommand CreateCommandLineParser()
88+
static RootCommand CreateCommandLineParser()
8989
{
90-
var debugOption = new CliOption<bool>("--debug")
90+
var debugOption = new Option<bool>("--debug")
9191
{
9292
Description = "Flag indicating if the debugger should be launched on startup.",
9393
Required = false,
9494
DefaultValueFactory = _ => false,
9595
};
96-
var brokeredServicePipeNameOption = new CliOption<string?>("--brokeredServicePipeName")
96+
97+
var brokeredServicePipeNameOption = new Option<string?>("--brokeredServicePipeName")
9798
{
9899
Description = "The name of the pipe used to connect to a remote process (if one exists).",
99100
Required = false,
100101
};
101102

102-
var logLevelOption = new CliOption<LogLevel>("--logLevel")
103+
var logLevelOption = new Option<LogLevel>("--logLevel")
103104
{
104105
Description = "The minimum log verbosity.",
105106
Required = true,
106107
};
107108

108-
var extensionLogDirectoryOption = new CliOption<string>("--extensionLogDirectory")
109+
var extensionLogDirectoryOption = new Option<string>("--extensionLogDirectory")
109110
{
110111
Description = "The directory where we should write log files to",
111112
Required = true,
112113
};
113114

114-
var rootCommand = new CliRootCommand()
115+
var rootCommand = new RootCommand
115116
{
116117
debugOption,
117118
brokeredServicePipeNameOption,
118119
logLevelOption,
119120
extensionLogDirectoryOption
120121
};
122+
121123
rootCommand.SetAction((parseResult, cancellationToken) =>
122124
{
123125
var launchDebugger = parseResult.GetValue(debugOption);

0 commit comments

Comments
 (0)