From 24f09551d9b4c2b4fceb4f4d69bcd3050c555d27 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 28 Jul 2017 17:17:26 -0700
Subject: [PATCH] Remove usage of PackagePublisher

---
 build/common.props                            |  6 ---
 build/dependencies.props                      | 11 ++----
 build/repo.targets                            | 38 ++++++++-----------
 .../AspNetCoreModule.Test.csproj              |  7 +---
 4 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/build/common.props b/build/common.props
index bb6d90a0c1..940c1db088 100644
--- a/build/common.props
+++ b/build/common.props
@@ -20,10 +20,4 @@
     <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
   </ItemGroup>
 
-<!--
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
-    <PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
-  </ItemGroup>
--->
-
 </Project>
diff --git a/build/dependencies.props b/build/dependencies.props
index 8c81df7f34..72812e4125 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,11 +1,8 @@
 <Project>
   <PropertyGroup>
     <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
-    <CoreFxVersion>4.3.0</CoreFxVersion>
-    <InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
-    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
-    <TestSdkVersion>15.0.0</TestSdkVersion>
-    <XunitVersion>2.2.0</XunitVersion>
+    <InternalAspNetCoreSdkVersion>2.1.1-*</InternalAspNetCoreSdkVersion>
+    <TestSdkVersion>15.3.0-*</TestSdkVersion>
+    <XunitVersion>2.3.0-beta2-*</XunitVersion>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/repo.targets b/build/repo.targets
index ca7bf29eb8..0faa63a2b7 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -1,15 +1,9 @@
 <Project>
   <PropertyGroup>
-    <MicrosoftCommonTargetsImported>true</MicrosoftCommonTargetsImported>
-    <VerifyDependsOn>$(VerifyDependsOn);PublishPackage</VerifyDependsOn>
     <PublishFeed>https://dotnet.myget.org/F/aspnetcoremodule/api/v2/package</PublishFeed>
-    <NuGetCommandLineVersion>3.5.0</NuGetCommandLineVersion>
+    <VerifyDependsOn>$(VerifyDependsOn);PublishPackage</VerifyDependsOn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="PackagePublisher" Version="2.0.0-*" />
-  </ItemGroup>
-
   <Target Name="_LocateMSBuildExe">
     <ItemGroup>
       <MSBuild15ExePaths Include="$(MSBuildProgramFiles32)\Microsoft Visual Studio\**\MSBuild\15.0\Bin\MSBuild.exe" />
@@ -35,25 +29,23 @@
   <Target Name="PackageProjects">
     <PropertyGroup>
       <PackageVersion>1.0.0-pre-$(BuildNumber)</PackageVersion>
-      <PackageOutputPath>$(ArtifactsDir)build\</PackageOutputPath>
     </PropertyGroup>
 
-      <MSBuild
-        Projects="$(MSBuildThisFileDirectory)../nuget/AspNetCore.csproj"
-        Targets="Restore;Pack"
-        Properties="PackageVersion=$(PackageVersion);PackageOutputPath=$(PackageOutputPath)" />
+    <MSBuild
+      Projects="$(MSBuildThisFileDirectory)../nuget/AspNetCore.csproj"
+      Targets="Restore;Pack"
+      Properties="PackageVersion=$(PackageVersion);PackageOutputPath=$(BuildDir)" />
   </Target>
 
-  <Target Name="PublishPackage" 
-    DependsOnTargets="_FindDotNetPath"
-    Condition="'$(PublishPackage)'=='true'">
-    
-    <Exec Command="&quot;$(DotNetPath)&quot; $(PackagePublisherNetCoreApp) -d &quot;$(ArtifactsDir)\build&quot; -f $(PublishFeed)" />
+  <Target Name="PublishPackage" Condition="'$(PublishPackage)'=='true'">
+    <ItemGroup>
+      <PackagesToPush Include="$(BuildDir)*.nupkg" />
+    </ItemGroup>
+
+    <PushNuGetPackages
+      Packages="@(PackagesToPush)"
+      Feed="$(PublishFeed)"
+      ApiKey="$(APIKey)" />
   </Target>
 
-  <Target Name="_FindDotNetPath">
-    <GetDotNetHost>
-      <Output TaskParameter="ExecutablePath" PropertyName="DotNetPath" />
-    </GetDotNetHost>
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj b/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj
index 54f1e9c3ff..8ed0ec821d 100644
--- a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj
+++ b/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj
@@ -6,7 +6,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <None Remove="_app._config" />
   </ItemGroup>
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Net.Http.Headers" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />   
+    <PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
   </ItemGroup>
 
   <ItemGroup>
@@ -48,7 +48,4 @@
     <Reference Include="System.Management.Automation" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>