From b8afad8adbb5b7f47a638e1de1e23159220b7985 Mon Sep 17 00:00:00 2001
From: "kay.one" <kay.one@gmail.com>
Date: Mon, 29 Apr 2013 21:14:38 -0700
Subject: [PATCH] fixed linux integration tests

---
 .../NzbDrone.Integration.Test.csproj                     | 5 ++---
 NzbDrone.Update.Test/UpdateProviderStartFixture.cs       | 9 ---------
 NzbDrone.sln.DotSettings                                 | 1 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
index 3392b77fa..1c443051a 100644
--- a/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
+++ b/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
@@ -52,9 +52,8 @@
     <Reference Include="Nancy.Hosting.Self">
       <HintPath>..\packages\Nancy.Hosting.Self.0.16.1\lib\net40\Nancy.Hosting.Self.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.5.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.2.0.1.2\lib\net40\NLog.dll</HintPath>
diff --git a/NzbDrone.Update.Test/UpdateProviderStartFixture.cs b/NzbDrone.Update.Test/UpdateProviderStartFixture.cs
index 343ecd1e4..1ac8ad4a6 100644
--- a/NzbDrone.Update.Test/UpdateProviderStartFixture.cs
+++ b/NzbDrone.Update.Test/UpdateProviderStartFixture.cs
@@ -120,15 +120,6 @@ namespace NzbDrone.Update.Test
             Mocker.GetMock<ProcessProvider>().Verify(c => c.Kill(It.IsAny<int>()), Times.Never());
         }
 
-        [Test]
-        public void should_stop_orphan_iisexpress_instances()
-        {
-            Mocker.Resolve<UpdateProvider>().Start(TARGET_FOLDER);
-
-            
-            Mocker.GetMock<IHostController>().Verify(c => c.StopServer(), Times.Once());
-        }
-
         [Test]
         public void should_create_backup_of_current_installation()
         {
diff --git a/NzbDrone.sln.DotSettings b/NzbDrone.sln.DotSettings
index a85dee74c..d322e75d3 100644
--- a/NzbDrone.sln.DotSettings
+++ b/NzbDrone.sln.DotSettings
@@ -11,6 +11,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/Environment/Editor/MatchingBraceHighlighting/Position/@EntryValue">BOTH_SIDES</s:String>
 	<s:String x:Key="/Default/Environment/Editor/MatchingBraceHighlighting/Style/@EntryValue">OUTLINE</s:String>
+	<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/LocationType/@EntryValue">SOLUTION_FOLDER</s:String>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C7F3FB135E52A44B9447C48B2EEEE92/@KeyIndexDefined">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C7F3FB135E52A44B9447C48B2EEEE92/AbsolutePath/@EntryValue">C:\Dropbox\Git\NzbDrone\NzbDrone.sln.DotSettings</s:String>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C7F3FB135E52A44B9447C48B2EEEE92/@KeyIndexDefined">True</s:Boolean>