From 737b68b460f3bc1dc4ee009e87ca7653ba7b8bda Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Thu, 11 May 2017 10:01:51 -0700
Subject: [PATCH] Fixing the imports for signing.

---
 build/MicroBuild.props | 8 +++++++-
 build/Signing.proj     | 2 +-
 dir.props              | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/MicroBuild.props b/build/MicroBuild.props
index 381af0ffb..1cf77f45b 100644
--- a/build/MicroBuild.props
+++ b/build/MicroBuild.props
@@ -1,5 +1,11 @@
-<Project>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="DependencyVersions.props" />
+
   <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)/..</RepoRoot>
+    <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
+    <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
+
     <MicroBuildPropsAndTargetsPath>$(NuGetPackagesDir)/microbuild.core/$(MicroBuildVersion)/build/</MicroBuildPropsAndTargetsPath>
   </PropertyGroup>
 </Project>
diff --git a/build/Signing.proj b/build/Signing.proj
index e03b1a533..08225c510 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />  
+  <Import Project="MicroBuild.props" />
   <Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.props" />
 
   <!-- This will be overridden if we're building with MicroBuild. -->
diff --git a/dir.props b/dir.props
index 550529131..2bf0fe048 100644
--- a/dir.props
+++ b/dir.props
@@ -35,7 +35,6 @@
   <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" />