Fixing the 'PushToBlobFeed' target (dotnet#1734)

wli3 · Nov 15, 2017 · 6427dc0 · 6427dc0
1 parent c8dc2a3
commit 6427dc0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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 → tools/BuildTools.csproj b/tools/BuildTools.proj → 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
@@ -0,0 +1,3 @@
+<Project>
+     <Import Project="$([MSBuild]::GetPathOfFileAbove('Common.props'))" />
+</Project>