From 6427dc0c55660104e06e4bc601ce6c28c7c1ecb1 Mon Sep 17 00:00:00 2001
From: John Beisner <johnbeisner@users.noreply.github.com>
Date: Tue, 14 Nov 2017 16:26:35 -0800
Subject: [PATCH] Fixing the 'PushToBlobFeed' target (#1734)

---
 build/build.proj                             | 2 +-
 tools/{BuildTools.proj => BuildTools.csproj} | 2 --
 tools/Directory.Build.props                  | 3 +++
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename tools/{BuildTools.proj => BuildTools.csproj} (69%)
 create mode 100644 tools/Directory.Build.props

diff --git a/build/build.proj b/build/build.proj
index 14160b38e8..018539bdd0 100644
--- a/build/build.proj
+++ b/build/build.proj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <SolutionFile Include="$(RepositoryRootDirectory)sdk.sln" />
-    <BuildToolsProjectFile Include="$(RepositoryRootDirectory)tools\BuildTools.proj" />
+    <BuildToolsProjectFile Include="$(RepositoryRootDirectory)tools\BuildTools.csproj" />
     <SigningProjectFile Include="$(RepositoryRootDirectory)build\Signing\Microsoft.NET.Signing.proj"/>
     <NuGetProjectFile Include="$(RepositoryRootDirectory)src\Tasks\Microsoft.NET.Build.Tasks\Microsoft.NET.Build.Tasks.csproj" />
     <NuGetProjectFile Include="$(RepositoryRootDirectory)src\Tasks\Microsoft.NET.Build.Extensions.Tasks\Microsoft.NET.Build.Extensions.Tasks.csproj" />
diff --git a/tools/BuildTools.proj b/tools/BuildTools.csproj
similarity index 69%
rename from tools/BuildTools.proj
rename to tools/BuildTools.csproj
index 36e7fbf195..67db2d2396 100644
--- a/tools/BuildTools.proj
+++ b/tools/BuildTools.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />
-  <Import Project="$(MSBuildThisFileDirectory)/obj/BuildTools.proj.nuget.g.targets" Condition="Exists('$(MSBuildThisFileDirectory)/obj/BuildTools.proj.nuget.g.targets')" />
   <Import Project="$(MSBuildThisFileDirectory)/PushToBlobFeed.targets" />
 
   <PropertyGroup>
diff --git a/tools/Directory.Build.props b/tools/Directory.Build.props
new file mode 100644
index 0000000000..610e54bf5d
--- /dev/null
+++ b/tools/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+     <Import Project="$([MSBuild]::GetPathOfFileAbove('Common.props'))" />
+</Project>