From 4d35489e851aba2b19dd2374d38e7f39fe56a954 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 17 Jul 2017 11:19:09 -0700
Subject: [PATCH] Use dotnet pack to pack AspNetCore file

---
 Build/repo.targets      | 10 ++++++----
 NuGet.config            |  1 +
 nuget/AspNetCore.csproj |  9 +++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 nuget/AspNetCore.csproj

diff --git a/Build/repo.targets b/Build/repo.targets
index 3abc33ed4a..1d39f35999 100644
--- a/Build/repo.targets
+++ b/Build/repo.targets
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="PackagePublisher" Version="2.0.0-*" />
-    <PackageReference Include="NuGet.CommandLine" Version="$(NuGetCommandLineVersion)" />
   </ItemGroup>
 
   <Target Name="_LocateMSBuildExe">
@@ -35,11 +34,14 @@
 
   <Target Name="PackageProjects">
     <PropertyGroup>
-      <NuGetExePath>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))nuget.commandline\$(NuGetCommandLineVersion)\tools\nuget.exe</NuGetExePath>
-      <NuspecPath>$(RepositoryRoot)nuget\AspNetCore.nuspec</NuspecPath>
+      <PackageVersion>1.0.0-pre-$(BuildNumber)</PackageVersion>
+      <PackageOutputPath>$(ArtifactsDir)build\</PackageOutputPath>
     </PropertyGroup>
 
-    <Exec Command="&quot;$(NuGetExePath)&quot; pack &quot;$(NuspecPath)&quot; -OutputDirectory &quot;$(ArtifactsDir)\build&quot; -prop Version=1.0.0-pre-$(BuildNumber)" />
+      <MSBuild
+        Projects="$(MSBuildThisFileDirectory)../nuget/AspNetCore.csproj"
+        Targets="Pack"
+        Properties="PackageVersion=$(PackageVersion);PackageOutputPath=$(PackageOutputPath)" />
   </Target>
 
   <Target Name="PublishPackage" 
diff --git a/NuGet.config b/NuGet.config
index 6f9f028ca1..f495268808 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <clear />
     <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
     <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
diff --git a/nuget/AspNetCore.csproj b/nuget/AspNetCore.csproj
new file mode 100644
index 0000000000..65727b5103
--- /dev/null
+++ b/nuget/AspNetCore.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.0</TargetFramework>
+    <NuspecFile>$(MSBuildThisFileDirectory)AspNetCore.nuspec</NuspecFile>
+    <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
+  </PropertyGroup>
+
+</Project>