From c913bf1154ec54713629c73819f09151cdfca010 Mon Sep 17 00:00:00 2001
From: Haacked <haacked@gmail.com>
Date: Mon, 29 Dec 2014 15:55:25 -0800
Subject: [PATCH] Fix bad merge of Integration test project file

---
 .../Octokit.Tests.Integration.csproj          | 174 ++++++------------
 Octokit.sln                                   |   2 +-
 2 files changed, 54 insertions(+), 122 deletions(-)

diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
index 3a77029c..4c3917aa 100644
--- a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
+++ b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
@@ -9,18 +9,18 @@
     <ProjectGuid>{01687D54-1D87-4562-A721-C57F1C94052C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Octokit.Tests</RootNamespace>
-    <AssemblyName>Octokit.Tests</AssemblyName>
+    <RootNamespace>Octokit.Tests.Integration</RootNamespace>
+    <AssemblyName>Octokit.Tests.Integration</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>f1b9719f</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>89e72d09</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\Net45\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_45</DefineConstants>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>4014, 1998</NoWarn>
@@ -29,19 +29,14 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\Net45\</OutputPath>
-    <DefineConstants>TRACE;NET_45</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>4014, 1998</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NSubstitute, Version=1.8.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NSubstitute.1.8.0.0\lib\net45\NSubstitute.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -55,8 +50,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions">
       <HintPath>..\packages\xunit.abstractions.2.0.0-beta5-build2785\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
@@ -66,146 +62,82 @@
     <Reference Include="xunit.core">
       <HintPath>..\packages\xunit.core.2.0.0-beta5-build2785\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.core.dll</HintPath>
     </Reference>
+    <Reference Include="xunit.execution, Version=2.0.0.2785, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.execution.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Authentication\CredentialsTests.cs" />
-    <Compile Include="Clients\OauthClientTests.cs" />
-    <Compile Include="Clients\RepositoryCommentsClientTests.cs" />
-    <Compile Include="Clients\DeploymentsClientTests.cs" />
-    <Compile Include="Clients\DeploymentStatusClientTests.cs" />
-    <Compile Include="Clients\FeedsClientTests.cs" />
-    <Compile Include="Clients\RepositoryDeployKeysClientTests.cs" />
-    <Compile Include="Clients\RepositoryContentsClientTests.cs" />
-    <Compile Include="Clients\SearchClientTests.cs" />
-    <Compile Include="Clients\GistCommentsClientTests.cs" />
-    <Compile Include="Clients\GistsClientTests.cs" />
-    <Compile Include="Clients\BlobClientTests.cs" />
-    <Compile Include="Clients\IssuesLabelsClientTests.cs" />
-    <Compile Include="Clients\ReferencesClientTests.cs" />
-    <Compile Include="Clients\RepoCollaboratorsClientTests.cs" />
-    <Compile Include="Clients\EventsClientTests.cs" />
     <Compile Include="Clients\AssigneesClientTests.cs" />
+    <Compile Include="Clients\BlobClientTests.cs" />
+    <Compile Include="Clients\BranchesClientTests.cs" />
     <Compile Include="Clients\CommitsClientTests.cs" />
     <Compile Include="Clients\CommitStatusClientTests.cs" />
-    <Compile Include="Clients\StatisticsClientTests.cs" />
-    <Compile Include="Clients\PullRequestReviewCommentsClientTests.cs" />
-    <Compile Include="Clients\TeamsClientTests.cs" />
-    <Compile Include="Clients\GitDatabaseClientTests.cs" />
-    <Compile Include="Clients\OrganizationMembersClientTests.cs" />
-    <Compile Include="Clients\PullRequestsClientTests.cs" />
-    <Compile Include="Clients\TagsClientTests.cs" />
+    <Compile Include="Clients\DeploymentsClientTests.cs" />
+    <Compile Include="Clients\DeploymentStatusClientTests.cs" />
+    <Compile Include="Clients\EventsClientTests.cs" />
+    <Compile Include="Clients\IssuesLabelsClientTests.cs" />
+    <Compile Include="Clients\GistsClientTests.cs" />
     <Compile Include="Clients\IssuesEventsClientTests.cs" />
-    <Compile Include="Clients\IssueCommentsClientTests.cs" />
     <Compile Include="Clients\MilestonesClientTests.cs" />
-    <Compile Include="Clients\IssuesClientTests.cs" />
-    <Compile Include="Clients\StarredClientTests.cs" />
-    <Compile Include="Clients\NotificationsClientTests.cs" />
-    <Compile Include="Clients\ReleasesClientTests.cs" />
-    <Compile Include="Clients\SshKeysClientTests.cs" />
-    <Compile Include="Clients\TreesClientTests.cs" />
+    <Compile Include="Clients\PullRequestsClientTests.cs" />
+    <Compile Include="Clients\ReferencesClientTests.cs" />
+    <Compile Include="Clients\RepositoryCommitsClientTests.cs" />
+    <Compile Include="Clients\RepositoryContentsClientTests.cs" />
+    <Compile Include="Clients\RepositoryDeployKeysClientTests.cs" />
+    <Compile Include="Clients\SearchClientTests.cs" />
+    <Compile Include="Clients\StatisticsClientTests.cs" />
+    <Compile Include="Clients\TreeClientTests.cs" />
     <Compile Include="Clients\UserEmailsClientTests.cs" />
-    <Compile Include="Clients\WatchedClientTests.cs" />
     <Compile Include="Clients\FollowersClientTests.cs" />
-    <Compile Include="Exceptions\ApiExceptionTests.cs" />
-    <Compile Include="Exceptions\ApiValidationExceptionTests.cs" />
-    <Compile Include="Exceptions\RepositoryExistsExceptionTests.cs" />
-    <Compile Include="Exceptions\TwoFactorChallengeFailedException.cs" />
-    <Compile Include="Exceptions\ForbiddenExceptionTests.cs" />
-    <Compile Include="Exceptions\LoginAttemptsExceededExceptionTests.cs" />
-    <Compile Include="Exceptions\RateLimitExceededExceptionTests.cs" />
-    <Compile Include="Exceptions\TwoFactorRequiredExceptionTests.cs" />
-    <Compile Include="Helpers\NSubstituteExtensions.cs" />
-    <Compile Include="Helpers\ReflectionExtensions.cs" />
-    <Compile Include="Helpers\UriExtensionsTests.cs" />
-    <Compile Include="Http\ApiConnectionTests.cs" />
-    <Compile Include="Clients\AuthorizationsClientTests.cs" />
+    <Compile Include="Clients\UserKeysClientTests.cs" />
+    <Compile Include="Helpers\RepositorySetupHelper.cs" />
+    <Compile Include="HttpClientAdapterTests.cs" />
+    <Compile Include="Clients\TeamsClientTests.cs" />
+    <Compile Include="Helpers\IntegrationTestAttribute.cs" />
+    <Compile Include="Clients\PullRequestReviewCommentsClientTests.cs" />
+    <Compile Include="Clients\IssuesClientTests.cs" />
     <Compile Include="Clients\MiscellaneousClientTests.cs" />
-    <Compile Include="Clients\OrganizationsClientTests.cs" />
-    <Compile Include="Helpers\Arg.cs" />
-    <Compile Include="Helpers\AssertEx.cs" />
-    <Compile Include="Http\HttpClientAdapterTests.cs" />
-    <Compile Include="Http\ApiInfoParserTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Authentication\BasicAuthenticatorTests.cs" />
-    <Compile Include="Http\JsonHttpPipelineTests.cs" />
-    <Compile Include="Fixtures\EmbeddedResource.cs" />
-    <Compile Include="Fixtures\Fixtures.cs" />
-    <Compile Include="GitHubClientTests.cs" />
-    <Compile Include="Authentication\TokenAuthenticatorTests.cs" />
-    <Compile Include="Http\ConnectionTests.cs" />
-    <Compile Include="Http\RateLimitTests.cs" />
-    <Compile Include="Http\ResponseTests.cs" />
-    <Compile Include="Http\RequestTests.cs" />
-    <Compile Include="Models\CommitTests.cs" />
-    <Compile Include="Models\DeploymentStatusTests.cs" />
-    <Compile Include="Models\DeploymentTests.cs" />
-    <Compile Include="Models\NewReferenceTests.cs" />
-    <Compile Include="Models\MilestoneRequestTests.cs" />
-    <Compile Include="Models\IssueRequestTests.cs" />
-    <Compile Include="Models\ModelExtensionsTests.cs" />
-    <Compile Include="Models\PullRequestRequestTests.cs" />
-    <Compile Include="Models\PunchCardTests.cs" />
-    <Compile Include="Models\ReadOnlyPagedCollectionTests.cs" />
-    <Compile Include="Models\RepositoryUpdateTests.cs" />
-    <Compile Include="Models\RequestParametersTests.cs" />
-    <Compile Include="Models\SearchCodeRequestTests.cs" />
-    <Compile Include="Models\SearchUsersRequestTests.cs" />
-    <Compile Include="Models\SearchIssuesRequestTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Helpers\StringExtensionsTests.cs" />
-    <Compile Include="Clients\RepositoriesClientTests.cs" />
-    <Compile Include="Reactive\AuthorizationExtensionsTests.cs" />
-    <Compile Include="Reactive\ObservableBlobClientTests.cs" />
-    <Compile Include="Reactive\ObservableCommitsClientTests.cs" />
-    <Compile Include="Reactive\ObservableDeploymentsClientTests.cs" />
-    <Compile Include="Reactive\ObservableDeploymentStatusClientTests.cs" />
-    <Compile Include="Reactive\ObservableEventsClientTests.cs" />
-    <Compile Include="Reactive\ObservableFeedsClientTests.cs" />
-    <Compile Include="Reactive\ObservableIssueCommentsClientTests.cs" />
+    <Compile Include="Helpers\OrganizationTestAttribute.cs" />
     <Compile Include="Reactive\ObservableIssuesClientTests.cs" />
     <Compile Include="Reactive\ObservableMilestonesClientTests.cs" />
-    <Compile Include="Reactive\ObservableOrganizationMembersClientTests.cs" />
-    <Compile Include="Reactive\ObservablePullRequestsClientTests.cs" />
-    <Compile Include="Reactive\ObservableReleasesClientTests.cs" />
-    <Compile Include="Reactive\ObservablePullRequestReviewCommentsClientTests.cs" />
     <Compile Include="Reactive\ObservableRepositoriesClientTests.cs" />
-    <Compile Include="Reactive\ObservableRepositoryDeployKeysClientTests.cs" />
-    <Compile Include="Reactive\ObservableStarredClientTests.cs" />
-    <Compile Include="Reactive\ObservableStatisticsClientTests.cs" />
-    <Compile Include="Reactive\ObservableTreesClientTests.cs" />
-    <Compile Include="Reactive\ObservableFollowersTest.cs" />
-    <Compile Include="Reactive\ObservableUserEmailsClientTests.cs" />
-    <Compile Include="SelfTests.cs" />
-    <Compile Include="SimpleJsonSerializerTests.cs" />
+    <Compile Include="Clients\ReleasesClientTests.cs" />
+    <Compile Include="Clients\RepositoriesClientTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Helper.cs" />
     <Compile Include="Clients\UsersClientTests.cs" />
+    <Compile Include="Reactive\ObservableRespositoryDeployKeysClientTests.cs" />
+    <Compile Include="Reactive\ObservableUserEmailsClientTests.cs" />
+    <Compile Include="Reactive\ObservableTeamsClientTests.cs" />
+    <Compile Include="SelfTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Octokit.Reactive\Octokit.Reactive.csproj">
       <Project>{674b69b8-0780-4d54-ae2b-c15821fa51cb}</Project>
       <Name>Octokit.Reactive</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Octokit.Tests\Octokit.Tests.csproj">
+      <Project>{149448d4-c2f2-4df9-86bd-03e3272f093b}</Project>
+      <Name>Octokit.Tests</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Octokit\Octokit.csproj">
       <Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
       <Name>Octokit</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Fixtures\user_full.json" />
-    <EmbeddedResource Include="Fixtures\authorizations.json" />
-    <EmbeddedResource Include="Fixtures\authorization.json" />
-    <EmbeddedResource Include="Fixtures\repository.json" />
-    <EmbeddedResource Include="Fixtures\repositories.json" />
-    <EmbeddedResource Include="Fixtures\release_asset.json" />
-    <EmbeddedResource Include="Fixtures\release.json" />
-    <EmbeddedResource Include="Fixtures\releases.json" />
     <None Include="app.config" />
-    <EmbeddedResource Include="Fixtures\user.json" />
-    <None Include="packages.Octokit.Tests.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="fixtures\hello-world.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/Octokit.sln b/Octokit.sln
index 2ce3e07e..d5be9bc8 100644
--- a/Octokit.sln
+++ b/Octokit.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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit", "Octokit\Octokit.csproj", "{08DD4305-7787-4823-A53F-4D0F725A07F3}"
 EndProject