From 5041e6fcc41a8b09901e84dcd90b912ad45c8bd1 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Tue, 28 May 2013 13:24:48 -1000
Subject: [PATCH] Updated to latest CDF version that has a few bug fixes and
 added a CDF logger.

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  8 ++--
 .../config/ClientDependency.Release.config    |  2 +-
 .../config/ClientDependency.config            |  6 +--
 src/Umbraco.Web.UI/packages.config            |  4 +-
 src/Umbraco.Web/UI/CdfLogger.cs               | 40 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  5 ++-
 src/Umbraco.Web/packages.config               |  2 +-
 src/umbraco.cms/packages.config               |  2 +-
 src/umbraco.cms/umbraco.cms.csproj            |  4 +-
 src/umbraco.controls/packages.config          |  2 +-
 src/umbraco.controls/umbraco.controls.csproj  |  4 +-
 src/umbraco.editorControls/packages.config    |  2 +-
 .../umbraco.editorControls.csproj             |  4 +-
 src/umbraco.macroRenderings/packages.config   |  2 +-
 .../umbraco.macroRenderings.csproj            |  4 +-
 15 files changed, 66 insertions(+), 25 deletions(-)
 create mode 100644 src/Umbraco.Web/UI/CdfLogger.cs

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 1ffe861698..b343c6d1b9 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -100,13 +100,13 @@
       <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
       <Name>UmbracoExamine</Name>
     </ProjectReference>
-    <Reference Include="ClientDependency.Core, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ClientDependency.Core, Version=1.7.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency.1.6.0.0\lib\ClientDependency.Core.dll</HintPath>
+      <HintPath>..\packages\ClientDependency.1.7.0.1\lib\ClientDependency.Core.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency-Mvc.1.6.0.0\lib\ClientDependency.Core.Mvc.dll</HintPath>
+      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.0\lib\ClientDependency.Core.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Examine, Version=0.1.51.2941, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.Release.config b/src/Umbraco.Web.UI/config/ClientDependency.Release.config
index f1072853ef..75eba648cc 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.Release.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.Release.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="1" fileDependencyExtensions=".js,.css">
+<clientDependency version="1" fileDependencyExtensions=".js,.css"  loggerType="Umbraco.Web.UI.CdfLogger, Umbraco.Web">
 
   <fileRegistration defaultProvider="LoaderControlProvider">
     <providers>
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index f2bc1255b9..e71cef5626 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="9" fileDependencyExtensions=".js,.css">
+<clientDependency version="11" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
 	<fileRegistration defaultProvider="LoaderControlProvider">
 		<providers>
@@ -30,8 +30,8 @@ NOTES:
 			<add name="LazyLoadRenderer" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadRenderer, ClientDependency.Core" />
 		</renderers>
 	</mvc>
-
-	<!--
+  
+  <!--
     The composite file section configures the compression/combination/minification of files.
     You can enable/disable minification of either JS/CSS files and you can enable/disable the 
     persistence of composite files. By default, minification and persistence is enabled. Persisting files
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index e1ede92f48..ae380843b5 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.6.0.0" targetFramework="net40" />
-  <package id="ClientDependency-Mvc" version="1.6.0.0" targetFramework="net40" />
+  <package id="ClientDependency" version="1.7.0.1" targetFramework="net40" />
+  <package id="ClientDependency-Mvc" version="1.7.0.0" targetFramework="net40" />
   <package id="Examine" version="0.1.51.2941" targetFramework="net40" />
   <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
diff --git a/src/Umbraco.Web/UI/CdfLogger.cs b/src/Umbraco.Web/UI/CdfLogger.cs
new file mode 100644
index 0000000000..75c7f33c84
--- /dev/null
+++ b/src/Umbraco.Web/UI/CdfLogger.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ClientDependency.Core.Logging;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Web.UI
+{
+    /// <summary>
+    /// A logger for ClientDependency
+    /// </summary>
+    public class CdfLogger : ILogger
+    {
+        public void Debug(string msg)
+        {
+            LogHelper.Debug<CdfLogger>(msg);
+        }
+
+        public void Info(string msg)
+        {
+            LogHelper.Info<CdfLogger>(msg);
+        }
+
+        public void Warn(string msg)
+        {
+            LogHelper.Warn<CdfLogger>(msg);
+        }
+
+        public void Error(string msg, Exception ex)
+        {
+            LogHelper.Error<CdfLogger>(msg, ex);
+        }
+
+        public void Fatal(string msg, Exception ex)
+        {
+            LogHelper.Error<CdfLogger>(msg, ex);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8e3e50c8d2..32782b59f9 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -93,9 +93,9 @@
       <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
       <Name>UmbracoExamine</Name>
     </ProjectReference>
-    <Reference Include="ClientDependency.Core, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ClientDependency.Core, Version=1.7.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency.1.6.0.0\lib\ClientDependency.Core.dll</HintPath>
+      <HintPath>..\packages\ClientDependency.1.7.0.1\lib\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -363,6 +363,7 @@
     <Compile Include="Search\LuceneIndexerExtensions.cs" />
     <Compile Include="Security\ValidateRequestAttempt.cs" />
     <Compile Include="Security\WebSecurity.cs" />
+    <Compile Include="UI\CdfLogger.cs" />
     <Compile Include="umbraco.presentation\LegacyClasses.cs" />
     <Compile Include="umbraco.presentation\umbraco\controls\ContentTypeControlNew.ascx.cs">
       <SubType>ASPXCodeBehind</SubType>
diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config
index 547b8010a1..b08cde1612 100644
--- a/src/Umbraco.Web/packages.config
+++ b/src/Umbraco.Web/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.6.0.0" targetFramework="net40" />
+  <package id="ClientDependency" version="1.7.0.1" targetFramework="net40" />
   <package id="CodeSharp.Package.AspNetWebPage" version="1.0" targetFramework="net40" />
   <package id="Examine" version="0.1.51.2941" targetFramework="net40" />
   <package id="HtmlAgilityPack" version="1.4.5" targetFramework="net40" />
diff --git a/src/umbraco.cms/packages.config b/src/umbraco.cms/packages.config
index a805391a57..72b6577114 100644
--- a/src/umbraco.cms/packages.config
+++ b/src/umbraco.cms/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.6.0.0" targetFramework="net40" />
+  <package id="ClientDependency" version="1.7.0.1" targetFramework="net40" />
   <package id="HtmlAgilityPack" version="1.4.5" targetFramework="net40" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
   <package id="Tidy.Net" version="1.0.0" targetFramework="net40" />
diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj
index bcc45ccd83..63b5f75996 100644
--- a/src/umbraco.cms/umbraco.cms.csproj
+++ b/src/umbraco.cms/umbraco.cms.csproj
@@ -104,9 +104,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ClientDependency.Core, Version=1.7.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency.1.6.0.0\lib\ClientDependency.Core.dll</HintPath>
+      <HintPath>..\packages\ClientDependency.1.7.0.1\lib\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.5.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/umbraco.controls/packages.config b/src/umbraco.controls/packages.config
index 293edbc5f2..715831b86d 100644
--- a/src/umbraco.controls/packages.config
+++ b/src/umbraco.controls/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.6.0.0" targetFramework="net40" />
+  <package id="ClientDependency" version="1.7.0.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/umbraco.controls/umbraco.controls.csproj b/src/umbraco.controls/umbraco.controls.csproj
index 5774e0a394..9b81009daf 100644
--- a/src/umbraco.controls/umbraco.controls.csproj
+++ b/src/umbraco.controls/umbraco.controls.csproj
@@ -66,9 +66,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ClientDependency.Core, Version=1.7.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency.1.6.0.0\lib\ClientDependency.Core.dll</HintPath>
+      <HintPath>..\packages\ClientDependency.1.7.0.1\lib\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
diff --git a/src/umbraco.editorControls/packages.config b/src/umbraco.editorControls/packages.config
index 293edbc5f2..715831b86d 100644
--- a/src/umbraco.editorControls/packages.config
+++ b/src/umbraco.editorControls/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.6.0.0" targetFramework="net40" />
+  <package id="ClientDependency" version="1.7.0.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj
index 8e0bd3f736..a75fc90d2b 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -112,9 +112,9 @@
       <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
       <Name>Umbraco.Web</Name>
     </ProjectReference>
-    <Reference Include="ClientDependency.Core, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ClientDependency.Core, Version=1.7.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency.1.6.0.0\lib\ClientDependency.Core.dll</HintPath>
+      <HintPath>..\packages\ClientDependency.1.7.0.1\lib\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/src/umbraco.macroRenderings/packages.config b/src/umbraco.macroRenderings/packages.config
index 8d76bfb8a2..fe7d4272da 100644
--- a/src/umbraco.macroRenderings/packages.config
+++ b/src/umbraco.macroRenderings/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.6.0.0" targetFramework="net40" />
+  <package id="ClientDependency" version="1.7.0.1" targetFramework="net40" />
   <package id="Microsoft.ApplicationBlocks.Data" version="1.0.1559.20655" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj b/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
index c065a6e06c..79399192ba 100644
--- a/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
+++ b/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
@@ -104,9 +104,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ClientDependency.Core, Version=1.7.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency.1.6.0.0\lib\ClientDependency.Core.dll</HintPath>
+      <HintPath>..\packages\ClientDependency.1.7.0.1\lib\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
       <SpecificVersion>False</SpecificVersion>