Skip to content

Commit 19652e4

Browse files
committed
(split from main repo) Convert projects to SDK-style
* Convert all primary C# projects (i.e. not externals) to SDK-style * Remove all excluded files
1 parent 46f8cad commit 19652e4

File tree

2 files changed

+20
-74
lines changed

2 files changed

+20
-74
lines changed

GerritTests.csproj

Lines changed: 15 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6-
</PropertyGroup>
7-
<PropertyGroup>
8-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
9-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
10-
<ProjectGuid>{02A5CF27-302A-48FA-9FFD-E9A2C341FAE3}</ProjectGuid>
11-
<OutputType>Library</OutputType>
12-
<AppDesignerFolder>Properties</AppDesignerFolder>
13-
<RootNamespace>GerritTests</RootNamespace>
14-
<AssemblyName>GerritTests</AssemblyName>
15-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
16-
<RuntimeIdentifier>win</RuntimeIdentifier>
17-
<FileAlignment>512</FileAlignment>
18-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
19-
<TestProjectType>UnitTest</TestProjectType>
20-
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22-
<DebugSymbols>true</DebugSymbols>
23-
<DebugType>full</DebugType>
24-
<Optimize>false</Optimize>
25-
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>DEBUG;TRACE</DefineConstants>
27-
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
29-
<CodeAnalysisRuleSet>..\..\..\GitExtensionsTest.ruleset</CodeAnalysisRuleSet>
30-
<DocumentationFile>bin\Debug\GerritTests.xml</DocumentationFile>
31-
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33-
<DebugType>pdbonly</DebugType>
34-
<Optimize>true</Optimize>
35-
<OutputPath>bin\Release\</OutputPath>
36-
<DefineConstants>TRACE</DefineConstants>
37-
<ErrorReport>prompt</ErrorReport>
38-
<WarningLevel>4</WarningLevel>
3+
<TargetFramework>net461</TargetFramework>
394
<CodeAnalysisRuleSet>..\..\..\GitExtensionsTest.ruleset</CodeAnalysisRuleSet>
40-
<DocumentationFile>bin\Release\GerritTests.xml</DocumentationFile>
5+
6+
<!-- TODO once all project migrated to SDK-style, remove this and move properties to Directory.Build.props -->
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
418
</PropertyGroup>
9+
4210
<ItemGroup>
4311
<Reference Include="System" />
44-
<Reference Include="System" />
45-
<Reference Include="System.Data" />
46-
<Reference Include="System.Xml" />
47-
</ItemGroup>
48-
<ItemGroup>
49-
<Compile Include="Server\CommandBuilderWithPrivateSupportTests.cs" />
50-
<Compile Include="Server\CommandBuilderWithDraftSupportTests.cs" />
51-
<Compile Include="Server\GerritCapabilityTests.cs" />
52-
</ItemGroup>
53-
<ItemGroup>
54-
<None Include="Properties\AssemblyInfo.cs" />
12+
<Reference Include="System.Windows.Forms" />
5513
</ItemGroup>
14+
5615
<ItemGroup>
57-
<PackageReference Include="FluentAssertions">
58-
<Version>5.2.0</Version>
59-
</PackageReference>
60-
<PackageReference Include="NUnit">
61-
<Version>3.10.1</Version>
62-
</PackageReference>
63-
<PackageReference Include="NUnit3TestAdapter">
64-
<Version>3.10.0</Version>
65-
</PackageReference>
16+
<PackageReference Include="FluentAssertions" Version="5.2.0" />
17+
<PackageReference Include="NUnit" Version="3.10.1" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
6619
</ItemGroup>
20+
6721
<ItemGroup>
68-
<ProjectReference Include="..\..\..\Plugins\Gerrit\Gerrit.csproj">
69-
<Project>{ec6988f6-0e8e-42d2-8e41-e562c5fb65bc}</Project>
70-
<Name>Gerrit</Name>
71-
</ProjectReference>
72-
<ProjectReference Include="..\..\..\ResourceManager\ResourceManager.csproj">
73-
<Project>{D3440FD7-AFC5-4351-8741-6CDBF15CE944}</Project>
74-
<Name>ResourceManager</Name>
75-
</ProjectReference>
22+
<ProjectReference Include="..\..\..\Plugins\Gerrit\Gerrit.csproj" />
23+
<ProjectReference Include="..\..\..\ResourceManager\ResourceManager.csproj" />
7624
</ItemGroup>
77-
<ItemGroup />
78-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
25+
7926
</Project>

Properties/AssemblyInfo.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

5-
// General Information about an assembly is controlled through the following
4+
// General Information about an assembly is controlled through the following
65
// set of attributes. Change these attribute values to modify the information
76
// associated with an assembly.
87
[assembly: AssemblyTitle("GerritTests")]
@@ -14,8 +13,8 @@
1413
[assembly: AssemblyTrademark("")]
1514
[assembly: AssemblyCulture("")]
1615

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
16+
// Setting ComVisible to false makes the types in this assembly not visible
17+
// to COM components. If you need to access a type in this assembly from
1918
// COM, set the ComVisible attribute to true on that type.
2019
[assembly: ComVisible(false)]
2120

@@ -25,11 +24,11 @@
2524
// Version information for an assembly consists of the following four values:
2625
//
2726
// Major Version
28-
// Minor Version
27+
// Minor Version
2928
// Build Number
3029
// Revision
3130
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
31+
// You can specify all the values or you can default the Build and Revision Numbers
3332
// by using the '*' as shown below:
3433
// [assembly: AssemblyVersion("1.0.*")]
3534
[assembly: AssemblyVersion("1.0.0.0")]

0 commit comments

Comments
 (0)