PR feedback

Author: Christy Henriksson

build.ps1

@@ -10,7 +10,7 @@ param (
     [string]$PackageSuffix,
     [string]$Branch,
     [string]$CommitSHA,
-    [string]$BuildBranch = '306fec22edac68336d7e32124d51248734c3a395'
+    [string]$BuildBranch = 'cb604c2cd1b2f7f71fb574cdda4c83ddb1464cc7'
 )
 
 Set-StrictMode -Version 1.0

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -2,7 +2,6 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Description>Core support library for NuGet Gallery Frontend and Backend</Description>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{097B2CDD-9623-4C34-93C2-D373D51F5B4E}</ProjectGuid>
@@ -20,6 +19,16 @@
     <BuildPackage>true</BuildPackage>
     <TargetFrameworkProfile />
   </PropertyGroup>
+  <PropertyGroup>
+    <Description>Core support library for NuGet Gallery Frontend and Backend</Description>
+    <PackageId Condition="'$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
+    <Authors>.NET Foundation</Authors>
+    <PackageLicenseUrl>https://github.com/NuGet/NuGetGallery/blob/master/LICENSE.txt</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/NuGet/NuGetGallery</PackageProjectUrl>
+    <Copyright>© .NET Foundation. All rights reserved.</Copyright>
+    <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
+    <NoPackageAnalysis Condition="'$(NoPackageAnalysis)' == ''">true</NoPackageAnalysis>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -249,14 +258,11 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Web.Xdt">
-      <Version>2.1.1</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager">
       <Version>3.1.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Build.Tasks.Pack">
-      <Version>5.0.0-preview1.5429</Version>
+      <Version>4.8.0</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Packaging">
@@ -272,18 +278,6 @@
       <Version>7.1.2</Version>
     </PackageReference>
   </ItemGroup>
-  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec">
-    <PropertyGroup>
-      <PackageId Condition="'$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
-      <Title Condition="'$(Title)' == ''">$(PackageId)</Title>
-      <Authors>.NET Foundation</Authors>
-      <PackageLicenseUrl>https://github.com/NuGet/NuGetGallery/blob/master/LICENSE.txt</PackageLicenseUrl>
-      <PackageProjectUrl>https://github.com/NuGet/NuGetGallery</PackageProjectUrl>
-      <Copyright>© .NET Foundation. All rights reserved.</Copyright>
-      <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
-      <NoPackageAnalysis Condition="'$(NoPackageAnalysis)' == ''">true</NoPackageAnalysis>
-    </PropertyGroup>
-  </Target>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <SignPath>..\..\build</SignPath>