From a18a2198a89c172bc3991beb96d5c8f0f1ea12d6 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 25 Jun 2014 12:25:27 +1000 Subject: [PATCH 1/3] removes comment --- src/Umbraco.Web/WebBootManager.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 5a313b2350..45eb2676c6 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -276,7 +276,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 From bef6ce66f18e975d1ed733b8a0fd1a04def4984d Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 25 Jun 2014 14:19:06 +1000 Subject: [PATCH 2/3] Updated core nuspec to include Examine --- build/NuSpecs/UmbracoCms.Core.nuspec | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 83408646a1..bdd352b8f3 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -29,6 +29,7 @@ + From a4bf4b0977fa8c5842c05d5341917b58fe1fc6bc Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 25 Jun 2014 14:19:31 +1000 Subject: [PATCH 3/3] Fixes: U4-5118 Examine not storing XML fragments - updates to latest examine --- src/Umbraco.Tests/Umbraco.Tests.csproj | 4 ++-- src/Umbraco.Tests/packages.config | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 5 +++-- src/Umbraco.Web.UI/packages.config | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 6 +++--- src/Umbraco.Web/packages.config | 2 +- src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj | 6 +++--- src/UmbracoExamine.Azure/packages.config | 2 +- .../UmbracoExamine.PDF.Azure.csproj | 5 +++-- src/UmbracoExamine.PDF.Azure/packages.config | 2 +- src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj | 6 +++--- src/UmbracoExamine.PDF/packages.config | 2 +- src/UmbracoExamine/UmbracoExamine.csproj | 7 +++---- src/UmbracoExamine/packages.config | 2 +- src/umbraco.MacroEngines/packages.config | 2 +- src/umbraco.MacroEngines/umbraco.MacroEngines.csproj | 6 +++--- 16 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index b7c5d9e9a1..e97b913c04 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -48,9 +48,9 @@ 4 - + False - ..\packages\Examine.0.1.56.2941\lib\Examine.dll + ..\packages\Examine.0.1.57.2941\lib\Examine.dll False diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config index a9e31b4e57..ec6e559acf 100644 --- a/src/Umbraco.Tests/packages.config +++ b/src/Umbraco.Tests/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index fbc922fc2c..e86ecfccc6 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -109,8 +109,9 @@ False ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll - - ..\packages\Examine.0.1.56.2941\lib\Examine.dll + + False + ..\packages\Examine.0.1.57.2941\lib\Examine.dll True diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index ff2f6ab5cd..10e705ab8d 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index bca502ff8b..cb019563b4 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -101,9 +101,9 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - ..\packages\Examine.0.1.56.2941\lib\Examine.dll - True + + False + ..\packages\Examine.0.1.57.2941\lib\Examine.dll False diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index 474c7c8973..96e9bf3d0b 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj b/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj index 5571697c65..5818caf636 100644 --- a/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj +++ b/src/UmbracoExamine.Azure/UmbracoExamine.Azure.csproj @@ -1,4 +1,4 @@ - + Debug @@ -37,9 +37,9 @@ ..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll - + False - ..\packages\Examine.0.1.56.2941\lib\Examine.dll + ..\packages\Examine.0.1.57.2941\lib\Examine.dll False diff --git a/src/UmbracoExamine.Azure/packages.config b/src/UmbracoExamine.Azure/packages.config index 05e36b051e..0d4b103fae 100644 --- a/src/UmbracoExamine.Azure/packages.config +++ b/src/UmbracoExamine.Azure/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj b/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj index 0aafee84d7..f897a9f5e5 100644 --- a/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj +++ b/src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj @@ -37,8 +37,9 @@ ..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll - - ..\packages\Examine.0.1.56.2941\lib\Examine.dll + + False + ..\packages\Examine.0.1.57.2941\lib\Examine.dll False diff --git a/src/UmbracoExamine.PDF.Azure/packages.config b/src/UmbracoExamine.PDF.Azure/packages.config index 05e36b051e..0d4b103fae 100644 --- a/src/UmbracoExamine.PDF.Azure/packages.config +++ b/src/UmbracoExamine.PDF.Azure/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj b/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj index 5b01d4d38c..96eced121f 100644 --- a/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj +++ b/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj @@ -1,4 +1,4 @@ - + Debug @@ -44,9 +44,9 @@ bin\Release\UmbracoExamine.PDF.XML - + False - ..\packages\Examine.0.1.56.2941\lib\Examine.dll + ..\packages\Examine.0.1.57.2941\lib\Examine.dll ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll diff --git a/src/UmbracoExamine.PDF/packages.config b/src/UmbracoExamine.PDF/packages.config index 4e1b27d4f3..adb682b11d 100644 --- a/src/UmbracoExamine.PDF/packages.config +++ b/src/UmbracoExamine.PDF/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj index 8047ce4d96..4a4438a356 100644 --- a/src/UmbracoExamine/UmbracoExamine.csproj +++ b/src/UmbracoExamine/UmbracoExamine.csproj @@ -1,4 +1,4 @@ - + Debug @@ -80,10 +80,9 @@ ..\Solution Items\TheFARM-Public.snk - + False - ..\packages\Examine.0.1.56.2941\lib\Examine.dll - True + ..\packages\Examine.0.1.57.2941\lib\Examine.dll False diff --git a/src/UmbracoExamine/packages.config b/src/UmbracoExamine/packages.config index 6045ab5822..7e2ea1daf3 100644 --- a/src/UmbracoExamine/packages.config +++ b/src/UmbracoExamine/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/umbraco.MacroEngines/packages.config b/src/umbraco.MacroEngines/packages.config index bdd36b16f7..c48a99b992 100644 --- a/src/umbraco.MacroEngines/packages.config +++ b/src/umbraco.MacroEngines/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj index b2b0cb5b4b..78f932f2a1 100644 --- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj +++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj @@ -1,4 +1,4 @@ - + Debug @@ -42,9 +42,9 @@ bin\Release\umbraco.MacroEngines.xml - + False - ..\packages\Examine.0.1.56.2941\lib\Examine.dll + ..\packages\Examine.0.1.57.2941\lib\Examine.dll False