From dd01dbf4ce7669f338d1446a94243a1272b6a0de Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 10 May 2017 12:08:38 -0700
Subject: [PATCH] Bringing down MicroBuild.Core props and targets separately
 from build_tools.

---
 NuGet.Config                                         |  1 +
 build/DependencyVersions.props                       |  1 +
 build/MicroBuild.props                               |  5 +++++
 build/Signing.proj                                   |  9 +++------
 dir.props                                            |  1 +
 .../Signing.Dependencies/Signing.Dependencies.csproj | 12 ++++++++++++
 6 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 build/MicroBuild.props
 create mode 100644 tools/Signing.Dependencies/Signing.Dependencies.csproj

diff --git a/NuGet.Config b/NuGet.Config
index 120a5daf6..93d54688d 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -13,5 +13,6 @@
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
+    <add key="build_tools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 9c5f7f24a..461d70e84 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -19,6 +19,7 @@
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
     <AspNetCoreRuntimeVersion>2.0.0-preview1-65</AspNetCoreRuntimeVersion>
+    <MicroBuildVersion>0.2.0</MicroBuildVersion>
     
     <!-- This should either be timestamped or notimestamp as appropriate -->
     <AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
diff --git a/build/MicroBuild.props b/build/MicroBuild.props
new file mode 100644
index 000000000..381af0ffb
--- /dev/null
+++ b/build/MicroBuild.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <MicroBuildPropsAndTargetsPath>$(NuGetPackagesDir)/microbuild.core/$(MicroBuildVersion)/build/</MicroBuildPropsAndTargetsPath>
+  </PropertyGroup>
+</Project>
diff --git a/build/Signing.proj b/build/Signing.proj
index 3fa6d63b4..e03b1a533 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <RepoRoot>$(MSBuildThisFileDirectory)/..</RepoRoot>
-  </PropertyGroup>
-  
-  <Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />  
+  <Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.props" />
 
   <!-- This will be overridden if we're building with MicroBuild. -->
   <Target Name="SignFiles">
@@ -127,5 +124,5 @@
     </ItemGroup>
   </Target>
 
-  <Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.targets" />
+  <Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.targets" />
 </Project>
diff --git a/dir.props b/dir.props
index 2bf0fe048..550529131 100644
--- a/dir.props
+++ b/dir.props
@@ -35,6 +35,7 @@
   <Import Project="build/BuildDefaults.props" />
   <Import Project="build/Stage0.props" />
   <Import Project="build/CrossGen.props" />
+  <Import Project="build/MicroBuild.props" />
   <Import Project="build/VersionBadge.props" />
   <Import Project="build/BundledRuntimes.props" />
   <Import Project="build/BackwardsCompatibilityRuntimes.props" />
diff --git a/tools/Signing.Dependencies/Signing.Dependencies.csproj b/tools/Signing.Dependencies/Signing.Dependencies.csproj
new file mode 100644
index 000000000..94c5dd05f
--- /dev/null
+++ b/tools/Signing.Dependencies/Signing.Dependencies.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MicroBuild.Core" Version="$(MicroBuildVersion)" />
+  </ItemGroup>
+
+</Project>