Merge remote-tracking branch 'origin/6.2.1' into 7.1.5

Conflicts: build/NuSpecs/UmbracoCms.Core.nuspec src/Umbraco.Tests/Umbraco.Tests.csproj src/Umbraco.Tests/packages.config src/Umbraco.Web.UI/packages.config
2014-06-25 14:33:32 +10:00
parent 38c4bc72cd a4bf4b0977
commit 3ecc974325
18 changed files with 31 additions and 30 deletions
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -30,6 +30,7 @@
            <dependency id="ClientDependency-Mvc" version="[1.7.0.4, 2.0.0)" />
            <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
            <dependency id="Newtonsoft.Json" version="[6.0.2, 7.0.0)" />
+            <dependency id="Examine" version="[0.1.57, 1.0.0)" />
            <dependency id="ImageProcessor" version="[1.9.0, 2.0.0)" />
            <dependency id="ImageProcessor.Web" version="[3.2.3, 4.0.0)" />
        </dependencies>
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -58,9 +58,9 @@
    <Reference Include="AutoMapper.Net4">
      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
    </Reference>
-    <Reference Include="Examine, Version=0.1.52.2941, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Examine, Version=0.1.57.2941, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
+      <HintPath>..\packages\Examine.0.1.57.2941\lib\Examine.dll</HintPath>
    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
--- a/src/Umbraco.Tests/packages.config
+++ b/src/Umbraco.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Examine" version="0.1.56.2941" targetFramework="net40" />
+  <package id="Examine" version="0.1.57.2941" targetFramework="net40" />
  <package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -123,8 +123,9 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
    </Reference>
-    <Reference Include="Examine">
-      <HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.57.2941, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Examine.0.1.57.2941\lib\Examine.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="ImageProcessor, Version=1.8.8.0, Culture=neutral, processorArchitecture=MSIL">
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -3,7 +3,7 @@
  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
  <package id="ClientDependency" version="1.7.1.2" targetFramework="net40" />
  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" />
-  <package id="Examine" version="0.1.56.2941" targetFramework="net40" />
+  <package id="Examine" version="0.1.57.2941" targetFramework="net40" />
  <package id="ImageProcessor" version="1.8.8.0" targetFramework="net45" />
  <package id="ImageProcessor.Web" version="3.2.2.0" targetFramework="net45" />
  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -110,9 +110,9 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
    </Reference>
-    <Reference Include="Examine">
-      <HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Examine, Version=0.1.57.2941, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Examine.0.1.57.2941\lib\Examine.dll</HintPath>
    </Reference>
    <Reference Include="HtmlAgilityPack, Version=1.4.6.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -298,7 +298,6 @@ namespace Umbraco.Web
            DefaultRenderMvcControllerResolver.Current = new DefaultRenderMvcControllerResolver(typeof(RenderMvcController));

            //Override the ServerMessengerResolver to set a username/password for the distributed calls
-            //ServerMessengerResolver.Current.SetServerMessenger(new DefaultServerMessenger(() =>
            ServerMessengerResolver.Current.SetServerMessenger(new BatchedServerMessenger(() =>
            {
                //we should not proceed to change this if the app/database is not configured since there will 
--- a/src/Umbraco.Web/packages.config
+++ b/src/Umbraco.Web/packages.config
@@ -3,7 +3,7 @@
  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
  <package id="ClientDependency" version="1.7.1.2" targetFramework="net40" />
  <package id="CodeSharp.Package.AspNetWebPage" version="1.0" targetFramework="net40" />
-  <package id="Examine" version="0.1.56.2941" targetFramework="net40" />
+  <package id="Examine" version="0.1.57.2941" targetFramework="net40" />
  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net40" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
--- a/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj
+++ b/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,9 +40,9 @@
    <Reference Include="AzureDirectory">
      <HintPath>..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll</HintPath>
    </Reference>
-    <Reference Include="Examine">
+    <Reference Include="Examine, Version=0.1.57.2941, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
+      <HintPath>..\packages\Examine.0.1.57.2941\lib\Examine.dll</HintPath>
    </Reference>
    <Reference Include="Examine.Azure">
      <SpecificVersion>False</SpecificVersion>
--- a/src/UmbracoExamine.Azure/packages.config
+++ b/src/UmbracoExamine.Azure/packages.config
@@ -2,7 +2,7 @@
 <packages>
  <package id="AnglicanGeek.WindowsAzure.ServiceRuntime" version="1.6" targetFramework="net40" />
  <package id="AzureDirectory" version="1.0.5" targetFramework="net40" />
-  <package id="Examine" version="0.1.56.2941" targetFramework="net40" />
+  <package id="Examine" version="0.1.57.2941" targetFramework="net40" />
  <package id="Examine.Azure" version="0.1.51.2941" targetFramework="net40" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
--- a/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj
+++ b/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj
@@ -40,8 +40,9 @@
    <Reference Include="AzureDirectory">
      <HintPath>..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll</HintPath>
    </Reference>
-    <Reference Include="Examine">
-      <HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.57.2941, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Examine.0.1.57.2941\lib\Examine.dll</HintPath>
    </Reference>
    <Reference Include="Examine.Azure">
      <SpecificVersion>False</SpecificVersion>
--- a/src/UmbracoExamine.PDF.Azure/packages.config
+++ b/src/UmbracoExamine.PDF.Azure/packages.config
@@ -2,7 +2,7 @@
 <packages>
  <package id="AnglicanGeek.WindowsAzure.ServiceRuntime" version="1.6" targetFramework="net40" />
  <package id="AzureDirectory" version="1.0.5" targetFramework="net40" />
-  <package id="Examine" version="0.1.56.2941" targetFramework="net40" />
+  <package id="Examine" version="0.1.57.2941" targetFramework="net40" />
  <package id="Examine.Azure" version="0.1.51.2941" targetFramework="net40" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
--- a/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj
+++ b/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,9 +46,9 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Examine">
+    <Reference Include="Examine, Version=0.1.57.2941, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
+      <HintPath>..\packages\Examine.0.1.57.2941\lib\Examine.dll</HintPath>
    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib">
      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
--- a/src/UmbracoExamine.PDF/packages.config
+++ b/src/UmbracoExamine.PDF/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Examine" version="0.1.56.2941" targetFramework="net40" />
+  <package id="Examine" version="0.1.57.2941" targetFramework="net40" />
  <package id="iTextSharp" version="5.3.3" targetFramework="net40" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
--- a/src/UmbracoExamine/UmbracoExamine.csproj
+++ b/src/UmbracoExamine/UmbracoExamine.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -82,10 +82,9 @@
    <AssemblyOriginatorKeyFile>..\Solution Items\TheFARM-Public.snk</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Examine">
+    <Reference Include="Examine, Version=0.1.57.2941, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\Examine.0.1.57.2941\lib\Examine.dll</HintPath>
    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
--- a/src/UmbracoExamine/packages.config
+++ b/src/UmbracoExamine/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Examine" version="0.1.56.2941" targetFramework="net40" />
+  <package id="Examine" version="0.1.57.2941" targetFramework="net40" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
 </packages>
--- a/src/umbraco.MacroEngines/packages.config
+++ b/src/umbraco.MacroEngines/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Examine" version="0.1.56.2941" targetFramework="net40" />
+  <package id="Examine" version="0.1.57.2941" targetFramework="net40" />
  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net40" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
--- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
+++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
@@ -45,9 +45,9 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Examine">
+    <Reference Include="Examine, Version=0.1.57.2941, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
+      <HintPath>..\packages\Examine.0.1.57.2941\lib\Examine.dll</HintPath>
    </Reference>
    <Reference Include="HtmlAgilityPack, Version=1.4.6.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>