Merge pull request #6356 from NuGet/chenriks-deps

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
@@ -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

@@ -12,11 +12,23 @@
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+    <NoWarn>$(NoWarn);NU5104</NoWarn>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <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>
@@ -211,7 +223,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="NuGetGallery.Core.nuspec" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="CoreStrings.resx">
@@ -247,27 +258,22 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Common">
-      <Version>4.8.0-preview4.5287</Version>
+    <PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager">
+      <Version>3.1.0</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Frameworks">
-      <Version>4.8.0-preview4.5287</Version>
+    <PackageReference Include="NuGet.Build.Tasks.Pack">
+      <Version>4.8.0</Version>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Packaging">
       <Version>4.8.0-preview4.5287</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Packaging.Core">
-      <Version>4.8.0-preview4.5287</Version>
-    </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
       <Version>2.28.0-master-37018</Version>
     </PackageReference>
     <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>

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" />