Skip to content

Commit 8dc9c95

Browse files
criemencriemen
authored
Merge pull request #16376 from github/criemen/dotnet-paket
C#/C++: Convert C# code to use `paket` package manager
2 parents 2dd42f7 + 74e446e commit 8dc9c95

File tree

44 files changed

+1285
-111
lines changed

Some content is hidden

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

44 files changed

+1285
-111
lines changed

‎.gitattributes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,8 @@ python/ql/lib/semmle/python/frameworks/data/internal/subclass-capture/*.yml ling
7373
# auto-generated bazel lock file
7474
ruby/extractor/cargo-bazel-lock.json linguist-generated=true
7575
ruby/extractor/cargo-bazel-lock.json -merge
76+
77+
# auto-generated files for the C# build
78+
csharp/paket.lock linguist-generated=true
79+
# needs eol=crlf, as `paket` touches this file and saves it als crlf
80+
csharp/.paket/Paket.Restore.targets linguist-generated=true eol=crlf

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ jobs:
5656
# uses a compiled language
5757

5858
- run: |
59-
dotnet build csharp
59+
cd csharp
60+
dotnet tool restore
61+
dotnet build .
6062
6163
- name: Perform CodeQL Analysis
6264
uses: github/codeql-action/analyze@main

‎.github/workflows/csharp-qltest.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,11 @@ jobs:
8181
dotnet-version: 8.0.101
8282
- name: Extractor unit tests
8383
run: |
84+
dotnet tool restore
8485
dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Util.Tests
8586
dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Extraction.Tests
8687
dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.CSharp.Tests
87-
dotnet test -p:RuntimeFrameworkVersion=8.0.1 "${{ github.workspace }}/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests"
88+
dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.Cpp.Tests
8889
shell: bash
8990
stubgentest:
9091
runs-on: ubuntu-latest

‎csharp/.config/dotnet-tools.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"paket": {
6+
"version": "8.0.3",
7+
"commands": [
8+
"paket"
9+
]
10+
}
11+
}
12+
}

‎csharp/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ csharp.log
1414
.vscode/launch.json
1515

1616
extractor/Semmle.Extraction.CSharp.Driver/Properties/launchSettings.json
17-
extractor-pack
17+
extractor-pack
18+
paket-files/

‎csharp/.paket/Paket.Restore.targets‎

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

‎csharp/Directory.Build.targets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project=".paket\Paket.Restore.targets" />
3+
</Project>

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@
55
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
8-
<ItemGroup>
9-
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
10-
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
11-
<PackageReference Include="xunit" Version="2.6.2" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
17-
</ItemGroup>
188
<ItemGroup>
199
<ProjectReference Include="..\Semmle.Autobuild.CSharp\Semmle.Autobuild.CSharp.csproj" />
2010
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />

‎csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/paket.references‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
System.IO.FileSystem
2+
xunit
3+
xunit.runner.visualstudio
4+
Microsoft.NET.Test.Sdk

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

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<AssemblyName>Semmle.Autobuild.CSharp</AssemblyName>
5-
<RootNamespace>Semmle.Autobuild.CSharp</RootNamespace>
6-
<ApplicationIcon />
7-
<OutputType>Exe</OutputType>
8-
<StartupObject />
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10-
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
11-
<Nullable>enable</Nullable>
12-
</PropertyGroup>
13-
<ItemGroup>
14-
<Folder Include="Properties\" />
15-
</ItemGroup>
16-
<ItemGroup>
17-
<PackageReference Include="Microsoft.Build" Version="17.8.3" />
18-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
22-
<ProjectReference Include="..\..\extractor\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
23-
<ProjectReference Include="..\..\extractor\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
24-
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
25-
</ItemGroup>
26-
</Project>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<AssemblyName>Semmle.Autobuild.CSharp</AssemblyName>
6+
<RootNamespace>Semmle.Autobuild.CSharp</RootNamespace>
7+
<ApplicationIcon />
8+
<OutputType>Exe</OutputType>
9+
<StartupObject />
10+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11+
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
12+
<Nullable>enable</Nullable>
13+
</PropertyGroup>
14+
<ItemGroup>
15+
<Folder Include="Properties\" />
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
19+
<ProjectReference Include="..\..\extractor\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
20+
<ProjectReference Include="..\..\extractor\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
21+
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
22+
</ItemGroup>
23+
</Project>

0 commit comments

Comments
 (0)