Merge branch 'master' into dev

NuGet · Aug 31, 2016 · deac8c3 · deac8c3
2 parents 1ad8aef + c0fc2d6
commit deac8c3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -10,6 +10,7 @@
   <packageSources>
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
     <add key="nugetbuild" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
+    <add key="dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />

diff --git a/src/NuGetGallery.Operations/NuGetGallery.Operations.csproj b/src/NuGetGallery.Operations/NuGetGallery.Operations.csproj
@@ -176,10 +176,7 @@
     <Reference Include="System.Data.Services.Client" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http">
-      <HintPath>..\..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
@@ -190,10 +187,6 @@
       <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Net.Http.WebRequest">
-      <HintPath>..\..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Spatial, Version=5.6.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/src/NuGetGallery.Operations/packages.config b/src/NuGetGallery.Operations/packages.config
@@ -27,7 +27,7 @@
   <package id="NuGet.Packaging.Core" version="3.5.0-beta-final" targetFramework="net452" />
   <package id="NuGet.Packaging.Core.Types" version="3.5.0-beta-final" targetFramework="net452" />
   <package id="NuGet.Versioning" version="3.5.0-beta-final" targetFramework="net452" />
-  <package id="System.Net.Http" version="2.0.20126.16343" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.3.0-beta-24431-01" targetFramework="net452" />
   <package id="System.Spatial" version="5.6.5-beta" targetFramework="net452" />
   <package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net452" />
 </packages>
diff --git a/tests/NuGetGallery.Facts/App.config b/tests/NuGetGallery.Facts/App.config
@@ -94,7 +94,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

diff --git a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
@@ -252,8 +252,8 @@
     </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll</HintPath>
+    <Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.Http.4.3.0-beta-24431-01\lib\net46\System.Net.Http.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git a/tests/NuGetGallery.Facts/TestUtils/Infrastructure/FeedServiceHelpers.cs b/tests/NuGetGallery.Facts/TestUtils/Infrastructure/FeedServiceHelpers.cs
@@ -150,7 +150,7 @@ public static HttpServer SetupODataServer(TestDependencyResolver dependencyResol
 
             var configuration = new Mock<IGalleryConfigurationService>(MockBehavior.Strict);
             configuration.Setup(c => c.GetSiteRoot(It.IsAny<bool>())).Returns("https://nuget.org/");
-            configuration.Setup(c => c.Features).Returns(new FeatureConfiguration() { FriendlyLicenses = true });
+            configuration.Setup(c => c.Features).Returns(new FeatureConfiguration { FriendlyLicenses = true });
 
             var searchService = new Mock<ISearchService>(MockBehavior.Strict);
             searchService.Setup(s => s.Search(It.IsAny<SearchFilter>())).Returns

diff --git a/tests/NuGetGallery.Facts/packages.config b/tests/NuGetGallery.Facts/packages.config
@@ -54,7 +54,7 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net461" />
   <package id="System.IO" version="4.1.0" targetFramework="net461" />
   <package id="System.Linq" version="4.1.0" targetFramework="net461" />
-  <package id="System.Net.Http" version="4.1.0" targetFramework="net461" />
+  <package id="System.Net.Http" version="4.3.0-beta-24431-01" targetFramework="net461" />
   <package id="System.Net.Primitives" version="4.0.11" targetFramework="net461" />
   <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
   <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />