Skip to content

Commit c9f4685

Browse files
tamasvajktamasvajk
authored
Merge pull request #16521 from tamasvajk/impr/refactor-common-csproj-prop
C#: Refactor common msbuild properties
2 parents 00a940f + c9b4e83 commit c9f4685

File tree

30 files changed

+77
-589
lines changed

30 files changed

+77
-589
lines changed

‎csharp/Directory.Build.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
6+
<Nullable>enable</Nullable>
7+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
8+
9+
<Company>GitHub</Company>
10+
<Copyright>Copyright © $([System.DateTime]::Now.Year) $(Company)</Copyright>
11+
<Version>1.0.0.0</Version>
12+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
13+
<FileVersion>1.0.0.0</FileVersion>
14+
</PropertyGroup>
15+
16+
</Project>

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
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>
3+
<ItemGroup>
4+
<ProjectReference Include="..\Semmle.Autobuild.CSharp\Semmle.Autobuild.CSharp.csproj" />
5+
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />
6+
</ItemGroup>
137
<Import Project="..\..\.paket\Paket.Restore.targets" />
14-
</Project>
8+
</Project>

‎csharp/autobuilder/Semmle.Autobuild.CSharp/Properties/AssemblyInfo.cs‎

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

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<AssemblyName>Semmle.Autobuild.CSharp</AssemblyName>
6-
<RootNamespace>Semmle.Autobuild.CSharp</RootNamespace>
7-
<ApplicationIcon />
83
<OutputType>Exe</OutputType>
9-
<StartupObject />
10-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11-
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
12-
<Nullable>enable</Nullable>
134
</PropertyGroup>
14-
<ItemGroup>
15-
<Folder Include="Properties\" />
16-
</ItemGroup>
175
<ItemGroup>
186
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
197
<ProjectReference Include="..\..\extractor\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7-
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
8-
<Nullable>enable</Nullable>
95
</PropertyGroup>
106
<ItemGroup>
117
<ProjectReference Include="..\Semmle.Autobuild.Cpp\Semmle.Autobuild.Cpp.csproj" />

‎csharp/autobuilder/Semmle.Autobuild.Cpp/Properties/AssemblyInfo.cs‎

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

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<AssemblyName>Semmle.Autobuild.Cpp</AssemblyName>
6-
<RootNamespace>Semmle.Autobuild.Cpp</RootNamespace>
7-
<ApplicationIcon />
84
<OutputType>Exe</OutputType>
9-
<StartupObject />
10-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11-
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
12-
<Nullable>enable</Nullable>
135
</PropertyGroup>
14-
<ItemGroup>
15-
<Folder Include="Properties\" />
16-
</ItemGroup>
176
<ItemGroup>
187
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
198
<ProjectReference Include="..\Semmle.Autobuild.Shared\Semmle.Autobuild.Shared.csproj" />

‎csharp/autobuilder/Semmle.Autobuild.Shared/Properties/AssemblyInfo.cs‎

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

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
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>
3+
<ItemGroup>
4+
<ProjectReference Include="..\..\extractor\Semmle.Util\Semmle.Util.csproj" />
5+
</ItemGroup>
176
<Import Project="..\..\.paket\Paket.Restore.targets" />
18-
</Project>
7+
</Project>

‎csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,4 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
4-
5-
// General Information about an assembly is controlled through the following
6-
// set of attributes. Change these attribute values to modify the information
7-
// associated with an assembly.
8-
[assembly: AssemblyTitle("Semmle.Extraction.CSharp.DependencyFetching")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("Semmle.Extraction.CSharp.DependencyFetching")]
13-
[assembly: AssemblyCopyright("Copyright © 2023")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
16-
17-
// Setting ComVisible to false makes the types in this assembly not visible
18-
// to COM components. If you need to access a type in this assembly from
19-
// COM, set the ComVisible attribute to true on that type.
20-
[assembly: ComVisible(false)]
21-
22-
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("8e902d1e-f639-4f9f-a6d2-71e8ade7c5a3")]
1+
using System.Runtime.CompilerServices;
242

253
// Expose internals for testing purposes.
264
[assembly: InternalsVisibleTo("Semmle.Extraction.Tests")]
27-
28-
// Version information for an assembly consists of the following four values:
29-
//
30-
// Major Version
31-
// Minor Version
32-
// Build Number
33-
// Revision
34-
//
35-
// You can specify all the values or you can default the Build and Revision Numbers
36-
// by using the '*' as shown below:
37-
// [assembly: AssemblyVersion("1.0.*")]
38-
[assembly: AssemblyVersion("1.0.0.0")]
39-
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)