Cleaning and unifying csproj files (#236)

- Part of this work is to enable building the project on Linux.
microsoft · Jun 9, 2017 · fc429e3 · fc429e3
1 parent 8d12886
commit fc429e3
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 116 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -2,5 +2,6 @@
 <configuration>
   <packageSources>
     <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/src/common.props b/src/common.props
@@ -0,0 +1,42 @@
+<Project>
+  <!--<Import Project="dependencies.props" />-->
+  <Import Project="$(MSBuildThisFileDirectory)/version.props" />
+
+  <PropertyGroup Condition="'$(GitHeadSha)' != ''">
+    <CommitHash>$(GitHeadSha)</CommitHash>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Repository information">
+    <Product>Microsoft xUnit Performance Api</Product>
+    <RepositoryUrl>https://github.com/Microsoft/xunit-performance</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Build properties">
+    <Description>xUnit Performance Api
+    Commit SHA: $(CommitHash)
+    </Description>
+
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>1701;1702;1705;1591</NoWarn>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Define constants">
+    <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS_NT</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Label="NuGet package information">
+    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/Microsoft/xunit-performance</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/xunit-performance/master/LICENSE</PackageLicenseUrl>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Signing">
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)common/xunit.performance.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+  </PropertyGroup>
+</Project>
diff --git a/src/common/GlobalAssemblyInfo.cs b/src/common/GlobalAssemblyInfo.cs
diff --git a/src/version.props b/src/version.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <MicrosoftDiagnosticsTracingLibraryVersion>1.0.3-alpha-experimental</MicrosoftDiagnosticsTracingLibraryVersion>
+    <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/xunit.performance.api/xunit.performance.api.csproj b/src/xunit.performance.api/xunit.performance.api.csproj
@@ -1,47 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup Label="Configuration">
-    <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS_NT</DefineConstants>
-    <RootNamespace>Microsoft.Xunit.Performance.Api</RootNamespace>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(GitHeadSha)' != ''">
-    <CommitHash>$(GitHeadSha)</CommitHash>
-  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../common.props" />
 
   <PropertyGroup>
     <AssemblyTitle>xunit.performance.api</AssemblyTitle>
-    <Description>xUnit Performance Api
-    Commit SHA: $(CommitHash)
-    </Description>
     <TargetFramework>netstandard1.5</TargetFramework>
     <Title>xUnit Performance Api</Title>
-
-    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/Microsoft/xunit-performance</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/xunit-performance/master/LICENSE</PackageLicenseUrl>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\common\GlobalAssemblyInfo.cs" Link="GlobalAssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.1.1-beta" />
     <PackageReference Include="Microsoft.3rdpartytools.MarkdownLog" Version="0.10.0-alpha-experimental" />
-    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.3-alpha-experimental">
+    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingLibraryVersion)">
       <IncludeAssets>All</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.3.1" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
-    <PackageReference Include="xunit.runner.utility" Version="2.2.0-beta2-build3300" />
+    <PackageReference Include="xunit.runner.utility" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/xunit.performance.core/xunit.performance.core.csproj b/src/xunit.performance.core/xunit.performance.core.csproj
@@ -1,38 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup Label="Configuration">
-    <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS_NT</DefineConstants>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(GitHeadSha)' != ''">
-    <CommitHash>$(GitHeadSha)</CommitHash>
-  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../common.props" />
 
   <PropertyGroup>
     <AssemblyTitle>xunit.performance.core</AssemblyTitle>
-    <Description>xUnit Performance Core
-    Commit SHA: $(CommitHash)
-    </Description>
     <TargetFramework>netstandard1.3</TargetFramework>
     <Title>xUnit Performance Core</Title>
-
-    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/Microsoft/xunit-performance</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/xunit-performance/master/LICENSE</PackageLicenseUrl>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\common\GlobalAssemblyInfo.cs" Link="GlobalAssemblyInfo.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="xunit.extensibility.core" Version="2.2.0-beta2-build3300" />
+    <PackageReference Include="xunit.extensibility.core" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/xunit.performance.execution/xunit.performance.execution.csproj b/src/xunit.performance.execution/xunit.performance.execution.csproj
@@ -1,43 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup Label="Configuration">
-    <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS_NT</DefineConstants>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(GitHeadSha)' != ''">
-    <CommitHash>$(GitHeadSha)</CommitHash>
-  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../common.props" />
 
   <PropertyGroup>
     <AssemblyTitle>xunit.performance.execution</AssemblyTitle>
-    <Description>xUnit Performance Execution
-    Commit SHA: $(CommitHash)
-    </Description>
     <TargetFramework>netstandard1.5</TargetFramework>
-    <Title>xUnit Performance Core</Title>
+    <Title>xUnit Performance Execution</Title>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
-    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/Microsoft/xunit-performance</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/xunit-performance/master/LICENSE</PackageLicenseUrl>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\common\GlobalAssemblyInfo.cs" Link="GlobalAssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\xunit.performance.core\xunit.performance.core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.2.0-beta2-build3300" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/xunit.performance.metrics/xunit.performance.metrics.csproj b/src/xunit.performance.metrics/xunit.performance.metrics.csproj
@@ -1,42 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup Label="Configuration">
-    <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS_NT</DefineConstants>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(GitHeadSha)' != ''">
-    <CommitHash>$(GitHeadSha)</CommitHash>
-  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../common.props" />
 
   <PropertyGroup>
     <AssemblyTitle>xunit.performance.metrics</AssemblyTitle>
-    <Description>xUnit Performance Metrics
-    Commit SHA: $(CommitHash)
-    </Description>
     <TargetFramework>netstandard1.5</TargetFramework>
     <Title>xUnit Performance Metrics</Title>
-
-    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/Microsoft/xunit-performance</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/xunit-performance/master/LICENSE</PackageLicenseUrl>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\common\GlobalAssemblyInfo.cs" Link="GlobalAssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\xunit.performance.core\xunit.performance.core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.3-alpha-experimental" />
+    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingLibraryVersion)" />
     <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
     <PackageReference Include="xunit.abstractions" Version="2.0.1" />
   </ItemGroup>