fixed some tests that we're failing in .NET 4.0 but not .NET 4.5, switched test projects back to 4.0 because that is what the build uses and is a buggier (Uri wise) .net version

Mpdreamz · Mpdreamz · commit e2daa0c404f1 · 2014-04-01T14:49:02.000+02:00
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj
@@ -47,7 +47,8 @@
     <Reference Include="CsQuery">
       <HintPath>..\..\..\dep\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="ShellProgressBar">
diff --git a/src/CodeGeneration/CodeGeneration.YamlTestsRunner/CodeGeneration.YamlTestsRunner.csproj b/src/CodeGeneration/CodeGeneration.YamlTestsRunner/CodeGeneration.YamlTestsRunner.csproj
@@ -45,7 +45,8 @@
     <Reference Include="Moq">
       <HintPath>..\..\..\dep\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="ShellProgressBar">
diff --git a/src/Connections/Elasticsearch.Net.Connection.Thrift/Elasticsearch.Net.Connection.Thrift.csproj b/src/Connections/Elasticsearch.Net.Connection.Thrift/Elasticsearch.Net.Connection.Thrift.csproj
@@ -69,7 +69,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\NetReflector.1.1.2009\lib\net20\NetReflector.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
@@ -75,7 +75,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\dep\Newtonsoft.Json.6.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PUrify">
diff --git a/src/Profiling/Profiling.Indexing/Profiling.Indexing.csproj b/src/Profiling/Profiling.Indexing/Profiling.Indexing.csproj
@@ -67,7 +67,8 @@
     <StartupObject>Profiling.Indexing.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text">
diff --git a/src/Serialization/Elasticsearch.Net.JsonNET/Elasticsearch.Net.JsonNet.csproj b/src/Serialization/Elasticsearch.Net.JsonNET/Elasticsearch.Net.JsonNet.csproj
@@ -30,7 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/Elasticsearch.Net.Integration.Yaml.csproj b/src/Tests/Elasticsearch.Net.Integration.Yaml/Elasticsearch.Net.Integration.Yaml.csproj
@@ -30,11 +30,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions">
+    <Reference Include="FluentAssertions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\FluentAssertions.2.2.0.0\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Elasticsearch.Net.Tests.Unit.csproj b/src/Tests/Elasticsearch.Net.Tests.Unit/Elasticsearch.Net.Tests.Unit.csproj
@@ -42,7 +42,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\FakeItEasy.1.18.0\lib\net40\FakeItEasy.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions">
+    <Reference Include="FluentAssertions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\FluentAssertions.2.2.0.0\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
diff --git a/src/Tests/Nest.Tests.MockData/Nest.Tests.MockData.csproj b/src/Tests/Nest.Tests.MockData/Nest.Tests.MockData.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -67,8 +67,9 @@
     <Reference Include="AutoPoco">
       <HintPath>..\..\..\dep\AutoPoco.1.0.0.0\lib\AutoPoco.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\dep\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
diff --git a/src/Tests/Nest.Tests.MockData/app.config b/src/Tests/Nest.Tests.MockData/app.config
@@ -21,4 +21,4 @@
             </setting>
         </Nest.Tests.MockData.TestData>
     </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/src/Tests/Nest.Tests.MockData/packages.config b/src/Tests/Nest.Tests.MockData/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoPoco" version="1.0.0.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />
 </packages>
diff --git a/src/Tests/Nest.Tests.Unit/Core/Validate/ValidateRequestTests.cs b/src/Tests/Nest.Tests.Unit/Core/Validate/ValidateRequestTests.cs
@@ -100,7 +100,10 @@ public void InferredForceQueryString()
 			var status = result.ConnectionStatus;
 			var uri = new Uri(status.RequestUrl);
 			Assert.AreEqual("/nest_test_data/elasticsearchprojects/_validate/query", uri.AbsolutePath);
-			Assert.AreEqual("?source=%7B%20match_all%20:%20%7B%7D%20%7D", uri.Query);
+
+			//normalize difference between .NET 4.5 and prior
+			var query = uri.Query.Replace("%3A", ":");
+			Assert.AreEqual("?source=%7B%20match_all%20:%20%7B%7D%20%7D", query);
 			StringAssert.AreEqualIgnoringCase("GET", status.RequestMethod);
 		}
 	}
diff --git a/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj b/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -75,14 +75,16 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\FakeItEasy.1.18.0\lib\net40\FakeItEasy.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions">
-      <HintPath>..\..\..\dep\FluentAssertions.2.2.0.0\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\dep\FluentAssertions.2.2.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Moq">
       <HintPath>..\..\..\dep\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\dep\Newtonsoft.Json.6.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\dep\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
diff --git a/src/Tests/Nest.Tests.Unit/Search/SearchOptions/SearchOptionTests.cs b/src/Tests/Nest.Tests.Unit/Search/SearchOptions/SearchOptionTests.cs
@@ -117,7 +117,9 @@ public void TestExecuteOnNode()
 				.Size(10)
 				.ExecuteOnNode("somenode");
 			var result = this._client.Search<ElasticsearchProject>(ss=>s);
-			StringAssert.Contains("preference=_only_node:somenode", result.ConnectionStatus.RequestUrl);
+			//normalize difference between .NET 4.5 and prior
+			var url = result.ConnectionStatus.RequestUrl.Replace("%3A", ":");
+			StringAssert.Contains("preference=_only_node:somenode", url);
 		}
 		[Test]
 		public void TestExecuteOnPreferredNode()
@@ -127,7 +129,9 @@ public void TestExecuteOnPreferredNode()
 				.Size(10)
 				.ExecuteOnPreferredNode("somenode");
 			var result = this._client.Search<ElasticsearchProject>(ss=>s);
-			StringAssert.Contains("preference=_prefer_node:somenode", result.ConnectionStatus.RequestUrl);
+			//normalize difference between .NET 4.5 and prior
+			var url = result.ConnectionStatus.RequestUrl.Replace("%3A", ":");
+			StringAssert.Contains("preference=_prefer_node:somenode", url);
 		}
 		[Test]
 		public void TestFields()
diff --git a/src/Tests/Nest.Tests.Unit/app.config b/src/Tests/Nest.Tests.Unit/app.config
@@ -5,7 +5,7 @@
         <section name="Nest.Tests.Unit.Test" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
 </configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><userSettings>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup><userSettings>
         <Nest.Tests.Unit.Test>
             <setting name="Port" serializeAs="String">
                 <value>9200</value>
diff --git a/src/Tests/Nest.Tests.Unit/packages.config b/src/Tests/Nest.Tests.Unit/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="AutoPoco" version="1.0.0.0" targetFramework="net40" />
   <package id="FakeItEasy" version="1.18.0" targetFramework="net45" />
-  <package id="FluentAssertions" version="2.2.0.0" targetFramework="net45" />
+  <package id="FluentAssertions" version="2.2.0.0" targetFramework="net40" />
   <package id="Moq" version="4.2.1312.1622" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />
 </packages>
