Skip to content

Commit 7006d00

Browse files
michaelnebelmichaelnebel
authored
Merge pull request github#14892 from michaelnebel/csharp/dotnet8
C#: Use .NET 8
2 parents 4b323cd + c8542e9 commit 7006d00

File tree

117 files changed

+4905
-2118
lines changed

Some content is hidden

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

117 files changed

+4905
-2118
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: 7.0.102
33+
dotnet-version: 8.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
@@ -74,13 +74,13 @@ jobs:
7474
- name: Setup dotnet
7575
uses: actions/setup-dotnet@v4
7676
with:
77-
dotnet-version: 7.0.102
77+
dotnet-version: 8.0.100
7878
- name: Extractor unit tests
7979
run: |
80-
dotnet test -p:RuntimeFrameworkVersion=7.0.2 extractor/Semmle.Util.Tests
81-
dotnet test -p:RuntimeFrameworkVersion=7.0.2 extractor/Semmle.Extraction.Tests
82-
dotnet test -p:RuntimeFrameworkVersion=7.0.2 autobuilder/Semmle.Autobuild.CSharp.Tests
83-
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
80+
dotnet test -p:RuntimeFrameworkVersion=8.0.0 extractor/Semmle.Util.Tests
81+
dotnet test -p:RuntimeFrameworkVersion=8.0.0 extractor/Semmle.Extraction.Tests
82+
dotnet test -p:RuntimeFrameworkVersion=8.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
83+
dotnet test -p:RuntimeFrameworkVersion=8.0.0 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
8484
shell: bash
8585
stubgentest:
8686
runs-on: ubuntu-latest

‎cpp/autobuilder/Semmle.Autobuild.Cpp.Tests/Semmle.Autobuild.Cpp.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
88
<Nullable>enable</Nullable>
@@ -11,12 +11,12 @@
1111
<ItemGroup>
1212
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
1313
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
14-
<PackageReference Include="xunit" Version="2.4.2" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
14+
<PackageReference Include="xunit" Version="2.6.2" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎cpp/autobuilder/Semmle.Autobuild.Cpp/Semmle.Autobuild.Cpp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>Semmle.Autobuild.Cpp</AssemblyName>
66
<RootNamespace>Semmle.Autobuild.Cpp</RootNamespace>
77
<ApplicationIcon />
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Build" Version="17.3.2" />
20+
<PackageReference Include="Microsoft.Build" Version="17.8.3" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎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@v3
99
with:
10-
dotnet-version: 7.0.102
10+
dotnet-version: 8.0.100
1111
- name: Build Extractor
1212
shell: bash
1313
run: scripts/create-extractor-pack.sh

‎csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public void TestOr1()
327327
Assert.Equal("codeql", startCallbackIn[0]);
328328
Assert.Equal("", endCallbackIn[0]);
329329
Assert.Equal(0, endCallbackReturn[0]);
330-
Assert.Equal(1, endCallbackReturn.Count);
330+
Assert.Single(endCallbackReturn);
331331
}
332332

333333
[Fact]

‎csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/Semmle.Autobuild.CSharp.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
1010
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
11-
<PackageReference Include="xunit" Version="2.4.2" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
11+
<PackageReference Include="xunit" Version="2.6.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\Semmle.Autobuild.CSharp\Semmle.Autobuild.CSharp.csproj" />
2020
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
2121
</ItemGroup>
22-
</Project>
22+
</Project>

‎csharp/autobuilder/Semmle.Autobuild.CSharp/Semmle.Autobuild.CSharp.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<AssemblyName>Semmle.Autobuild.CSharp</AssemblyName>
55
<RootNamespace>Semmle.Autobuild.CSharp</RootNamespace>
6-
<ApplicationIcon/>
6+
<ApplicationIcon />
77
<OutputType>Exe</OutputType>
8-
<StartupObject/>
8+
<StartupObject />
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
1111
<Nullable>enable</Nullable>
@@ -14,12 +14,12 @@
1414
<Folder Include="Properties\" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Build" Version="17.3.2" />
18-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
17+
<PackageReference Include="Microsoft.Build" Version="17.8.3" />
18+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
2222
<ProjectReference Include="..\..\extractor\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
2323
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
2424
</ItemGroup>
25-
</Project>
25+
</Project>

‎csharp/autobuilder/Semmle.Autobuild.Shared/Semmle.Autobuild.Shared.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<AssemblyName>Semmle.Autobuild.Shared</AssemblyName>
55
<RootNamespace>Semmle.Autobuild.Shared</RootNamespace>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -11,9 +11,9 @@
1111
<Folder Include="Properties\" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Build" Version="17.3.2" />
14+
<PackageReference Include="Microsoft.Build" Version="17.8.3" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
1818
</ItemGroup>
19-
</Project>
19+
</Project>

‎csharp/extractor/Semmle.Extraction.CIL.Driver/Semmle.Extraction.CIL.Driver.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<AssemblyName>Semmle.Extraction.CIL.Driver</AssemblyName>
77
<RootNamespace>Semmle.Extraction.CIL.Driver</RootNamespace>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

0 commit comments

Comments
 (0)