Skip to content

Commit 95a8881

Browse files
authored
Merge pull request github#17999 from michaelnebel/csharp/net9
C#: Update to .NET9.
2 parents 2f3624b + e3990b7 commit 95a8881

File tree

242 files changed

+1311
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+1311
-1289
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup dotnet
3131
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: 8.0.101
33+
dotnet-version: 9.0.100
3434

3535
- name: Checkout repository
3636
uses: actions/checkout@v4

.github/workflows/csharp-qltest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ jobs:
3939
- name: Setup dotnet
4040
uses: actions/setup-dotnet@v4
4141
with:
42-
dotnet-version: 8.0.101
42+
dotnet-version: 9.0.100
4343
- name: Extractor unit tests
4444
run: |
4545
dotnet tool restore
46-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Util.Tests
47-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Extraction.Tests
48-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.CSharp.Tests
49-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.Cpp.Tests
46+
dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Util.Tests
47+
dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Extraction.Tests
48+
dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
49+
dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
5050
shell: bash
5151
stubgentest:
5252
runs-on: ubuntu-latest

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2525
bazel_dep(name = "fmt", version = "10.0.0")
2626
bazel_dep(name = "rules_kotlin", version = "2.0.0-codeql.1")
2727
bazel_dep(name = "gazelle", version = "0.38.0")
28-
bazel_dep(name = "rules_dotnet", version = "0.16.1")
28+
bazel_dep(name = "rules_dotnet", version = "0.17.4")
2929
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
3030
bazel_dep(name = "rules_rust", version = "0.52.2")
3131

@@ -71,7 +71,7 @@ tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_e
7171
use_repo(tree_sitter_extractors_deps, "vendor__anyhow-1.0.93", "vendor__argfile-0.2.1", "vendor__chrono-0.4.38", "vendor__clap-4.5.20", "vendor__encoding-0.2.33", "vendor__figment-0.10.19", "vendor__flate2-1.0.34", "vendor__glob-0.3.1", "vendor__globset-0.4.15", "vendor__itertools-0.10.5", "vendor__itertools-0.13.0", "vendor__lazy_static-1.5.0", "vendor__log-0.4.22", "vendor__num-traits-0.2.19", "vendor__num_cpus-1.16.0", "vendor__proc-macro2-1.0.89", "vendor__quote-1.0.37", "vendor__ra_ap_base_db-0.0.232", "vendor__ra_ap_cfg-0.0.232", "vendor__ra_ap_hir-0.0.232", "vendor__ra_ap_hir_def-0.0.232", "vendor__ra_ap_hir_expand-0.0.232", "vendor__ra_ap_ide_db-0.0.232", "vendor__ra_ap_intern-0.0.232", "vendor__ra_ap_load-cargo-0.0.232", "vendor__ra_ap_parser-0.0.232", "vendor__ra_ap_paths-0.0.232", "vendor__ra_ap_project_model-0.0.232", "vendor__ra_ap_span-0.0.232", "vendor__ra_ap_syntax-0.0.232", "vendor__ra_ap_vfs-0.0.232", "vendor__rand-0.8.5", "vendor__rayon-1.10.0", "vendor__regex-1.11.1", "vendor__serde-1.0.214", "vendor__serde_json-1.0.132", "vendor__serde_with-3.11.0", "vendor__stderrlog-0.6.0", "vendor__syn-2.0.87", "vendor__tracing-0.1.40", "vendor__tracing-subscriber-0.3.18", "vendor__tree-sitter-0.24.4", "vendor__tree-sitter-embedded-template-0.23.2", "vendor__tree-sitter-json-0.24.8", "vendor__tree-sitter-ql-0.23.1", "vendor__tree-sitter-ruby-0.23.1", "vendor__triomphe-0.1.14", "vendor__ungrammar-1.16.1")
7272

7373
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
74-
dotnet.toolchain(dotnet_version = "8.0.101")
74+
dotnet.toolchain(dotnet_version = "9.0.100")
7575
use_repo(dotnet, "dotnet_toolchains")
7676

7777
register_toolchains("@dotnet_toolchains//:all")

csharp/.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "8.0.3",
6+
"version": "9.0.1",
77
"commands": [
88
"paket"
99
]

csharp/.paket/Paket.Restore.targets

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

csharp/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
66
<Nullable>enable</Nullable>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

csharp/actions/create-extractor-pack/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ runs:
55
steps:
66
- uses: ./.github/actions/fetch-codeql
77
- name: Setup dotnet
8-
uses: actions/setup-dotnet@v3
8+
uses: actions/setup-dotnet@v4
99
with:
10-
dotnet-version: 8.0.101
10+
dotnet-version: 9.0.100
1111
- name: Build Extractor
1212
shell: bash
1313
run: scripts/create-extractor-pack.sh

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public IList<string> GetNugetFeedsFromFolder(string folderPath)
131131
}
132132

133133
// The version number should be kept in sync with the version .NET version used for building the application.
134-
public const string LatestDotNetSdkVersion = "8.0.101";
134+
public const string LatestDotNetSdkVersion = "9.0.100";
135135

136136
/// <summary>
137137
/// Returns a script for downloading relevant versions of the

csharp/extractor/Semmle.Extraction.CSharp.DependencyStubGenerator/Semmle.Extraction.CSharp.DependencyStubGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<AssemblyName>Semmle.Extraction.CSharp.DependencyStubGenerator</AssemblyName>
77
<RootNamespace>Semmle.Extraction.CSharp.DependencyStubGenerator</RootNamespace>
88
<ImplicitUsings>enable</ImplicitUsings>

csharp/extractor/Testrunner/Testrunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public int RunTests()
7171
testrunner.OnTestSkipped = OnTestSkipped;
7272

7373
Console.WriteLine("Discovering tests...");
74-
testrunner.Start(parallelAlgorithm: null);
74+
testrunner.Start();
7575

7676
Finished.WaitOne();
7777
Finished.Dispose();

0 commit comments

Comments
 (0)