Skip to content

Commit 45167cf

Browse files
criemencriemen
committed
C#: Switch over dependencies in msbuild files to paket.
1 parent 04c2605 commit 45167cf

File tree

14 files changed

+36
-90
lines changed

14 files changed

+36
-90
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,9 @@
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" />
2111
</ItemGroup>
12+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2213
</Project>

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

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
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+
<Import Project="..\..\.paket\Paket.Restore.targets" />
24+
</Project>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
<ItemGroup>
1111
<Folder Include="Properties\" />
1212
</ItemGroup>
13-
<ItemGroup>
14-
<PackageReference Include="Microsoft.Build" Version="17.8.3" />
15-
</ItemGroup>
1613
<ItemGroup>
1714
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
1815
</ItemGroup>
16+
<Import Project="..\..\.paket\Paket.Restore.targets" />
1917
</Project>

‎csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
<ItemGroup>
2020
<Folder Include="Properties\" />
2121
</ItemGroup>
22-
22+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2323
</Project>

‎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
@@ -14,5 +14,5 @@
1414
<ProjectReference Include="..\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
1515
<ProjectReference Include="..\Semmle.Extraction.CSharp.StubGenerator\Semmle.Extraction.CSharp.StubGenerator.csproj" />
1616
</ItemGroup>
17-
17+
<Import Project="..\..\.paket\Paket.Restore.targets" />
1818
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<ItemGroup>
1313
<ProjectReference Include="..\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
1414
</ItemGroup>
15-
15+
<Import Project="..\..\.paket\Paket.Restore.targets" />
1616
</Project>

‎csharp/extractor/Semmle.Extraction.CSharp.Standalone/Semmle.Extraction.CSharp.Standalone.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,5 @@
1818
<ItemGroup>
1919
<Folder Include="Properties\" />
2020
</ItemGroup>
21-
<ItemGroup>
22-
<PackageReference Include="Microsoft.Build" Version="17.8.3" />
23-
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
24-
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
25-
<PackageReference Include="System.Security.Principal" Version="4.3.0" />
26-
<PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
27-
</ItemGroup>
21+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2822
</Project>

‎csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/Semmle.Extraction.CSharp.StubGenerator.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@
1212
<ProjectReference Include="..\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
1313
<ProjectReference Include="..\Semmle.Extraction.CSharp.Util\Semmle.Extraction.CSharp.Util.csproj" />
1414
</ItemGroup>
15-
<ItemGroup>
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
17-
</ItemGroup>
15+
<Import Project="..\..\.paket\Paket.Restore.targets" />
1816
</Project>

‎csharp/extractor/Semmle.Extraction.CSharp.Util/Semmle.Extraction.CSharp.Util.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,5 @@
1111
<ItemGroup>
1212
<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
1313
</ItemGroup>
14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
16-
</ItemGroup>
14+
<Import Project="..\..\.paket\Paket.Restore.targets" />
1715
</Project>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@
1616
<ItemGroup>
1717
<Folder Include="Properties\" />
1818
</ItemGroup>
19-
<ItemGroup>
20-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
21-
<PackageReference Include="Microsoft.Build" Version="17.8.3" />
22-
</ItemGroup>
19+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2320
</Project>

0 commit comments

Comments
 (0)