From 31635abf6b39863c1084422244d51c101fcc2b74 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 21 Apr 2017 08:54:29 -0700
Subject: [PATCH] Resolve warnings about duplicate imports of
 Microsoft.Common.targets

---
 build/repo.targets | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/build/repo.targets b/build/repo.targets
index 6b678c944..a076e8479 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
   <PropertyGroup>
     <NuGetPublishVolatileFeed>https://dotnet.myget.org/F/aspnetcore-volatile-dev/api/v2/package</NuGetPublishVolatileFeed>
 
@@ -104,18 +104,8 @@
       Condition="'$(CloneRepositoryCommit)'!=''" />
   </Target>
 
-  <Target Name="_ResolvePackagePublisherPath" DependsOnTargets="RunResolvePackageDependencies">
-    <ItemGroup>
-      <PackagePublisherPath Include="%(PackageDefinitions.ResolvedPath)" Condition="'%(PackageDefinitions.Name)'=='PackagePublisher'" />
-    </ItemGroup>
- 
-    <PropertyGroup>
-      <_PackagePublisherPath>@(PackagePublisherPath)\PackagePublisher.dll</_PackagePublisherPath>
-    </PropertyGroup>
-  </Target>
-
   <Target Name="BuildRepositories"
-     DependsOnTargets="_FilterRepositories;_FindDotNetPath;_ResolvePackagePublisherPath;_GenerateRestoreGraphSpecs;_GenerateBuildGraph;_UpdateNuGetConfig;_CreateRepositoriesListWithCommits">
+     DependsOnTargets="_FilterRepositories;_FindDotNetPath;_GenerateRestoreGraphSpecs;_GenerateBuildGraph;_UpdateNuGetConfig;_CreateRepositoriesListWithCommits">
 
     <PropertyGroup>
       <_BuildRepositoryProperties>
@@ -132,7 +122,7 @@
         _DependencyPackagesDirectory=$(_DependencyPackagesDirectory);
         _RepositoryBuildTargets=$(_RepositoryBuildTargets);
         _RestoreGraphSpecsDirectory=$(_RestoreGraphSpecsDirectory);
-        PackagePublisherPath=$(_PackagePublisherPath)
+        PackagePublisherPath=$(PackagePublisherNetCoreApp)
       </_BuildRepositoryProperties>
 
       <_BuildRepositoryProperties Condition="'$(PublishPackages)'=='true'">