Cleanup msbuild layout

Use one props file for whole repo, avoiding layers of dir.props
2016-12-14 09:13:00 -08:00 · 2016-12-14 09:13:00 -08:00 · fd632ec654
parent e94def7eca
commit fd632ec654
17 changed files with 74 additions and 52 deletions
--- a/build/Key.snk
+++ b/build/Key.snk
--- a/build/common.props
+++ b/build/common.props
@ -0,0 +1,12 @@
+<Project>
+  <Import Project="..\version.props" />
+  <Import Project="..\.build\common.props" Condition="Exists('..\.build\common.props')" />
+  <PropertyGroup>
+    <CustomAfterMicrosoftCommonTargets>$(MSBuildThisFileDirectory)common.targets</CustomAfterMicrosoftCommonTargets>
+    <RepositoryUrl>https://github.com/aspnet/DotNetTools</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+  </PropertyGroup>
+</Project>
--- a/build/common.targets
+++ b/build/common.targets
@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <BuildDependsOn>EnsureInitialized;$(BuildDependsOn)</BuildDependsOn>
+  </PropertyGroup>
+  <Target Name="EnsureInitialized"
+          Condition="!Exists('$(MSBuildThisFileDirectory)..\.build\common.props')">
+    <!--TODO automagically execute build initialize. Will require changes to KoreBuild to avoid race conditions if invoked multiple times-->
+    <Error File="$(MSBuildProjectFile)"
+           Text="Project has not been initialized. Run 'build initialize' in the solution directory '$(MSBuildThisFileDirectory)'" />
+  </Target>
+</Project>
--- a/dir.props
+++ b/dir.props
@ -1,11 +0,0 @@
-<Project>
-  <Import Project="version.props" />
-  <Import Project=".build\common.props" Condition="Exists('.build\common.props')"/>
-
-  <Target Name="EnsureInitialized" BeforeTargets="Build" Condition="!Exists('$(MSBuildThisFileDirectory)\.build\common.props')">
-    <Error File="$(MSBuildProjectFile)"
-           Text="Project has not been initialized. Run 'build initialize' in the solution directory '$(MSBuildThisFileDirectory)'" />
-  </Target>
-
-  <Import Project="tools\sign.props" />
-</Project>
--- a/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
+++ b/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
@ -1,21 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\dir.props" />
+  <Import Project="..\..\build\common.props" />
+
  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <AssemblyName>dotnet-watch</AssemblyName>
    <OutputType>exe</OutputType>
    <Description>Command line tool to watch for source file changes during development and restart the dotnet command.</Description>
+    <PackageId>Microsoft.DotNet.Watcher.Tools</PackageId>
    <PackageTags>dotnet;watch</PackageTags>
+    <PackageType>DotnetCliTool</PackageType>
  </PropertyGroup>
+
  <ItemGroup>
    <Compile Include="**\*.cs" />
    <Compile Include="..\..\shared\**\*.cs" />
    <EmbeddedResource Include="**\*.resx" />
    <EmbeddedResource Include="dotnetwatch.targets" LogicalName="dotnetwatch.targets" />
    <Content Include="toolassets\*.targets" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="%(Identity)" />
+    <None Include="prefercliruntime" Pack="true" PackagePath="\prefercliruntime" />
+    <None Include="$(ProjectRuntimeConfigFilePath)" Pack="true" PackagePath="lib\$(TargetFramework)" Condition="'$(DesignTimeBuild)'!='true'" />
  </ItemGroup>
+
  <ItemGroup>
-    <!-- Restore this when https://github.com/NuGet/Home/issues/3683 is resolved -->
-    <!--<PackageReference Include="Microsoft.Extensions.Process.Sources" Version="1.1.0-*" PrivateAssets="All" />-->
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Process.Sources" Version="1.1.0-*" PrivateAssets="All" />
  </ItemGroup>
+
 </Project>
--- a/src/Microsoft.DotNet.Watcher.Tools/prefercliruntime
+++ b/src/Microsoft.DotNet.Watcher.Tools/prefercliruntime
--- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
+++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
@ -1,19 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\dir.props" />
+  <Import Project="..\..\build\common.props" />
  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <AssemblyName>dotnet-sql-cache</AssemblyName>
    <OutputType>exe</OutputType>
    <Description>Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.</Description>
+    <PackageId>Microsoft.Extensions.Caching.SqlConfig.Tools</PackageId>
    <PackageTags>cache;distributedcache;sqlserver</PackageTags>
+    <PackageType>DotnetCliTool</PackageType>
  </PropertyGroup>

  <ItemGroup>
    <Compile Include="**\*.cs" />
    <Compile Include="..\..\shared\**\*.cs" />
+    <None Include="prefercliruntime" Pack="true" PackagePath="\prefercliruntime" />
+    <None Include="$(ProjectRuntimeConfigFilePath)" Pack="true" PackagePath="lib\$(TargetFramework)" Condition="'$(DesignTimeBuild)'!='true'" />
  </ItemGroup>

  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
    <PackageReference Include="System.Data.SqlClient" Version="4.1.0" />
  </ItemGroup>
 </Project>
--- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/prefercliruntime
+++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/prefercliruntime
--- a/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
+++ b/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\dir.props" />
+  <Import Project="..\..\build\common.props" />
  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <AssemblyName>dotnet-user-secrets</AssemblyName>
    <OutputType>exe</OutputType>
    <Description>Command line tool to manage user secrets for Microsoft.Extensions.Configuration.</Description>
+    <PackageId>Microsoft.Extensions.SecretManager.Tools</PackageId>
    <PackageTags>configuration;secrets;usersecrets</PackageTags>
+    <PackageType>DotnetCliTool</PackageType>
    <GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
  </PropertyGroup>

@ -14,9 +16,12 @@
    <Compile Include="..\..\shared\**\*.cs" />
    <EmbeddedResource Include="**\*.resx" />
    <EmbeddedResource Include="resources\ProjectIdResolverTargets.xml" LogicalName="ProjectIdResolverTargets.xml" />
+    <None Include="prefercliruntime" Pack="true" PackagePath="\prefercliruntime" />
+    <None Include="$(ProjectRuntimeConfigFilePath)" Pack="true" PackagePath="lib\$(TargetFramework)" Condition="'$(DesignTimeBuild)'!='true'" />
  </ItemGroup>

  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.1" />
  </ItemGroup>
 </Project>
--- a/src/Microsoft.Extensions.SecretManager.Tools/prefercliruntime
+++ b/src/Microsoft.Extensions.SecretManager.Tools/prefercliruntime
--- a/src/dir.props
+++ b/src/dir.props
@ -1,16 +0,0 @@
-<Project>
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <!-- overrides default which is assembly name -->
-    <PackageId>$(MSBuildProjectName)</PackageId>
-    <PackageType>DotnetCliTool</PackageType>
-    <RepositoryUrl>https://github.com/aspnet/DotNetTools</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-  </PropertyGroup>
-  <ItemGroup>
-      <PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
-      <None Include="$(MSBuildThisFileDirectory)\prefercliruntime" Pack="true" PackagePath="\prefercliruntime" />
-      <!-- required for CLI's that don't yet support the 'prevercliruntime' file -->
-      <None Include="$(ProjectRuntimeConfigFilePath)" Pack="true" PackagePath="lib\$(TargetFramework)" Condition="'$(DesignTimeBuild)'!='true'" />
-  </ItemGroup>
-</Project>
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Microsoft.DotNet.Watcher.Tools.FunctionalTests.csproj
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Microsoft.DotNet.Watcher.Tools.FunctionalTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\dir.props" />
+  <Import Project="..\..\build\common.props" />

  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netcoreapp1.1</TargetFrameworks>
@ -14,8 +14,14 @@
    <Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchInner.targets" Link="toolassets\DotNetWatchInner.targets" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchOuter.targets" Link="toolassets\DotNetWatchOuter.targets" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchCommon.targets" Link="toolassets\DotNetWatchCommon.targets" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
    <ProjectReference Include="..\..\src\Microsoft.DotNet.Watcher.Tools\Microsoft.DotNet.Watcher.Tools.csproj" />
    <ProjectReference Include="..\Microsoft.DotNet.Watcher.Tools.Tests\Microsoft.DotNet.Watcher.Tools.Tests.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
+    <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
--- a/test/Microsoft.DotNet.Watcher.Tools.Tests/Microsoft.DotNet.Watcher.Tools.Tests.csproj
+++ b/test/Microsoft.DotNet.Watcher.Tools.Tests/Microsoft.DotNet.Watcher.Tools.Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\dir.props" />
+  <Import Project="..\..\build\common.props" />

  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
@ -13,8 +13,14 @@
    <Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchInner.targets" Link="toolassets\DotNetWatchInner.targets" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchOuter.targets" Link="toolassets\DotNetWatchOuter.targets" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchCommon.targets" Link="toolassets\DotNetWatchCommon.targets" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
    <ProjectReference Include="..\..\src\Microsoft.DotNet.Watcher.Tools\Microsoft.DotNet.Watcher.Tools.csproj" />
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
+    <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
  </ItemGroup>

 </Project>
--- a/test/Microsoft.Extensions.SecretManager.Tools.Tests/Microsoft.Extensions.SecretManager.Tools.Tests.csproj
+++ b/test/Microsoft.Extensions.SecretManager.Tools.Tests/Microsoft.Extensions.SecretManager.Tools.Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\dir.props" />
+  <Import Project="..\..\build\common.props" />

  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
@ -10,8 +10,14 @@
  <ItemGroup>
    <Compile Include="**\*.cs" />
    <Compile Include="..\Shared\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
    <ProjectReference Include="..\..\src\Microsoft.Extensions.SecretManager.Tools\Microsoft.Extensions.SecretManager.Tools.csproj" />
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
+    <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
  </ItemGroup>

 </Project>
--- a/test/Microsoft.Extensions.Tools.Tests/Microsoft.Extensions.Tools.Tests.csproj
+++ b/test/Microsoft.Extensions.Tools.Tests/Microsoft.Extensions.Tools.Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\dir.props" />
+  <Import Project="..\..\build\common.props" />

  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
@ -10,7 +10,13 @@
  <ItemGroup>
    <Compile Include="**\*.cs" />
    <Compile Include="..\..\shared\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
+    <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
  </ItemGroup>

 </Project>
--- a/test/dir.props
+++ b/test/dir.props
@ -1,9 +0,0 @@
-<Project>
-  <Import Project="..\dir.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
-    <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
-  </ItemGroup>
-</Project>
--- a/tools/sign.props
+++ b/tools/sign.props
@ -1,7 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
-        <SignAssembly>true</SignAssembly>
-        <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    </PropertyGroup>
-</Project>