From 11c1810faa6a8f5152bd963258d82aa0b874881f Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 21 Apr 2017 08:47:16 -0700
Subject: [PATCH 1/2] Make location of PackagePublisher availabe as an MSbuild
 property

---
 src/PackagePublisher/PackagePublisher.csproj      | 8 ++++++--
 src/PackagePublisher/PackagePublisher.nuspec      | 1 +
 src/PackagePublisher/build/PackagePublisher.props | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/PackagePublisher/build/PackagePublisher.props

diff --git a/src/PackagePublisher/PackagePublisher.csproj b/src/PackagePublisher/PackagePublisher.csproj
index b05ef728e..48c8e38b8 100644
--- a/src/PackagePublisher/PackagePublisher.csproj
+++ b/src/PackagePublisher/PackagePublisher.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
-  
+
   <PropertyGroup>
     <Description>Publishes packages to a feed, with retries.</Description>
     <DebugType>portable</DebugType>
@@ -8,7 +8,11 @@
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <VersionPrefix>1.0.2</VersionPrefix>
   </PropertyGroup>
-  
+
+  <ItemGroup>
+    <Content Include="build\*.props" CopyToPublishDirectory="Always" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(CommandLineUtilsVersion)" PrivateAssets="All" />
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagesVersion)" />
diff --git a/src/PackagePublisher/PackagePublisher.nuspec b/src/PackagePublisher/PackagePublisher.nuspec
index c8729a00b..208e69398 100644
--- a/src/PackagePublisher/PackagePublisher.nuspec
+++ b/src/PackagePublisher/PackagePublisher.nuspec
@@ -8,5 +8,6 @@
   </metadata>
   <files>
     <file src="netcoreapp1.0\" target="/" />
+    <file src="netcoreapp1.0\build\*.targets" target="/build" />
   </files>
 </package>
diff --git a/src/PackagePublisher/build/PackagePublisher.props b/src/PackagePublisher/build/PackagePublisher.props
new file mode 100644
index 000000000..11af1ee50
--- /dev/null
+++ b/src/PackagePublisher/build/PackagePublisher.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <PackagePublisherNetCoreApp>$(MSBuildThisFileDirectory)..\PackagePublisher.dll</PackagePublisherNetCoreApp>
+  </PropertyGroup>
+</Project>

From 851ad61f71ad89335f6eb26a8745ff085dc24ada Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 21 Apr 2017 10:36:30 -0700
Subject: [PATCH 2/2] fixup! Make location of PackagePublisher availabe as an
 MSbuild property

---
 src/PackagePublisher/PackagePublisher.nuspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PackagePublisher/PackagePublisher.nuspec b/src/PackagePublisher/PackagePublisher.nuspec
index 208e69398..c8729a00b 100644
--- a/src/PackagePublisher/PackagePublisher.nuspec
+++ b/src/PackagePublisher/PackagePublisher.nuspec
@@ -8,6 +8,5 @@
   </metadata>
   <files>
     <file src="netcoreapp1.0\" target="/" />
-    <file src="netcoreapp1.0\build\*.targets" target="/build" />
   </files>
 </package>