Skip to content

Commit ce2c149

Browse files
authored
Merge pull request #20996 from michaelnebel/csharp/updateroslyn
C#: Update Roslyn, MsBuild and Binlog extractor dependencies.
2 parents 004dfbd + 24417cf commit ce2c149

File tree

14 files changed

+80
-92
lines changed

14 files changed

+80
-92
lines changed

csharp/.vscode/launch.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "dotnet: build",
9-
"program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Standalone/bin/Debug/net9.0/Semmle.Extraction.CSharp.Standalone.dll",
9+
"program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Standalone/bin/Debug/net10.0/Semmle.Extraction.CSharp.Standalone.dll",
1010
"args": [],
1111
// Set the path to the folder that should be extracted:
1212
"cwd": "${workspaceFolder}/ql/test/library-tests/standalone/standalonemode",
@@ -35,7 +35,7 @@
3535
"type": "coreclr",
3636
"request": "launch",
3737
"preLaunchTask": "dotnet: build",
38-
"program": "${workspaceFolder}/autobuilder/Semmle.Autobuild.CSharp/bin/Debug/net9.0/Semmle.Autobuild.CSharp.dll",
38+
"program": "${workspaceFolder}/autobuilder/Semmle.Autobuild.CSharp/bin/Debug/net10.0/Semmle.Autobuild.CSharp.dll",
3939
// Set the path to the folder that should be extracted:
4040
"cwd": "${workspaceFolder}/ql/integration-tests/all-platforms/autobuild",
4141
"stopAtEntry": true,
@@ -53,7 +53,7 @@
5353
"type": "coreclr",
5454
"request": "launch",
5555
"preLaunchTask": "dotnet: build",
56-
"program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Driver/bin/Debug/net9.0/Semmle.Extraction.CSharp.Driver.dll",
56+
"program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Driver/bin/Debug/net10.0/Semmle.Extraction.CSharp.Driver.dll",
5757
"stopAtEntry": true,
5858
"args": [
5959
"--binlog",
@@ -66,7 +66,7 @@
6666
"type": "coreclr",
6767
"request": "launch",
6868
"preLaunchTask": "dotnet: build",
69-
"program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Driver/bin/Debug/net9.0/Semmle.Extraction.CSharp.Driver.dll",
69+
"program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Driver/bin/Debug/net10.0/Semmle.Extraction.CSharp.Driver.dll",
7070
// Set the path to the folder that should be extracted:
7171
"cwd": "${workspaceFolder}/ql/test/library-tests/dataflow/local",
7272
"args": [

csharp/paket.dependencies

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ source https://api.nuget.org/v3/index.json
44
# behave like nuget in choosing transitive dependency versions
55
strategy: max
66

7-
nuget Basic.CompilerLog.Util 0.9.21
7+
nuget Basic.CompilerLog.Util 0.9.25
88
nuget Mono.Posix.NETStandard
99
nuget Newtonsoft.Json
1010
nuget NuGet.Versioning
1111
nuget xunit
1212
nuget xunit.runner.visualstudio
1313
nuget xunit.runner.utility
1414
nuget Microsoft.NET.Test.Sdk
15-
nuget Microsoft.CodeAnalysis.CSharp 4.14.0
16-
nuget Microsoft.CodeAnalysis 4.14.0
17-
nuget Microsoft.Build 17.14.28
15+
nuget Microsoft.CodeAnalysis.CSharp 5.0.0
16+
nuget Microsoft.CodeAnalysis 5.0.0
17+
nuget Microsoft.Build 18.0.2

csharp/paket.lock

Lines changed: 31 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)