From fd632ec65423951a4cd2f180b0667978c1d0c425 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 14 Dec 2016 09:13:00 -0800
Subject: [PATCH] Cleanup msbuild layout

Use one props file for whole repo, avoiding layers of dir.props
---
 {tools => build}/Key.snk                        | Bin
 build/common.props                              |  12 ++++++++++++
 build/common.targets                            |  11 +++++++++++
 dir.props                                       |  11 -----------
 .../Microsoft.DotNet.Watcher.Tools.csproj       |  14 +++++++++++---
 .../prefercliruntime                            |   0
 ...ft.Extensions.Caching.SqlConfig.Tools.csproj |   7 ++++++-
 .../prefercliruntime                            |   0
 ...rosoft.Extensions.SecretManager.Tools.csproj |   7 ++++++-
 .../prefercliruntime                            |   0
 src/dir.props                                   |  16 ----------------
 ....DotNet.Watcher.Tools.FunctionalTests.csproj |   8 +++++++-
 .../Microsoft.DotNet.Watcher.Tools.Tests.csproj |   8 +++++++-
 ....Extensions.SecretManager.Tools.Tests.csproj |   8 +++++++-
 .../Microsoft.Extensions.Tools.Tests.csproj     |   8 +++++++-
 test/dir.props                                  |   9 ---------
 tools/sign.props                                |   7 -------
 17 files changed, 74 insertions(+), 52 deletions(-)
 rename {tools => build}/Key.snk (100%)
 create mode 100644 build/common.props
 create mode 100644 build/common.targets
 delete mode 100644 dir.props
 rename src/{ => Microsoft.DotNet.Watcher.Tools}/prefercliruntime (100%)
 create mode 100644 src/Microsoft.Extensions.Caching.SqlConfig.Tools/prefercliruntime
 create mode 100644 src/Microsoft.Extensions.SecretManager.Tools/prefercliruntime
 delete mode 100644 src/dir.props
 delete mode 100644 test/dir.props
 delete mode 100644 tools/sign.props

diff --git a/tools/Key.snk b/build/Key.snk
similarity index 100%
rename from tools/Key.snk
rename to build/Key.snk
diff --git a/build/common.props b/build/common.props
new file mode 100644
index 0000000000..6feec58008
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/build/common.targets b/build/common.targets
new file mode 100644
index 0000000000..0d53664e13
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/dir.props b/dir.props
deleted file mode 100644
index 3f3183bc8c..0000000000
--- a/dir.props
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj b/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
index fb08e53fcf..5fcd93218a 100644
--- 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>
\ No newline at end of file
diff --git a/src/prefercliruntime b/src/Microsoft.DotNet.Watcher.Tools/prefercliruntime
similarity index 100%
rename from src/prefercliruntime
rename to src/Microsoft.DotNet.Watcher.Tools/prefercliruntime
diff --git 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
index 6a05d21dde..d5a6312358 100644
--- 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>
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/prefercliruntime b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/prefercliruntime
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj b/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
index 142fbcbabe..af9f5b2dab 100644
--- 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>
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.SecretManager.Tools/prefercliruntime b/src/Microsoft.Extensions.SecretManager.Tools/prefercliruntime
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/dir.props b/src/dir.props
deleted file mode 100644
index addeb75498..0000000000
--- a/src/dir.props
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git 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
index 2cb75f63ab..4a62605ec6 100644
--- 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'">
diff --git 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
index d4201a9e72..f47ff1cfe0 100644
--- 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>
diff --git 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
index 29ea81b6aa..29e29c39b3 100644
--- 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>
\ No newline at end of file
diff --git a/test/Microsoft.Extensions.Tools.Tests/Microsoft.Extensions.Tools.Tests.csproj b/test/Microsoft.Extensions.Tools.Tests/Microsoft.Extensions.Tools.Tests.csproj
index 775ec194cd..af1f80ea25 100644
--- 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>
\ No newline at end of file
diff --git a/test/dir.props b/test/dir.props
deleted file mode 100644
index a0553297be..0000000000
--- a/test/dir.props
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/tools/sign.props b/tools/sign.props
deleted file mode 100644
index 54132d388a..0000000000
--- a/tools/sign.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
-        <SignAssembly>true</SignAssembly>
-        <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    </PropertyGroup>
-</Project>
\ No newline at end of file