From ef725a0a2c9170fa02ae351c6c4a04671f13a59f Mon Sep 17 00:00:00 2001
From: Mathew Charles <mathewc@microsoft.com>
Date: Wed, 8 Jul 2015 12:05:41 -0700
Subject: [PATCH] Removing uneeded/obsolete TestCommon nuget packaging

---
 WebJobs.sln                                   |  9 +---
 packages/repositories.config                  |  2 -
 .../WebJobs.Perf.csproj                       | 10 +++-
 .../packages.config                           |  3 ++
 test/Packages/Packages.csproj                 | 51 -------------------
 test/Packages/packages.config                 |  4 --
 6 files changed, 13 insertions(+), 66 deletions(-)
 delete mode 100644 test/Packages/Packages.csproj
 delete mode 100644 test/Packages/packages.config

diff --git a/WebJobs.sln b/WebJobs.sln
index 461cd1df8..c1d3c5e59 100644
--- a/WebJobs.sln
+++ b/WebJobs.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{639967B0-0544-4C52-94AC-9A3D25E33256}"
 EndProject
@@ -46,8 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobs.ServiceBus.UnitTest
 		{4A832C21-66EA-4DE4-8124-F27F8900CBA9} = {4A832C21-66EA-4DE4-8124-F27F8900CBA9}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packages", "test\Packages\Packages.csproj", "{0AFF4B92-6E8C-456B-A3F8-BF76CE55FFDF}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobs.Host.FunctionalTests", "test\Microsoft.Azure.WebJobs.Host.FunctionalTests\WebJobs.Host.FunctionalTests.csproj", "{C6B834AB-7B6A-47AE-A7C3-C102B0C861FF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobs.Storage.IntegrationTests", "test\Microsoft.Azure.WebJobs.Storage.IntegrationTests\WebJobs.Storage.IntegrationTests.csproj", "{31BAB10E-B319-4F4E-9898-EA7A2740AA19}"
@@ -110,10 +108,6 @@ Global
 		{28BC5EE0-9227-4124-AA8F-1C0CAA218D12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28BC5EE0-9227-4124-AA8F-1C0CAA218D12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28BC5EE0-9227-4124-AA8F-1C0CAA218D12}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0AFF4B92-6E8C-456B-A3F8-BF76CE55FFDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AFF4B92-6E8C-456B-A3F8-BF76CE55FFDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AFF4B92-6E8C-456B-A3F8-BF76CE55FFDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0AFF4B92-6E8C-456B-A3F8-BF76CE55FFDF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6B834AB-7B6A-47AE-A7C3-C102B0C861FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C6B834AB-7B6A-47AE-A7C3-C102B0C861FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6B834AB-7B6A-47AE-A7C3-C102B0C861FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -133,7 +127,6 @@ Global
 		{7EF78F7B-C9C9-4311-B87D-50ED5932CC93} = {639967B0-0544-4C52-94AC-9A3D25E33256}
 		{34D23554-5482-4B3D-B65F-46DFF5AF1684} = {FA608267-1272-4BD5-B230-0F41A48D18C8}
 		{28BC5EE0-9227-4124-AA8F-1C0CAA218D12} = {639967B0-0544-4C52-94AC-9A3D25E33256}
-		{0AFF4B92-6E8C-456B-A3F8-BF76CE55FFDF} = {639967B0-0544-4C52-94AC-9A3D25E33256}
 		{C6B834AB-7B6A-47AE-A7C3-C102B0C861FF} = {639967B0-0544-4C52-94AC-9A3D25E33256}
 		{31BAB10E-B319-4F4E-9898-EA7A2740AA19} = {639967B0-0544-4C52-94AC-9A3D25E33256}
 	EndGlobalSection
diff --git a/packages/repositories.config b/packages/repositories.config
index 667346cd1..3b6186b13 100644
--- a/packages/repositories.config
+++ b/packages/repositories.config
@@ -7,7 +7,6 @@
   <repository path="..\src\Microsoft.Azure.WebJobs.ServiceBus\packages.config" />
   <repository path="..\src\Microsoft.Azure.WebJobs.Storage\packages.config" />
   <repository path="..\src\Microsoft.Azure.WebJobs\packages.config" />
-  <repository path="..\src\Packages\packages.config" />
   <repository path="..\test\Dashboard.UnitTests\packages.config" />
   <repository path="..\test\Microsoft.Azure.WebJobs.Host.EndToEndTests\packages.config" />
   <repository path="..\test\Microsoft.Azure.WebJobs.Host.FunctionalTests\packages.config" />
@@ -15,5 +14,4 @@
   <repository path="..\test\Microsoft.Azure.WebJobs.Host.UnitTests\packages.config" />
   <repository path="..\test\Microsoft.Azure.WebJobs.ServiceBus.UnitTests\packages.config" />
   <repository path="..\test\Microsoft.Azure.WebJobs.Storage.IntegrationTests\packages.config" />
-  <repository path="..\test\Packages\packages.config" />
 </repositories>
diff --git a/perf/Microsoft.Azure.WebJobs.Perf/WebJobs.Perf.csproj b/perf/Microsoft.Azure.WebJobs.Perf/WebJobs.Perf.csproj
index 30992c09b..5c83da440 100644
--- a/perf/Microsoft.Azure.WebJobs.Perf/WebJobs.Perf.csproj
+++ b/perf/Microsoft.Azure.WebJobs.Perf/WebJobs.Perf.csproj
@@ -1,5 +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\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')" />
   <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="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -12,7 +13,7 @@
     <AssemblyName>Microsoft.Azure.WebJobs.Perf</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>c6180c7b</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>f53316d8</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,6 +70,12 @@
     <Reference Include="Microsoft.VisualStudio.Diagnostics.Measurement">
       <Private>True</Private>
     </Reference>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.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>
     <Compile Include="BlobOverheadPerfTest.cs" />
@@ -113,5 +120,6 @@
       <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\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\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'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/perf/Microsoft.Azure.WebJobs.Perf/packages.config b/perf/Microsoft.Azure.WebJobs.Perf/packages.config
index 9aeec3319..f7f403aff 100644
--- a/perf/Microsoft.Azure.WebJobs.Perf/packages.config
+++ b/perf/Microsoft.Azure.WebJobs.Perf/packages.config
@@ -7,5 +7,8 @@
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.0" targetFramework="net45" />
   <package id="WindowsAzure.Storage" version="4.0.1" targetFramework="net45" />
+  <package id="xunit.abstractions" 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.runner.visualstudio" version="2.0.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/test/Packages/Packages.csproj b/test/Packages/Packages.csproj
deleted file mode 100644
index 0956609b0..000000000
--- a/test/Packages/Packages.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SkipCopyBuildProduct>true</SkipCopyBuildProduct>
-    <ProjectGuid>{0AFF4B92-6E8C-456B-A3F8-BF76CE55FFDF}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>52957621</NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\..\tools\NuGetProj.settings.targets">
-      <Link>NuGetProj.settings.targets</Link>
-    </None>
-    <None Include="packages.config" />
-    <NuGetProject Include="..\Microsoft.Azure.WebJobs.Host.TestCommon.NuGet\WebJobs.Host.TestCommon.nuproj">
-      <Link>Microsoft.Azure.WebJobs.Host.TestCommon.NuGet\WebJobs.Host.TestCommon.nuspec</Link>
-    </NuGetProject>
-    <NuGetSpec Include="..\Microsoft.Azure.WebJobs.Host.TestCommon.NuGet\WebJobs.Host.TestCommon.nuspec ">
-      <Link>Microsoft.Azure.WebJobs.Host.TestCommon.NuGet\WebJobs.Host.TestCommon.nuspec </Link>
-    </NuGetSpec>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="Build">
-    <MSBuild Projects="@(NuGetProject)" Targets="Build" />
-  </Target>
-  <Target Name="Clean">
-    <MSBuild Projects="@(NuGetProject)" Targets="Clean" />
-  </Target>
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <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\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'))" />
-  </Target>
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Packages/packages.config b/test/Packages/packages.config
deleted file mode 100644
index dfa3fb896..000000000
--- a/test/Packages/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
-</packages>
\ No newline at end of file