Skip to content

Commit 1d6c829

Browse files
dazinatordazinator
authored
Merge pull request #1532 from arturcic/feature/cleanup-csproj
Cleanup csproj files
2 parents 16c69e6 + 0244c62 commit 1d6c829

File tree

7 files changed

+25
-257
lines changed

7 files changed

+25
-257
lines changed

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net461</TargetFramework>
5-
<!--<TargetFramework>net40</TargetFramework>-->
6-
<OutputType>Library</OutputType>
7-
<RootNamespace>GitVersionCore.Tests</RootNamespace>
8-
<AssemblyName>GitVersionCore.Tests</AssemblyName>
9-
<!--<GenerateAssemblyCompanyAttribute Condition="'$(GenerateAssemblyCompanyAttribute)' == ''">true</GenerateAssemblyCompanyAttribute>
10-
<GenerateAssemblyConfigurationAttribute Condition="'$(GenerateAssemblyConfigurationAttribute)' == ''">true</GenerateAssemblyConfigurationAttribute>
11-
<GenerateAssemblyCopyrightAttribute Condition="'$(GenerateAssemblyCopyrightAttribute)' == ''">true</GenerateAssemblyCopyrightAttribute>
12-
<GenerateAssemblyDescriptionAttribute Condition="'$(GenerateAssemblyDescriptionAttribute)' == ''">true</GenerateAssemblyDescriptionAttribute>-->
13-
<GenerateAssemblyFileVersionAttribute Condition="'$(GenerateAssemblyFileVersionAttribute)' == ''">false</GenerateAssemblyFileVersionAttribute>
14-
<GenerateAssemblyInformationalVersionAttribute Condition="'$(GenerateAssemblyInformationalVersionAttribute)' == ''">false</GenerateAssemblyInformationalVersionAttribute>
15-
<GenerateAssemblyProductAttribute Condition="'$(GenerateAssemblyProductAttribute)' == ''">false</GenerateAssemblyProductAttribute>
16-
<GenerateAssemblyTitleAttribute Condition="'$(GenerateAssemblyTitleAttribute)' == ''">false</GenerateAssemblyTitleAttribute>
17-
<GenerateAssemblyVersionAttribute Condition="'$(GenerateAssemblyVersionAttribute)' == ''">false</GenerateAssemblyVersionAttribute>
18-
<GenerateNeutralResourcesLanguageAttribute Condition="'$(GenerateNeutralResourcesLanguageAttribute)' == ''">true</GenerateNeutralResourcesLanguageAttribute>
19-
</PropertyGroup>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
206

21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22-
<DebugSymbols>true</DebugSymbols>
23-
<DebugType>full</DebugType>
24-
<Optimize>false</Optimize>
25-
<DefineConstants>DEBUG;TRACE</DefineConstants>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
287
<DebugType>full</DebugType>
298
<Optimize>false</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
329
<DebugSymbols>true</DebugSymbols>
10+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
3311
</PropertyGroup>
3412

3513
<ItemGroup>
@@ -46,16 +24,6 @@
4624
<PackageReference Include="TestStack.ConventionTests" Version="3.0.0" />
4725
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
4826
</ItemGroup>
49-
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
50-
<Reference Include="System" />
51-
<Reference Include="System.Core" />
52-
<Reference Include="System.Runtime.Serialization" />
53-
<Reference Include="System.Web.Extensions" />
54-
<Reference Include="System.Xml.Linq" />
55-
<Reference Include="System.Data" />
56-
<Reference Include="System.Xml" />
57-
<Reference Include="Microsoft.CSharp" />
58-
</ItemGroup>
5927
<ItemGroup>
6028
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
6129
</ItemGroup>

‎src/GitVersionCore/GitVersionCore.csproj

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard1.3;net40</TargetFrameworks>
5-
<OutputType>Library</OutputType>
65
<RootNamespace>GitVersion</RootNamespace>
7-
<AssemblyName>GitVersionCore</AssemblyName>
8-
<BuildDir>$(SolutionDir)..\build\</BuildDir>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7+
<DocumentationFile>bin\$(Configuration)\GitVersionCore.xml</DocumentationFile>
8+
<NoWarn>1591</NoWarn>
99
<!--Start of Nuspec metadata-->
1010
<PackageId>GitVersionCore</PackageId>
1111
<Title>GitVersion</Title>
@@ -21,36 +21,11 @@
2121
<!--Additional assembly info -->
2222
<Company>$(Authors)</Company>
2323
<Product>$(AssemblyName)</Product>
24-
<GenerateAssemblyFileVersionAttribute Condition="'$(GenerateAssemblyFileVersionAttribute)' == ''">false</GenerateAssemblyFileVersionAttribute>
25-
<GenerateAssemblyInformationalVersionAttribute Condition="'$(GenerateAssemblyInformationalVersionAttribute)' == ''">false</GenerateAssemblyInformationalVersionAttribute>
26-
<GenerateAssemblyProductAttribute Condition="'$(GenerateAssemblyProductAttribute)' == ''">false</GenerateAssemblyProductAttribute>
27-
<GenerateAssemblyTitleAttribute Condition="'$(GenerateAssemblyTitleAttribute)' == ''">false</GenerateAssemblyTitleAttribute>
28-
<GenerateAssemblyVersionAttribute Condition="'$(GenerateAssemblyVersionAttribute)' == ''">false</GenerateAssemblyVersionAttribute>
29-
<GenerateNeutralResourcesLanguageAttribute Condition="'$(GenerateNeutralResourcesLanguageAttribute)' == ''">true</GenerateNeutralResourcesLanguageAttribute>
30-
</PropertyGroup>
3124

32-
<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
33-
<DefineConstants>TRACE;NET40;NETDESKTOP</DefineConstants>
3425
</PropertyGroup>
3526

36-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
37-
<DefineConstants>TRACE;NETSTANDARD1_3;</DefineConstants>
38-
</PropertyGroup>
39-
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Any CPU' ">
41-
<DebugType>full</DebugType>
42-
<Optimize>false</Optimize>
43-
<OutputPath>bin\Debug\</OutputPath>
44-
<DefineConstants>DEBUG;TRACE</DefineConstants>
45-
<DocumentationFile>bin\Debug\GitVersionCore.xml</DocumentationFile>
46-
</PropertyGroup>
47-
48-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Any CPU' ">
49-
<DebugType>pdbonly</DebugType>
50-
<Optimize>true</Optimize>
51-
<OutputPath>bin\Release\</OutputPath>
52-
<DefineConstants>TRACE</DefineConstants>
53-
<DocumentationFile>bin\Release\GitVersionCore.xml</DocumentationFile>
27+
<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
28+
<DefineConstants>NETDESKTOP</DefineConstants>
5429
</PropertyGroup>
5530

5631
<ItemGroup>
@@ -60,15 +35,6 @@
6035
</ItemGroup>
6136

6237
<ItemGroup Condition="'$(TargetFramework)' == 'net40' ">
63-
<Reference Include="System" />
64-
<Reference Include="System.Core" />
65-
<Reference Include="System.Xml.Linq" />
66-
<Reference Include="System.Data.DataSetExtensions" />
67-
<Reference Include="Microsoft.CSharp" />
68-
<Reference Include="System.Data" />
69-
<Reference Include="System.Xml" />
70-
71-
7238
<PackageReference Include="AsyncBridge" Version="0.1.1">
7339
<PrivateAssets>All</PrivateAssets>
7440
</PackageReference>

‎src/GitVersionExe.Tests/ExecutionResults.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using System.Collections.Generic;
2-
using System.Web.Script.Serialization;
1+
using System.Collections.Generic;
32
using GitVersion;
3+
using Newtonsoft.Json;
44

55
public class ExecutionResults
66
{
@@ -19,8 +19,8 @@ public virtual VersionVariables OutputVariables
1919
{
2020
get
2121
{
22-
var outputVariables = new JavaScriptSerializer().Deserialize<Dictionary<string, string>>(Output);
22+
var outputVariables = JsonConvert.DeserializeObject<Dictionary<string, string>>(Output);
2323
return VersionVariables.FromDictionary(outputVariables);
2424
}
2525
}
26-
}
26+
}

‎src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5-
6-
<OutputType>Library</OutputType>
7-
8-
<RootNamespace>GitVersionExe.Tests</RootNamespace>
9-
<AssemblyName>GitVersionExe.Tests</AssemblyName>
103
<TargetFramework>net461</TargetFramework>
11-
12-
<GenerateAssemblyFileVersionAttribute Condition="'$(GenerateAssemblyFileVersionAttribute)' == ''">false</GenerateAssemblyFileVersionAttribute>
13-
<GenerateAssemblyInformationalVersionAttribute Condition="'$(GenerateAssemblyInformationalVersionAttribute)' == ''">false</GenerateAssemblyInformationalVersionAttribute>
14-
<GenerateAssemblyProductAttribute Condition="'$(GenerateAssemblyProductAttribute)' == ''">false</GenerateAssemblyProductAttribute>
15-
<GenerateAssemblyTitleAttribute Condition="'$(GenerateAssemblyTitleAttribute)' == ''">false</GenerateAssemblyTitleAttribute>
16-
<GenerateAssemblyVersionAttribute Condition="'$(GenerateAssemblyVersionAttribute)' == ''">false</GenerateAssemblyVersionAttribute>
17-
<GenerateNeutralResourcesLanguageAttribute Condition="'$(GenerateNeutralResourcesLanguageAttribute)' == ''">true</GenerateNeutralResourcesLanguageAttribute>
18-
19-
</PropertyGroup>
20-
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-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31-
<DebugType>full</DebugType>
32-
<Optimize>false</Optimize>
33-
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
37-
<DebugSymbols>true</DebugSymbols>
4+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
386
</PropertyGroup>
397
<ItemGroup>
408
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
419
<PackageReference Include="GitTools.Core" Version="$(PackageVersion_GitToolsCore)"></PackageReference>
4210
<PackageReference Include="GitTools.Testing" Version="1.2.0"></PackageReference>
4311
<PackageReference Include="JetBrains.Annotations" Version="10.4.0"></PackageReference>
4412
<PackageReference Include="Mono.Cecil" Version="0.9.6.4"></PackageReference>
13+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
4514
<PackageReference Include="NSubstitute" Version="1.10.0"></PackageReference>
4615
<PackageReference Include="coverlet.msbuild" Version="2.1.1" />
4716
<PackageReference Include="NUnit" Version="3.9.0"></PackageReference>
4817
<packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
4918
<PackageReference Include="Shouldly" Version="3.0.0"></PackageReference>
5019
</ItemGroup>
51-
52-
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
53-
<Reference Include="System" />
54-
<Reference Include="System.Core" />
55-
<Reference Include="System.Runtime.Serialization" />
56-
<Reference Include="System.Web.Extensions" />
57-
<Reference Include="System.Xml.Linq" />
58-
<Reference Include="System.Data.DataSetExtensions" />
59-
<Reference Include="Microsoft.CSharp" />
60-
<Reference Include="System.Data" />
61-
<Reference Include="System.Xml" />
62-
</ItemGroup>
6320
<ItemGroup>
6421
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
6522
<ProjectReference Include="..\GitVersionExe\GitVersionExe.csproj" />

‎src/GitVersionExe/GitVersionExe.csproj

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
53

64
<OutputType>Exe</OutputType>
75
<RootNamespace>GitVersion</RootNamespace>
86
<AssemblyName>GitVersion</AssemblyName>
97
<TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net40;netcoreapp2.0</TargetFrameworks>
108
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11-
</PropertyGroup>
12-
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14-
<DebugSymbols>true</DebugSymbols>
15-
<DebugType>full</DebugType>
16-
<Optimize>false</Optimize>
17-
<OutputPath>bin\Debug\</OutputPath>
18-
<DefineConstants>DEBUG;TRACE</DefineConstants>
19-
20-
<DocumentationFile>bin\Debug\GitVersion.xml</DocumentationFile>
21-
<NoWarn>1591</NoWarn>
22-
</PropertyGroup>
23-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
24-
<DebugType>pdbonly</DebugType>
25-
<Optimize>true</Optimize>
26-
<OutputPath>bin\Release\</OutputPath>
27-
<DefineConstants>TRACE</DefineConstants>
28-
29-
<DocumentationFile>bin\Release\GitVersion.xml</DocumentationFile>
30-
<NoWarn>1591</NoWarn>
319
<PlatformTarget>AnyCPU</PlatformTarget>
10+
<DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
11+
<NoWarn>1591</NoWarn>
3212
</PropertyGroup>
3313

3414
<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
35-
<DefineConstants>NET40;NETDESKTOP</DefineConstants>
15+
<DefineConstants>NETDESKTOP</DefineConstants>
3616
</PropertyGroup>
3717

3818
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
39-
4019
<PackageReference Include="GitTools.Core" Version="1.3.1"></PackageReference>
4120
<PackageReference Include="JetBrains.Annotations" Version="10.4.0"></PackageReference>
42-
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System" />
45-
<Reference Include="System.Configuration" />
46-
<Reference Include="System.Core" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Data.DataSetExtensions" />
49-
<Reference Include="System.Xml" />
50-
<Reference Include="System.Xml.Linq" />
5121
</ItemGroup>
5222

5323
<ItemGroup>

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 5 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5-
<OutputType>Library</OutputType>
6-
<RootNamespace>GitVersionTask.Tests</RootNamespace>
7-
<AssemblyName>GitVersionTask.Tests</AssemblyName>
83
<TargetFramework>net461</TargetFramework>
9-
10-
<GenerateAssemblyFileVersionAttribute Condition="'$(GenerateAssemblyFileVersionAttribute)' == ''">false</GenerateAssemblyFileVersionAttribute>
11-
<GenerateAssemblyInformationalVersionAttribute Condition="'$(GenerateAssemblyInformationalVersionAttribute)' == ''">false</GenerateAssemblyInformationalVersionAttribute>
12-
<GenerateAssemblyProductAttribute Condition="'$(GenerateAssemblyProductAttribute)' == ''">false</GenerateAssemblyProductAttribute>
13-
<GenerateAssemblyTitleAttribute Condition="'$(GenerateAssemblyTitleAttribute)' == ''">false</GenerateAssemblyTitleAttribute>
14-
<GenerateAssemblyVersionAttribute Condition="'$(GenerateAssemblyVersionAttribute)' == ''">false</GenerateAssemblyVersionAttribute>
15-
<GenerateNeutralResourcesLanguageAttribute Condition="'$(GenerateNeutralResourcesLanguageAttribute)' == ''">true</GenerateNeutralResourcesLanguageAttribute>
16-
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<Prefer32Bit>false</Prefer32Bit>
27-
<NoWarn>414</NoWarn>
28-
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType>full</DebugType>
31-
<Optimize>false</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
<Prefer32Bit>false</Prefer32Bit>
37-
<DebugSymbols>true</DebugSymbols>
4+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
386
</PropertyGroup>
397
<ItemGroup>
408
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
@@ -55,36 +23,17 @@
5523
<PackageReference Include="Shouldly" Version="3.0.0"></PackageReference>
5624
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2"></PackageReference>
5725
<PackageReference Include="System.Collections.Immutable" Version="1.3.1"></PackageReference>
58-
<!--See https://github.com/Microsoft/msbuild/issues/3671 for reason for the ExcludeAssets against msbuild packagerefernces -->
59-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
60-
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" />
61-
62-
</ItemGroup>
63-
<ItemGroup>
64-
<Reference Include="Microsoft.CSharp" />
65-
<Reference Include="System" />
66-
<Reference Include="System.ComponentModel.Composition" />
67-
<Reference Include="System.Core" />
68-
<Reference Include="System.Runtime.Serialization" />
69-
<Reference Include="System.Xml.Linq" />
70-
<Reference Include="System.Data.DataSetExtensions" />
71-
<Reference Include="System.Data" />
72-
<Reference Include="System.Xml" />
26+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
27+
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" />
7328
</ItemGroup>
7429
<ItemGroup>
7530
<Content Include="Approved\**\*.txt" />
76-
<None Remove="packages.config" />
7731
</ItemGroup>
7832
<ItemGroup>
79-
<ProjectReference Include="..\GitVersionTask\GitVersionTask.csproj">
80-
</ProjectReference>
33+
<ProjectReference Include="..\GitVersionTask\GitVersionTask.csproj" />
8134
</ItemGroup>
8235
<ItemGroup>
8336
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
8437
</ItemGroup>
85-
<PropertyGroup>
86-
<PostBuildEvent>
87-
</PostBuildEvent>
88-
</PropertyGroup>
8938

9039
</Project>

0 commit comments

Comments
 (0)