Use Directory.Build.props/targets

2017-08-29 09:30:22 -07:00 · 2017-08-29 09:30:22 -07:00 · 9634f7fd9c
parent adf3cb70aa
commit 9634f7fd9c
24 changed files with 42 additions and 70 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -0,0 +1,16 @@
+<Project>
+  <Import Project="build\dependencies.props" />
+  <Import Project="version.xml" />
+
+  <PropertyGroup>
+    <Product>Microsoft ASP.NET Core</Product>
+    <RepositoryUrl>https://github.com/aspnet/Diagnostics</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+</Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -0,0 +1,2 @@
+<Project>
+</Project>
--- a/build/common.props
+++ b/build/common.props
@ -1,24 +0,0 @@
-<Project>
-  <Import Project="dependencies.props" />
-  <Import Project="..\version.xml" />
-
-  <PropertyGroup>
-    <Product>Microsoft ASP.NET Core</Product>
-    <RepositoryUrl>https://github.com/aspnet/Diagnostics</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
-    <PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
-  </ItemGroup>
-
-</Project>
--- a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj
+++ b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-  <Import Project="..\..\build\dependencies.props" />
-
  <PropertyGroup>
    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
  </PropertyGroup>
--- a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj
+++ b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj
@ -1,6 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <Import Project="..\..\build\dependencies.props" />
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
--- a/samples/ElmPageSample/ElmPageSample.csproj
+++ b/samples/ElmPageSample/ElmPageSample.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-  <Import Project="..\..\build\dependencies.props" />
-
  <PropertyGroup>
    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
  </PropertyGroup>
--- a/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj
+++ b/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj
@ -1,6 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <Import Project="..\..\build\dependencies.props" />
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
--- a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj
+++ b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj
@ -1,6 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <Import Project="..\..\build\dependencies.props" />
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
--- a/samples/StatusCodePagesSample/StatusCodePagesSample.csproj
+++ b/samples/StatusCodePagesSample/StatusCodePagesSample.csproj
@ -1,6 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <Import Project="..\..\build\dependencies.props" />
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
--- a/samples/WelcomePageSample/WelcomePageSample.csproj
+++ b/samples/WelcomePageSample/WelcomePageSample.csproj
@ -1,6 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <Import Project="..\..\build\dependencies.props" />
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -0,0 +1,7 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
--- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj
+++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <Description>ASP.NET Core diagnostics middleware abstractions and feature interface definitions.</Description>
    <TargetFramework>netstandard2.0</TargetFramework>
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <Description>ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs.</Description>
    <VersionPrefix>0.4.0</VersionPrefix>
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <Description>ASP.NET Core middleware for Entity Framework Core error pages. Use this middleware to detect and diagnose errors with Entity Framework Core migrations.</Description>
    <TargetFrameworks>netstandard2.0</TargetFrameworks>
--- a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj
+++ b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj
@ -1,6 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\build\common.props" />
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <Description>ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware</Description>
@ -25,9 +23,9 @@
    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCoreVersion)" />
    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
    <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.Extensions.StackTrace.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.StackTrace.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(DiagnosticSourceVersion)" />
    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />

--- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj
+++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj
@ -1,6 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\build\common.props" />
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <Description>ASP.NET Core middleware for analyzing middleware in the request pipeline with System.Diagnostics.DiagnosticSource.</Description>
--- a/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj
+++ b/test/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
    <DebugType>portable</DebugType>
--- a/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj
+++ b/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
--- a/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj
+++ b/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@ -0,0 +1,7 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
--- a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
--- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj
+++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\..\build\common.props" />
-
  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>