Skip to content

Commit a6ce24d

Browse files
criemencriemen
committed
C#: Reformat project files with paket.
When running `dotnet paket update` or `dotnet paket install`, `paket` forcefully reformats the project files. This is unfortunate. One option is to accept these changes, as they're not harmful. They do mean that each project includes the Paket restore targets individually, instead of doing so via `Directory.Build.targets`. Another option would be to not merge this PR, and then I'll document that the changes to the csproj files should be ignored when running `paket` instead. I don't really mind either way.
1 parent 03cf9b7 commit a6ce24d

File tree

17 files changed

+174
-160
lines changed

17 files changed

+174
-160
lines changed

‎csharp/Directory.Build.targets

Lines changed: 0 additions & 3 deletions
This file was deleted.

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5-
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
6-
<Nullable>enable</Nullable>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
<ProjectReference Include="..\Semmle.Autobuild.CSharp\Semmle.Autobuild.CSharp.csproj" />
10-
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
11-
</ItemGroup>
12-
</Project>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<ProjectReference Include="..\Semmle.Autobuild.CSharp\Semmle.Autobuild.CSharp.csproj" />
11+
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
12+
</ItemGroup>
13+
<Import Project="..\..\.paket\Paket.Restore.targets" />
14+
</Project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
<ProjectReference Include="..\..\extractor\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
2121
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
2222
</ItemGroup>
23+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2324
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net8.0</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>
10-
1110
<ItemGroup>
1211
<ProjectReference Include="..\Semmle.Autobuild.Cpp\Semmle.Autobuild.Cpp.csproj" />
1312
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
1413
</ItemGroup>
15-
</Project>
14+
<Import Project="..\..\.paket\Paket.Restore.targets" />
15+
</Project>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>Semmle.Autobuild.Cpp</AssemblyName>
@@ -11,13 +11,12 @@
1111
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
1212
<Nullable>enable</Nullable>
1313
</PropertyGroup>
14-
1514
<ItemGroup>
1615
<Folder Include="Properties\" />
1716
</ItemGroup>
18-
1917
<ItemGroup>
2018
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
2119
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
2220
</ItemGroup>
23-
</Project>
21+
<Import Project="..\..\.paket\Paket.Restore.targets" />
22+
</Project>

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
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.Shared</AssemblyName>
5-
<RootNamespace>Semmle.Autobuild.Shared</RootNamespace>
6-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7-
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
8-
<Nullable>enable</Nullable>
9-
</PropertyGroup>
10-
<ItemGroup>
11-
<Folder Include="Properties\" />
12-
</ItemGroup>
13-
<ItemGroup>
14-
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
15-
</ItemGroup>
16-
</Project>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<AssemblyName>Semmle.Autobuild.Shared</AssemblyName>
6+
<RootNamespace>Semmle.Autobuild.Shared</RootNamespace>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
9+
<Nullable>enable</Nullable>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Folder Include="Properties\" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
16+
</ItemGroup>
17+
<Import Project="..\..\.paket\Paket.Restore.targets" />
18+
</Project>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>Semmle.Extraction.CSharp.DependencyFetching</AssemblyName>
@@ -10,13 +10,12 @@
1010
<Nullable>enable</Nullable>
1111
<NoWarn>$(NoWarn);CA1822</NoWarn>
1212
</PropertyGroup>
13-
1413
<ItemGroup>
1514
<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
1615
<ProjectReference Include="..\Semmle.Extraction\Semmle.Extraction.csproj" />
1716
</ItemGroup>
18-
1917
<ItemGroup>
2018
<Folder Include="Properties\" />
2119
</ItemGroup>
22-
</Project>
20+
<Import Project="..\..\.paket\Paket.Restore.targets" />
21+
</Project>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net8.0</TargetFramework>
@@ -8,10 +8,10 @@
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
</PropertyGroup>
11-
12-
<ItemGroup>
13-
<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
14-
<ProjectReference Include="..\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
15-
<ProjectReference Include="..\Semmle.Extraction.CSharp.StubGenerator\Semmle.Extraction.CSharp.StubGenerator.csproj" />
16-
</ItemGroup>
17-
</Project>
11+
<ItemGroup>
12+
<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
13+
<ProjectReference Include="..\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
14+
<ProjectReference Include="..\Semmle.Extraction.CSharp.StubGenerator\Semmle.Extraction.CSharp.StubGenerator.csproj" />
15+
</ItemGroup>
16+
<Import Project="..\..\.paket\Paket.Restore.targets" />
17+
</Project>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net8.0</TargetFramework>
@@ -8,8 +8,8 @@
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
99
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
1010
</PropertyGroup>
11-
1211
<ItemGroup>
1312
<ProjectReference Include="..\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
1413
</ItemGroup>
15-
</Project>
14+
<Import Project="..\..\.paket\Paket.Restore.targets" />
15+
</Project>

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

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<AssemblyName>Semmle.Extraction.CSharp.Standalone</AssemblyName>
6-
<RootNamespace>Semmle.Extraction.CSharp.Standalone</RootNamespace>
7-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8-
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
9-
<WarningsAsErrors />
10-
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
11-
<Nullable>enable</Nullable>
12-
</PropertyGroup>
13-
<ItemGroup>
14-
<ProjectReference Include="..\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
15-
<ProjectReference Include="..\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
16-
<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
17-
</ItemGroup>
18-
<ItemGroup>
19-
<Folder Include="Properties\" />
20-
</ItemGroup>
21-
</Project>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<AssemblyName>Semmle.Extraction.CSharp.Standalone</AssemblyName>
7+
<RootNamespace>Semmle.Extraction.CSharp.Standalone</RootNamespace>
8+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9+
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
10+
<WarningsAsErrors />
11+
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
12+
<Nullable>enable</Nullable>
13+
</PropertyGroup>
14+
<ItemGroup>
15+
<ProjectReference Include="..\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
16+
<ProjectReference Include="..\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj" />
17+
<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
18+
</ItemGroup>
19+
<ItemGroup>
20+
<Folder Include="Properties\" />
21+
</ItemGroup>
22+
<Import Project="..\..\.paket\Paket.Restore.targets" />
23+
</Project>

0 commit comments

Comments
 (0)