Fix PackageRef dependencies

Author: Christy Henriksson

build.ps1

@@ -93,11 +93,11 @@ Invoke-BuildStep 'Building solution' {
     -ev +BuildErrors
 
 Invoke-BuildStep 'Creating artifacts' {
-        $packageId = 'NuGetGallery.Core'+$PackageSuffix 
-		New-Package (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId $packageId `
-		-ev +BuildErrors
-	}
-	
+    $packageId = 'NuGetGallery.Core'+$PackageSuffix 
+    New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId $packageId `
+    -ev +BuildErrors
+}
+
 Trace-Log ('-' * 60)
 
 ## Calculating Build time

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -2,6 +2,7 @@
 <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>
@@ -12,6 +13,8 @@
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+    <NoWarn>$(NoWarn);NU5104</NoWarn>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <BuildPackage>true</BuildPackage>
@@ -211,7 +214,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="NuGetGallery.Core.nuspec" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="CoreStrings.resx">
@@ -247,16 +249,17 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Common">
-      <Version>4.8.0-preview4.5287</Version>
+    <PackageReference Include="Microsoft.Web.Xdt">
+      <Version>2.1.1</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Frameworks">
-      <Version>4.8.0-preview4.5287</Version>
+    <PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager">
+      <Version>3.1.0</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Packaging">
-      <Version>4.8.0-preview4.5287</Version>
+    <PackageReference Include="NuGet.Build.Tasks.Pack">
+      <Version>5.0.0-preview1.5429</Version>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="NuGet.Packaging.Core">
+    <PackageReference Include="NuGet.Packaging">
       <Version>4.8.0-preview4.5287</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
@@ -265,13 +268,22 @@
     <PackageReference Include="NuGet.Services.Validation.Issues">
       <Version>2.28.0-master-37018</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Versioning">
-      <Version>4.8.0-preview4.5287</Version>
-    </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <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>

src/NuGetGallery.Core/NuGetGallery.Core.nuspec

@@ -110,9 +110,6 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />