From 6ab4a3967131eb52d7884eb0f6fae5d55dfdf1ca Mon Sep 17 00:00:00 2001
From: Xavier Decoster <xavier.decoster@outlook.com>
Date: Thu, 21 May 2015 17:15:08 +0200
Subject: [PATCH] upgrade to xunit 2.0.0

---
 .nuget/README.md                              |  3 --
 .nuget/packages.config                        |  2 +-
 NuGetGallery.sln.DotSettings                  |  3 +-
 build/NuGetGallery.xunit.targets              |  4 +-
 .../NuGetGallery.Backend.csproj               | 10 ++---
 src/NuGetGallery.Backend/packages.config      |  2 +-
 .../NuGetGallery.Core.csproj                  | 10 ++---
 src/NuGetGallery.Core/packages.config         |  2 +-
 .../NuGetGallery.Operations.csproj            | 12 +++---
 src/NuGetGallery.Operations/packages.config   |  2 +-
 src/NuGetGallery/NuGetGallery.csproj          | 10 ++---
 src/NuGetGallery/packages.config              |  2 +-
 src/galops/galops.csproj                      | 10 ++---
 src/galops/packages.config                    |  2 +-
 .../NuGetGallery.Core.Facts.csproj            | 27 ++++++++-----
 .../Packaging/NupkgFacts.cs                   |  7 ++--
 tests/NuGetGallery.Core.Facts/packages.config | 10 +++--
 .../NormalizeVersionInterceptorFacts.cs       | 15 +++----
 .../Framework/TestContainer.cs                | 12 ++----
 .../Infrastructure/PackageIndexEntityFacts.cs | 30 +++++++-------
 .../NuGetGallery.Facts.csproj                 | 23 ++++++-----
 .../NuGetGallery.Facts.csproj.DotSettings     |  2 +
 .../SemanticVersionExtensionsFacts.cs         |  7 +---
 .../CloudBlobFileStorageServiceFacts.cs       |  9 ++---
 .../FileSystemFileStorageServiceFacts.cs      | 39 +++++++++---------
 .../Services/PackageServiceFacts.cs           | 40 +++++++------------
 tests/NuGetGallery.Facts/packages.config      | 10 +++--
 ...uGetGallery.FunctionalTests.Helpers.csproj |  8 ++--
 .../packages.config                           |  2 +-
 .../NuGetGallery.FunctionalTests.csproj       | 10 ++---
 .../packages.config                           |  2 +-
 31 files changed, 162 insertions(+), 165 deletions(-)
 delete mode 100644 .nuget/README.md
 create mode 100644 tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj.DotSettings

diff --git a/.nuget/README.md b/.nuget/README.md
deleted file mode 100644
index b6e91a3aac..0000000000
--- a/.nuget/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# NuGet Package Restore Support
-
-Support files for NuGet Package Restore.
\ No newline at end of file
diff --git a/.nuget/packages.config b/.nuget/packages.config
index 35a2667d56..4e9a928126 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit.runners" version="2.0.0-beta-build2616" />
+  <package id="xunit.runner.visualstudio" version="2.0.0" />
 </packages>
\ No newline at end of file
diff --git a/NuGetGallery.sln.DotSettings b/NuGetGallery.sln.DotSettings
index f7e7708903..a9a1077374 100644
--- a/NuGetGallery.sln.DotSettings
+++ b/NuGetGallery.sln.DotSettings
@@ -1,3 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) .NET Foundation. All rights reserved.&#xD;
-Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.</s:String>
+	<s:String x:Key="/Default/Housekeeping/ProjectModelSynchronizer/UseMsbuildStrategy/@EntryValue">AUTO</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/build/NuGetGallery.xunit.targets b/build/NuGetGallery.xunit.targets
index 0dbc0dcab5..9da6378bc4 100644
--- a/build/NuGetGallery.xunit.targets
+++ b/build/NuGetGallery.xunit.targets
@@ -1,6 +1,6 @@
 <Project DefaultTargets="RunFacts" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
-		<XunitMsBuildRunner Include="$(MSBuildThisFileDirectory)..\packages\xunit.*\lib\net20\xunit.runner.msbuild.dll" />
+		<XunitMsBuildRunner Include="$(MSBuildThisFileDirectory)..\packages\NuGet.Services.Build.*\tools\xunit.runner.msbuild.dll" />
     </ItemGroup>
     <PropertyGroup>
 	    <BuildDependsOn>
@@ -11,6 +11,6 @@
     <UsingTask TaskName="Xunit.Runner.MSBuild.xunit" AssemblyFile="@(XunitMsBuildRunner)" Condition="Exists('@(XunitMsBuildRunner)')" /> 
     
     <Target Name="RunFacts" Condition="'$(RunFacts)' == 'true' And Exists('@(XunitMsBuildRunner)')" Inputs="$(TargetPath)" Outputs="$(OutputPath)$(MSBuildProjectName).results.xml">
-        <xunit Assembly="$(TargetPath)" Xml="$(OutputPath)$(MSBuildProjectName).results.xml" />
+        <xunit Assemblies="$(TargetPath)" Xml="$(OutputPath)$(MSBuildProjectName).results.xml" />
     </Target>
 </Project>
\ No newline at end of file
diff --git a/src/NuGetGallery.Backend/NuGetGallery.Backend.csproj b/src/NuGetGallery.Backend/NuGetGallery.Backend.csproj
index 83960eda39..2a3a02aaf1 100644
--- a/src/NuGetGallery.Backend/NuGetGallery.Backend.csproj
+++ b/src/NuGetGallery.Backend/NuGetGallery.Backend.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,7 +14,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RoleType>Worker</RoleType>
-    <NuGetPackageImportStamp>0a1c5a02</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>c4645ea7</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -142,8 +142,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props'))" />
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/NuGetGallery.Backend/packages.config b/src/NuGetGallery.Backend/packages.config
index 05a0a77797..fa8063fd67 100644
--- a/src/NuGetGallery.Backend/packages.config
+++ b/src/NuGetGallery.Backend/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.1.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="NLog" version="2.0.0.2000" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.6" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
   <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
   <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
diff --git a/src/NuGetGallery.Core/NuGetGallery.Core.csproj b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
index 366f5c8cf9..ba94bc0093 100644
--- a/src/NuGetGallery.Core/NuGetGallery.Core.csproj
+++ b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,7 +12,7 @@
     <AssemblyName>NuGetGallery.Core</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>b8175cb6</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>c8016e0a</NuGetPackageImportStamp>
     <BuildPackage>true</BuildPackage>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -147,8 +147,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props'))" />
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/NuGetGallery.Core/packages.config b/src/NuGetGallery.Core/packages.config
index d73156ad27..1157f7331a 100644
--- a/src/NuGetGallery.Core/packages.config
+++ b/src/NuGetGallery.Core/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.1.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.5" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.6" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
   <package id="System.Spatial" version="5.6.0" targetFramework="net45" />
   <package id="WindowsAzure.Storage" version="2.1.0.3" targetFramework="net45" />
 </packages>
diff --git a/src/NuGetGallery.Operations/NuGetGallery.Operations.csproj b/src/NuGetGallery.Operations/NuGetGallery.Operations.csproj
index d3c57f4547..041ba99cc9 100644
--- a/src/NuGetGallery.Operations/NuGetGallery.Operations.csproj
+++ b/src/NuGetGallery.Operations/NuGetGallery.Operations.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,8 +14,8 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>946c4ba1</NuGetPackageImportStamp>
-	<SkipValidatePackageReferences>true</SkipValidatePackageReferences>
+    <NuGetPackageImportStamp>9ca5ec3b</NuGetPackageImportStamp>
+    <SkipValidatePackageReferences>true</SkipValidatePackageReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -379,10 +379,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props'))" />
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" />
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/NuGetGallery.Operations/packages.config b/src/NuGetGallery.Operations/packages.config
index ec96eda504..3c92425621 100644
--- a/src/NuGetGallery.Operations/packages.config
+++ b/src/NuGetGallery.Operations/packages.config
@@ -20,7 +20,7 @@
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="NLog" version="2.0.0.2000" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.5" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.6" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
   <package id="System.Net.Http" version="2.0.20126.16343" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.0" targetFramework="net45" />
   <package id="WindowsAzure.Storage" version="2.1.0.3" targetFramework="net45" />
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index 799f697b26..8a3bfe64ce 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -34,7 +34,7 @@
     <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
     <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
     <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>
-    <NuGetPackageImportStamp>061576ae</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>001c21d7</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -1501,13 +1501,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props'))" />
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\build\Microsoft.ApplicationInsights.Agent.Intercept.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\build\Microsoft.ApplicationInsights.Agent.Intercept.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" />
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Import Project="..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets" Condition="Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" />
   <Import Project="..\..\packages\Microsoft.ApplicationInsights.0.16.1-build00418\tools\net40\Microsoft.ApplicationInsights.targets" Condition="Exists('..\..\packages\Microsoft.ApplicationInsights.0.16.1-build00418\tools\net40\Microsoft.ApplicationInsights.targets')" />
@@ -1516,4 +1515,5 @@
     <Error Condition="Exists('..\..\packages\Microsoft.ApplicationInsights.0.16.1-build00418\tools\net40\Microsoft.ApplicationInsights.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." />
   </Target>
   <Import Project="..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\build\Microsoft.ApplicationInsights.Agent.Intercept.targets" Condition="Exists('..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\build\Microsoft.ApplicationInsights.Agent.Intercept.targets')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/NuGetGallery/packages.config b/src/NuGetGallery/packages.config
index eeb5999c15..6cc262d4c3 100644
--- a/src/NuGetGallery/packages.config
+++ b/src/NuGetGallery/packages.config
@@ -61,7 +61,7 @@
   <package id="Ninject.MVC3" version="3.0.0.6" targetFramework="net45" />
   <package id="Ninject.Web.Common" version="3.0.0.7" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.5" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.6" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
   <package id="NuGet.Services.Platform.Client" version="3.0.29-r-master" targetFramework="net45" />
   <package id="ODataNullPropagationVisitor" version="0.5.4237.2641" />
   <package id="Owin" version="1.0" targetFramework="net45" />
diff --git a/src/galops/galops.csproj b/src/galops/galops.csproj
index d1430f42c9..39fd71bd28 100644
--- a/src/galops/galops.csproj
+++ b/src/galops/galops.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>23fbd333</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>f4c8254d</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -103,8 +103,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props'))" />
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/galops/packages.config b/src/galops/packages.config
index 7077cf06af..e03c3cbdde 100644
--- a/src/galops/packages.config
+++ b/src/galops/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.1.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="NLog" version="2.0.0.2000" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.6" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
   <package id="System.Spatial" version="5.6.0" targetFramework="net45" />
   <package id="WindowsAzure.Storage" version="2.1.0.3" targetFramework="net45" />
 </packages>
diff --git a/tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj b/tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj
index 6e500ac7e8..ae86581490 100644
--- a/tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj
+++ b/tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,7 +17,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <DownloadNuGetExe>true</DownloadNuGetExe>
-    <NuGetPackageImportStamp>11e46af7</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>69a2ed2c</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -83,11 +85,14 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit">
-      <HintPath>..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
+    <Reference Include="xunit.abstractions">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.extensions">
-      <HintPath>..\..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
+    <Reference Include="xunit.assert">
+      <HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.core">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -118,11 +123,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props'))" />
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/tests/NuGetGallery.Core.Facts/Packaging/NupkgFacts.cs b/tests/NuGetGallery.Core.Facts/Packaging/NupkgFacts.cs
index c36be03830..f65252a58c 100644
--- a/tests/NuGetGallery.Core.Facts/Packaging/NupkgFacts.cs
+++ b/tests/NuGetGallery.Core.Facts/Packaging/NupkgFacts.cs
@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -7,9 +8,7 @@
 using System.Runtime.Versioning;
 using Moq;
 using NuGet;
-using NuGetGallery.Packaging;
 using Xunit;
-using Xunit.Extensions;
 
 namespace NuGetGallery.Packaging
 {
@@ -245,7 +244,7 @@ public void ReturnsFrameworkAssemblyReferenceFrameworksIfNoFileFrameworks()
                 // Arrange
                 var fakeStream = CreateTestPackageStream(b =>
                 {
-                    b.FrameworkReferences.Add(new FrameworkAssemblyReference("foo", new[] { 
+                    b.FrameworkReferences.Add(new FrameworkAssemblyReference("foo", new[] {
                         VersionUtility.ParseFrameworkName("net45"),
                         VersionUtility.ParseFrameworkName("sl-wp70")
                     }));
@@ -263,7 +262,7 @@ public void ReturnsFrameworkAssemblyReferenceFrameworksIfNoFileFrameworks()
             }
 
             [Theory]
-            [PropertyData("AllTheFrameworks"/*!*/)]
+            [MemberData("AllTheFrameworks"/*!*/)]
             public void ReturnsFilePathFrameworksIfPresent(string directoryName, FrameworkName fxName)
             {
                 // Arrange
diff --git a/tests/NuGetGallery.Core.Facts/packages.config b/tests/NuGetGallery.Core.Facts/packages.config
index 0daebc581b..4bd470e6a6 100644
--- a/tests/NuGetGallery.Core.Facts/packages.config
+++ b/tests/NuGetGallery.Core.Facts/packages.config
@@ -7,8 +7,12 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
   <package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.5" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.6" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
   <package id="System.Spatial" version="5.6.0" targetFramework="net45" />
-  <package id="xunit" version="1.9.2" targetFramework="net45" />
-  <package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
+  <package id="xunit" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.extensions" version="2.0.0" targetFramework="net45" />
 </packages>
diff --git a/tests/NuGetGallery.Facts/DataServices/NormalizeVersionInterceptorFacts.cs b/tests/NuGetGallery.Facts/DataServices/NormalizeVersionInterceptorFacts.cs
index 9562751c50..0acd1309d9 100644
--- a/tests/NuGetGallery.Facts/DataServices/NormalizeVersionInterceptorFacts.cs
+++ b/tests/NuGetGallery.Facts/DataServices/NormalizeVersionInterceptorFacts.cs
@@ -1,20 +1,17 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
 using Xunit;
-using Xunit.Extensions;
 
 namespace NuGetGallery.DataServices
 {
     public class NormalizeVersionInterceptorFacts
     {
         [Theory]
-        [PropertyData("NonBinaryExpressions")]
+        [MemberData("NonBinaryExpressions")]
         public void ItReturnsNonBinaryExpressions(Expression expr)
         {
             // Arrange
@@ -28,7 +25,7 @@ public void ItReturnsNonBinaryExpressions(Expression expr)
         }
 
         [Theory]
-        [PropertyData("NonEqualityCheckExpressions")]
+        [MemberData("NonEqualityCheckExpressions")]
         public void ItReturnsNonEqualityCheckExpressions(Expression expr)
         {
             // Arrange
@@ -42,7 +39,7 @@ public void ItReturnsNonEqualityCheckExpressions(Expression expr)
         }
 
         [Theory]
-        [PropertyData("NonMatchingExpressions")]
+        [MemberData("NonMatchingExpressions")]
         public void ItReturnsNonMatchingExpressions(Expression expr)
         {
             // Arrange
@@ -67,7 +64,7 @@ public void ItRewritesEqualityCheckOfVersionColumnAgainstConstantString()
 
             // Assert
             Assert.Equal(
-                ((Expression<Func<V2FeedPackage, bool>>)(p => "1.0.2" == p.NormalizedVersion)).ToString(), 
+                ((Expression<Func<V2FeedPackage, bool>>)(p => "1.0.2" == p.NormalizedVersion)).ToString(),
                 result.ToString());
         }
 
@@ -83,7 +80,7 @@ public void ItRewritesEqualityCheckOfConstantStringAgainstVersionColumn()
 
             // Assert
             Assert.Equal(
-                ((Expression<Func<V2FeedPackage, bool>>)(p => "1.0.2" == p.NormalizedVersion)).ToString(), 
+                ((Expression<Func<V2FeedPackage, bool>>)(p => "1.0.2" == p.NormalizedVersion)).ToString(),
                 result.ToString());
         }
 
diff --git a/tests/NuGetGallery.Facts/Framework/TestContainer.cs b/tests/NuGetGallery.Facts/Framework/TestContainer.cs
index 23779cf554..76a797f144 100644
--- a/tests/NuGetGallery.Facts/Framework/TestContainer.cs
+++ b/tests/NuGetGallery.Facts/Framework/TestContainer.cs
@@ -1,23 +1,19 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Microsoft.Owin;
 using Moq;
 using Ninject;
-using Ninject.Modules;
 using NuGetGallery.Configuration;
-using Xunit.Extensions;
 
 namespace NuGetGallery.Framework
 {
-    public class TestContainer : TestClass, IDisposable
+    public class TestContainer : IDisposable
     {
         public IKernel Kernel { get; private set; }
 
@@ -37,7 +33,7 @@ protected TController GetController<TController>() where TController : Controlle
             var c = Kernel.Get<TController>();
             c.ControllerContext = new ControllerContext(
                 new RequestContext(Kernel.Get<HttpContextBase>(), new RouteData()), c);
-            
+
             var routeCollection = new RouteCollection();
             Routes.RegisterRoutes(routeCollection);
             c.Url = new UrlHelper(c.ControllerContext.RequestContext, routeCollection);
@@ -48,7 +44,7 @@ protected TController GetController<TController>() where TController : Controlle
                 appCtrl.OwinContext = Kernel.Get<IOwinContext>();
                 appCtrl.NuGetContext.Config = Kernel.Get<ConfigurationService>();
             }
-            
+
             return c;
         }
 
diff --git a/tests/NuGetGallery.Facts/Infrastructure/PackageIndexEntityFacts.cs b/tests/NuGetGallery.Facts/Infrastructure/PackageIndexEntityFacts.cs
index 4b8a7863f7..88ed98ad20 100644
--- a/tests/NuGetGallery.Facts/Infrastructure/PackageIndexEntityFacts.cs
+++ b/tests/NuGetGallery.Facts/Infrastructure/PackageIndexEntityFacts.cs
@@ -1,29 +1,27 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System.Collections.Generic;
 using System.Linq;
 using Xunit;
-using Xunit.Extensions;
 
 namespace NuGetGallery.Infrastructure
 {
     public class PackageIndexEntityFacts
     {
         [Theory]
-        [InlineData("NHibernate", new[] { "NHibernate" })]
-        [InlineData("NUnit", new[] { "NUnit" })]
-        [InlineData("EntityFramework", new[] { "EntityFramework", "Framework", "Entity" })]
-        [InlineData("Sys-netFX", new[] { "Sys-netFX", "Sys", "netFX" })]
-        [InlineData("xUnit", new[] { "xUnit" })]
-        [InlineData("jQueryUI", new[] { "jQueryUI" })]
-        [InlineData("jQuery-UI", new[] { "jQuery-UI", "jQuery", "UI" })]
-        [InlineData("NuGetPowerTools", new[] { "NuGetPowerTools", "NuGet", "Power", "Tools" })]
-        [InlineData("microsoft-web-helpers", new[] { "microsoft-web-helpers", "microsoft", "web", "helpers" })]
-        [InlineData("EntityFramework.sample", new[] { "EntityFramework.sample", "EntityFramework", "sample", "Framework", "Entity" })]
-        [InlineData("SignalR.MicroSliver", new[] { "SignalR.MicroSliver", "SignalR", "MicroSliver", "Micro", "Sliver" })]
-        [InlineData("ABCMicroFramework", new[] { "ABCMicroFramework", "ABC", "Micro", "Framework" })]
-        [InlineData("SignalR.Hosting.AspNet", new[] { "SignalR.Hosting.AspNet", "SignalR", "Hosting", "AspNet", "Asp", "Net" })]
-        public void CamelCaseTokenizer(string term, IEnumerable<string> tokens)
+        [InlineData("NHibernate", new [] { "NHibernate" })]
+        [InlineData("NUnit", new [] { "NUnit" })]
+        [InlineData("EntityFramework", new [] { "EntityFramework", "Framework", "Entity" })]
+        [InlineData("Sys-netFX", new [] { "Sys-netFX", "Sys", "netFX" })]
+        [InlineData("xUnit", new [] { "xUnit" })]
+        [InlineData("jQueryUI", new [] { "jQueryUI" })]
+        [InlineData("jQuery-UI", new [] { "jQuery-UI", "jQuery", "UI" })]
+        [InlineData("NuGetPowerTools", new [] { "NuGetPowerTools", "NuGet", "Power", "Tools" })]
+        [InlineData("microsoft-web-helpers", new [] { "microsoft-web-helpers", "microsoft", "web", "helpers" })]
+        [InlineData("EntityFramework.sample", new [] { "EntityFramework.sample", "EntityFramework", "sample", "Framework", "Entity" })]
+        [InlineData("SignalR.MicroSliver", new [] { "SignalR.MicroSliver", "SignalR", "MicroSliver", "Micro", "Sliver" })]
+        [InlineData("ABCMicroFramework", new [] { "ABCMicroFramework", "ABC", "Micro", "Framework" })]
+        [InlineData("SignalR.Hosting.AspNet", new [] { "SignalR.Hosting.AspNet", "SignalR", "Hosting", "AspNet", "Asp", "Net" })]
+        public void CamelCaseTokenizer(string term, string[] tokens)
         {
             // Act
             var result = PackageIndexEntity.TokenizeId(term);
diff --git a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
index 5e38b1065c..a43e46d7ed 100644
--- a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
+++ b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <DownloadNuGetExe>true</DownloadNuGetExe>
-    <NuGetPackageImportStamp>9e89e6f3</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>da891f79</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -200,11 +201,14 @@
     <Reference Include="WebBackgrounder.EntityFramework, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\WebBackgrounder.EntityFramework.0.1\lib\net40\WebBackgrounder.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="xunit">
-      <HintPath>..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
+    <Reference Include="xunit.abstractions">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.extensions">
-      <HintPath>..\..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
+    <Reference Include="xunit.assert">
+      <HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.core">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -308,8 +312,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.props'))" />
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.6\build\NuGet.Services.Build.targets')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj.DotSettings b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj.DotSettings
new file mode 100644
index 0000000000..d3ee2fe408
--- /dev/null
+++ b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/tests/NuGetGallery.Facts/SemanticVersionExtensionsFacts.cs b/tests/NuGetGallery.Facts/SemanticVersionExtensionsFacts.cs
index 3f024d7e47..642896b772 100644
--- a/tests/NuGetGallery.Facts/SemanticVersionExtensionsFacts.cs
+++ b/tests/NuGetGallery.Facts/SemanticVersionExtensionsFacts.cs
@@ -1,13 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NuGet;
 using Xunit;
-using Xunit.Extensions;
 
 namespace NuGetGallery
 {
@@ -48,7 +45,7 @@ public static IEnumerable<object[]> Data
             }
 
             [Theory]
-            [PropertyData("Data")]
+            [MemberData("Data")]
             public void NormalizesStringOutputForDisplayAndUniqueness(SemanticVersion version, string expected)
             {
                 Assert.Equal(expected, version.ToNormalizedString(), StringComparer.Ordinal);
diff --git a/tests/NuGetGallery.Facts/Services/CloudBlobFileStorageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/CloudBlobFileStorageServiceFacts.cs
index 70d954eff8..675f94f2a7 100644
--- a/tests/NuGetGallery.Facts/Services/CloudBlobFileStorageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/CloudBlobFileStorageServiceFacts.cs
@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,7 +15,7 @@
 using Moq;
 using NuGetGallery.Configuration;
 using Xunit;
-using Xunit.Extensions;
+using Xunit.Sdk;
 
 namespace NuGetGallery
 {
@@ -46,9 +47,7 @@ public FolderNamesDataAttribute(bool includePermissions = false)
 
             private bool IncludePermissions { get; set; }
 
-            public override IEnumerable<object[]> GetData(
-                MethodInfo methodUnderTest,
-                Type[] parameterTypes)
+            public override IEnumerable<object[]> GetData(MethodInfo testMethod)
             {
                 var folderNames = new List<object[]>
                     {
@@ -269,7 +268,7 @@ public async Task WillDownloadTheFile(string folderName)
             {
                 var fakeBlobClient = new Mock<ICloudBlobClient>();
                 var fakeBlobContainer = new Mock<ICloudBlobContainer>();
-                
+
                 var fakeBlob = new Mock<ISimpleCloudBlob>();
 
                 fakeBlobClient.Setup(x => x.GetContainerReference(It.IsAny<string>()))
diff --git a/tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs
index 8ebe85a982..4e539aaf83 100644
--- a/tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/FileSystemFileStorageServiceFacts.cs
@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -7,14 +8,12 @@
 using Moq;
 using NuGetGallery.Configuration;
 using Xunit;
-using Xunit.Extensions;
 
 namespace NuGetGallery
 {
     public class FileSystemFileStorgeServiceFacts
     {
         private static readonly Uri HttpRequestUrl = new Uri("http://nuget.org/something");
-        private static readonly Uri HttpsRequestUrl = new Uri("https://nuget.org/something");
 
         private const string FakeConfiguredFileStorageDirectory = "theFileStorageDirectory";
 
@@ -49,11 +48,11 @@ public class TheCreateDownloadFileActionResultMethod
             [Theory]
             [InlineData(null)]
             [InlineData("")]
-            public void WillThrowIfFolderNameIsNull(string folderName)
+            public async Task WillThrowIfFolderNameIsNull(string folderName)
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(
                     () => service.CreateDownloadFileActionResultAsync(
                         HttpRequestUrl,
                         folderName,
@@ -65,11 +64,11 @@ public void WillThrowIfFolderNameIsNull(string folderName)
             [Theory]
             [InlineData(null)]
             [InlineData("")]
-            public void WillThrowIfFileNameIsNull(string fileName)
+            public async Task WillThrowIfFileNameIsNull(string fileName)
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(
                     () => service.CreateDownloadFileActionResultAsync(
                         HttpRequestUrl,
                         Constants.PackagesFolderName,
@@ -133,11 +132,11 @@ public class TheDeleteFileMethod
             [Theory]
             [InlineData(null)]
             [InlineData("")]
-            public void WillThrowIfFolderNameIsNull(string folderName)
+            public async Task WillThrowIfFolderNameIsNull(string folderName)
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(
                     () => service.DeleteFileAsync(
                         folderName,
                         "theFileName"));
@@ -148,11 +147,11 @@ public void WillThrowIfFolderNameIsNull(string folderName)
             [Theory]
             [InlineData(null)]
             [InlineData("")]
-            public void WillThrowIfFileNameIsNull(string fileName)
+            public async Task WillThrowIfFileNameIsNull(string fileName)
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(
                     () => service.DeleteFileAsync(
                         Constants.PackagesFolderName,
                         fileName));
@@ -194,11 +193,11 @@ public class TheGetFileMethod
             [Theory]
             [InlineData(null)]
             [InlineData("")]
-            public void WillThrowIfFolderNameIsNull(string folderName)
+            public async Task WillThrowIfFolderNameIsNull(string folderName)
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(
                     () => service.GetFileAsync(
                         folderName,
                         "theFileName"));
@@ -209,11 +208,11 @@ public void WillThrowIfFolderNameIsNull(string folderName)
             [Theory]
             [InlineData(null)]
             [InlineData("")]
-            public void WillThrowIfFileNameIsNull(string fileName)
+            public async Task WillThrowIfFileNameIsNull(string fileName)
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(
                     () => service.GetFileAsync(
                         Constants.PackagesFolderName,
                         fileName));
@@ -289,11 +288,11 @@ public class TheSaveFileMethod
             [Theory]
             [InlineData(null)]
             [InlineData("")]
-            public void WillThrowIfFolderNameIsNull(string folderName)
+            public async Task WillThrowIfFolderNameIsNull(string folderName)
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(() => service.SaveFileAsync(folderName, "theFileName", CreateFileStream()));
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.SaveFileAsync(folderName, "theFileName", CreateFileStream()));
 
                 Assert.Equal("folderName", ex.ParamName);
             }
@@ -301,21 +300,21 @@ public void WillThrowIfFolderNameIsNull(string folderName)
             [Theory]
             [InlineData(null)]
             [InlineData("")]
-            public void WillThrowIfFileNameIsNull(string fileName)
+            public async Task WillThrowIfFileNameIsNull(string fileName)
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(() => service.SaveFileAsync("theFolderName", fileName, CreateFileStream()));
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.SaveFileAsync("theFolderName", fileName, CreateFileStream()));
 
                 Assert.Equal("fileName", ex.ParamName);
             }
 
             [Fact]
-            public void WillThrowIfFileStreamIsNull()
+            public async Task WillThrowIfFileStreamIsNull()
             {
                 var service = CreateService();
 
-                var ex = Assert.Throws<ArgumentNullException>(() => service.SaveFileAsync("theFolderName", "theFileName", null));
+                var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => service.SaveFileAsync("theFolderName", "theFileName", null));
 
                 Assert.Equal("packageFile", ex.ParamName);
             }
diff --git a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
index 1d116b8d8b..65628582bd 100644
--- a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
@@ -1,31 +1,21 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.Versioning;
-using System.Threading.Tasks;
 using Moq;
 using NuGet;
 using NuGetGallery.Framework;
 using NuGetGallery.Packaging;
 using Xunit;
-using Xunit.Extensions;
 
 namespace NuGetGallery
 {
     public class PackageServiceFacts
     {
-        private static Package CreatePackage(string id, string version)
-        {
-            return new Package
-                {
-                    PackageRegistration = new PackageRegistration { Id = id },
-                    Version = version,
-                };
-        }
-
         private static Mock<INupkg> CreateNuGetPackage(Action<Mock<IPackageMetadata>> setupMetadata = null)
         {
             var nugetPackage = new Mock<INupkg>();
@@ -84,11 +74,11 @@ private static Mock<INupkg> CreateNuGetPackage(Action<Mock<IPackageMetadata>> se
         }
 
         private static IPackageService CreateService(
-            Mock<IEntityRepository<PackageRegistration>> packageRegistrationRepository = null, 
-            Mock<IEntityRepository<Package>> packageRepository = null, 
-            Mock<IEntityRepository<PackageStatistics>> packageStatsRepo = null, 
-            Mock<IEntityRepository<PackageOwnerRequest>> packageOwnerRequestRepo = null, 
-            Mock<IIndexingService> indexingService = null, 
+            Mock<IEntityRepository<PackageRegistration>> packageRegistrationRepository = null,
+            Mock<IEntityRepository<Package>> packageRepository = null,
+            Mock<IEntityRepository<PackageStatistics>> packageStatsRepo = null,
+            Mock<IEntityRepository<PackageOwnerRequest>> packageOwnerRequestRepo = null,
+            Mock<IIndexingService> indexingService = null,
             Action<Mock<PackageService>> setup = null)
         {
             packageRegistrationRepository = packageRegistrationRepository ?? new Mock<IEntityRepository<PackageRegistration>>();
@@ -320,7 +310,7 @@ public void WillCreateANewPackageRegistrationUsingTheNugetPackIdWhenOneDoesNotAl
                     {
                         mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null);
                     });
-                
+
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
@@ -355,8 +345,8 @@ public void WillReadThePropertiesFromTheNuGetPackageWhenCreatingANewPackage()
 
                 var package = service.CreatePackage(nugetPackage.Object, currentUser);
 
-                // Yes, I know this is a lot of asserts. Yes, I know I broke the golden, one assert per test rule. 
-                // That said, it's still asserting one "thing": that the package data was read. 
+                // Yes, I know this is a lot of asserts. Yes, I know I broke the golden, one assert per test rule.
+                // That said, it's still asserting one "thing": that the package data was read.
                 // I'm sorry, but I just can't imagine adding a test per property.
                 // Note that there is no assertion on package identifier, because that's at the package registration level (and covered in another test).
                 Assert.Equal("01.0.42.0", package.Version);
@@ -649,7 +639,7 @@ private void WillThrowIfTheVersionIsLongerThan64Characters()
             {
                 var service = CreateService();
                 var versionString = "1.0.0-".PadRight(65, 'a');
-                var nugetPackage = 
+                var nugetPackage =
                     CreateNuGetPackage(m => m.Setup(x => x.Version).Returns(SemanticVersion.Parse(versionString)));
 
                 var ex = Assert.Throws<EntityException>(() => service.CreatePackage(nugetPackage.Object, null));
@@ -805,7 +795,7 @@ private void WillThrowIfTheNuGetPackageTagsIsLongerThan4000()
             private void WillThrowIfTheNuGetPackageTitleIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage =  CreateNuGetPackage(m => m.Setup(x => x.Title).Returns("theTitle".PadRight(4001, '_')));
+                var nugetPackage = CreateNuGetPackage(m => m.Setup(x => x.Title).Returns("theTitle".PadRight(4001, '_')));
 
                 var ex = Assert.Throws<EntityException>(() => service.CreatePackage(nugetPackage.Object, null));
 
@@ -817,7 +807,7 @@ private void WillThrowIfTheNuGetPackageLanguageIsLongerThan20()
             {
                 // Arrange
                 var service = CreateService();
-                var nugetPackage =  CreateNuGetPackage(m => m.Setup(x => x.Language).Returns(new string('a', 21)));
+                var nugetPackage = CreateNuGetPackage(m => m.Setup(x => x.Language).Returns(new string('a', 21)));
 
                 // Act
                 var ex = Assert.Throws<EntityException>(() => service.CreatePackage(nugetPackage.Object, null));
@@ -1059,7 +1049,7 @@ public void ReturnsTheRequestedPackageVersion()
                             new Exception("This should not be called when the version is specified."));
                     });
 
-                Assert.DoesNotThrow(() => service.FindPackageByIdAndVersion("theId", "1.0.42"));
+                service.FindPackageByIdAndVersion("theId", "1.0.42");
 
                 // Nothing to assert because it's too complicated to test the actual LINQ expression.
                 // What we're testing via the throw above is that it didn't load the registration and get the latest version.
@@ -1169,7 +1159,7 @@ public class TheFindPackagesByOwnerMethod : TestContainer
             public void ReturnsAListedPackage()
             {
                 var owner = new User { Username = "someone" };
-                var packageRegistration = new PackageRegistration { Id = "theId", Owners = { owner }};
+                var packageRegistration = new PackageRegistration { Id = "theId", Owners = { owner } };
                 var package = new Package { Version = "1.0", PackageRegistration = packageRegistration, Listed = true, IsLatest = true, IsLatestStable = true };
                 packageRegistration.Packages.Add(package);
 
@@ -1795,7 +1785,7 @@ public void SetsHideLicenseReportTrueWhenVisibleFalse()
                 {
                     PackageRegistration = new PackageRegistration { Id = "Foo" },
                     Version = "1.0",
-                    HideLicenseReport = false 
+                    HideLicenseReport = false
                 };
                 var packageRepository = new Mock<IEntityRepository<Package>>();
                 var service = CreateService(packageRepository: packageRepository);
diff --git a/tests/NuGetGallery.Facts/packages.config b/tests/NuGetGallery.Facts/packages.config
index 8c0c95d435..dc77ef595a 100644
--- a/tests/NuGetGallery.Facts/packages.config
+++ b/tests/NuGetGallery.Facts/packages.config
@@ -29,7 +29,7 @@
   <package id="Ninject.MVC3" version="3.0.0.6" targetFramework="net45" />
   <package id="Ninject.Web.Common" version="3.0.0.7" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.5" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.6" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="PoliteCaptcha" version="0.4.0.0" targetFramework="net45" />
   <package id="recaptcha" version="1.0.5.0" targetFramework="net45" />
@@ -39,7 +39,11 @@
   <package id="WebBackgrounder" version="0.2.0" targetFramework="net40" />
   <package id="WebBackgrounder.EntityFramework" version="0.1" />
   <package id="WindowsAzure.Storage" version="2.1.0.3" targetFramework="net45" />
-  <package id="xunit" version="1.9.2" targetFramework="net45" />
-  <package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
+  <package id="xunit" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.extensions" version="2.0.0" targetFramework="net45" />
 </packages>
 
diff --git a/tests/NuGetGallery.FunctionalTests.Helpers/NuGetGallery.FunctionalTests.Helpers.csproj b/tests/NuGetGallery.FunctionalTests.Helpers/NuGetGallery.FunctionalTests.Helpers.csproj
index 425e4ecb16..5ff752aedb 100644
--- a/tests/NuGetGallery.FunctionalTests.Helpers/NuGetGallery.FunctionalTests.Helpers.csproj
+++ b/tests/NuGetGallery.FunctionalTests.Helpers/NuGetGallery.FunctionalTests.Helpers.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.4-rel-3\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -17,7 +17,7 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <NuGetPackageImportStamp>18f35a32</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>db0348d8</NuGetPackageImportStamp>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -99,10 +99,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.props'))" />
     <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
   <Import Project="..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.targets" Condition="Exists('..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.targets')" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/tests/NuGetGallery.FunctionalTests.Helpers/packages.config b/tests/NuGetGallery.FunctionalTests.Helpers/packages.config
index f7c628818d..78c9a1fdf1 100644
--- a/tests/NuGetGallery.FunctionalTests.Helpers/packages.config
+++ b/tests/NuGetGallery.FunctionalTests.Helpers/packages.config
@@ -4,5 +4,5 @@
   <package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.1" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.4-rel-4" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
 </packages>
diff --git a/tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj b/tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj
index dfea196334..9345f3570f 100644
--- a/tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj
+++ b/tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.props')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -25,7 +25,7 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
-    <NuGetPackageImportStamp>61d331d9</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>baccc645</NuGetPackageImportStamp>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -154,10 +154,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.props'))" />
-    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.props'))" />
+    <Error Condition="!Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.4-rel-4\build\NuGet.Services.Build.targets')" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Project="..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets" Condition="Exists('..\..\packages\NuGet.Services.Build.3.0.8\build\NuGet.Services.Build.targets')" />
 </Project>
\ No newline at end of file
diff --git a/tests/NuGetGallery.FunctionalTests/packages.config b/tests/NuGetGallery.FunctionalTests/packages.config
index 6451fa6623..f0f87be51a 100644
--- a/tests/NuGetGallery.FunctionalTests/packages.config
+++ b/tests/NuGetGallery.FunctionalTests/packages.config
@@ -4,5 +4,5 @@
   <package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.1" targetFramework="net45" />
-  <package id="NuGet.Services.Build" version="3.0.4-rel-4" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
 </packages>