Skip to content

Commit fe27ec2

Browse files
committed
C#: Update extractor to use the new Runtime and SDK.
1 parent fb13873 commit fe27ec2

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup dotnet
3535
uses: actions/setup-dotnet@v4
3636
with:
37-
dotnet-version: 9.0.100
37+
dotnet-version: 9.0.304
3838

3939
- name: Checkout repository
4040
uses: actions/checkout@v5

.github/workflows/csharp-qltest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ jobs:
4343
- name: Setup dotnet
4444
uses: actions/setup-dotnet@v4
4545
with:
46-
dotnet-version: 9.0.100
46+
dotnet-version: 9.0.304
4747
- name: Extractor unit tests
4848
run: |
4949
dotnet tool restore
50-
dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Util.Tests
51-
dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Extraction.Tests
52-
dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
53-
dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
50+
dotnet test -p:RuntimeFrameworkVersion=9.0.8 extractor/Semmle.Util.Tests
51+
dotnet test -p:RuntimeFrameworkVersion=9.0.8 extractor/Semmle.Extraction.Tests
52+
dotnet test -p:RuntimeFrameworkVersion=9.0.8 autobuilder/Semmle.Autobuild.CSharp.Tests
53+
dotnet test -p:RuntimeFrameworkVersion=9.0.8 autobuilder/Semmle.Autobuild.Cpp.Tests
5454
shell: bash
5555
stubgentest:
5656
runs-on: ubuntu-latest

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2626
bazel_dep(name = "fmt", version = "10.0.0")
2727
bazel_dep(name = "rules_kotlin", version = "2.1.3-codeql.1")
2828
bazel_dep(name = "gazelle", version = "0.40.0")
29-
bazel_dep(name = "rules_dotnet", version = "0.17.4")
29+
bazel_dep(name = "rules_dotnet", version = "0.19.2")
3030
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
3131
bazel_dep(name = "rules_rust", version = "0.63.0")
3232
bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
@@ -172,7 +172,7 @@ http_archive(
172172
)
173173

174174
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
175-
dotnet.toolchain(dotnet_version = "9.0.100")
175+
dotnet.toolchain(dotnet_version = "9.0.304")
176176
use_repo(dotnet, "dotnet_toolchains")
177177

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runs:
77
- name: Setup dotnet
88
uses: actions/setup-dotnet@v4
99
with:
10-
dotnet-version: 9.0.100
10+
dotnet-version: 9.0.304
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
@@ -138,7 +138,7 @@ public IList<string> GetNugetFeedsFromFolder(string folderPath)
138138
}
139139

140140
// The version number should be kept in sync with the version .NET version used for building the application.
141-
public const string LatestDotNetSdkVersion = "9.0.100";
141+
public const string LatestDotNetSdkVersion = "9.0.304";
142142

143143
/// <summary>
144144
/// Returns a script for downloading relevant versions of the

csharp/paket.main_extension.bzl

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

csharp/scripts/create-extractor-pack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mkdir -p extractor-pack
2121
mkdir -p extractor-pack/tools/${platform}
2222

2323
function dotnet_publish {
24-
dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=9.0.0 $1 --output extractor-pack/tools/${platform}
24+
dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=9.0.8 $1 --output extractor-pack/tools/${platform}
2525
}
2626

2727
dotnet tool restore

csharp/scripts/stubs/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def make_stubs(self):
118118
bqrsFile = os.path.join(rawOutputDir, outputName + '.bqrs')
119119
jsonFile = os.path.join(rawOutputDir, outputName + '.json')
120120

121-
sdk_version = '9.0.100'
121+
sdk_version = '9.0.304'
122122
print("\n* Creating new global.json file and setting SDK to " + sdk_version)
123123
self.run_cmd(['dotnet', 'new', 'globaljson', '--force', '--sdk-version', sdk_version, '--output', self.workDir])
124124

0 commit comments

Comments
 (0)