diff --git a/aspnet35.config b/aspnet35.config index 4103d32eff..aa594f4af2 100644 --- a/aspnet35.config +++ b/aspnet35.config @@ -1,240 +1,227 @@  - -
-
+ +
+
- - - -
- -
-
-
-
- - + + + +
+ +
+
+
+
+ + - -
- + +
+ -
-
-
- +
+
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - + + - - - + + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + + + + + + - - - - + + + + + + + + + - - + + + + + + + + + - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/config templates/config/ClientDependency.config b/config templates/config/ClientDependency.config index 118351fbda..cfe62a4a63 100644 --- a/config templates/config/ClientDependency.config +++ b/config templates/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 --> - + diff --git a/config templates/web.config b/config templates/web.config index 068cd72f44..e186181b81 100644 --- a/config templates/web.config +++ b/config templates/web.config @@ -1,213 +1,222 @@ - -
-
+ +
+
-
-
-
+
+
+
- + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - + + + + - - + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + - - - + + + + + + + + + + + + - - - + + + - - - - - - - - + + + - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + - - - - - - + + + + + + + + - - - - - + + + + + + - - + + + + + + + + + - - - + + + + + + + - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/foreign dlls/ClientDependency.Core.dll b/foreign dlls/ClientDependency.Core.dll index 410ebe6006..27987fd98a 100644 Binary files a/foreign dlls/ClientDependency.Core.dll and b/foreign dlls/ClientDependency.Core.dll differ diff --git a/foreign dlls/Examine.dll b/foreign dlls/Examine.dll index fedbc29343..c1dce7f8d4 100644 Binary files a/foreign dlls/Examine.dll and b/foreign dlls/Examine.dll differ diff --git a/foreign dlls/UmbracoExamine.dll b/foreign dlls/UmbracoExamine.dll index dba123cba1..c228bd8c11 100644 Binary files a/foreign dlls/UmbracoExamine.dll and b/foreign dlls/UmbracoExamine.dll differ diff --git a/umbraco.sln b/umbraco.sln index 47317006c8..5c20b71c0f 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -75,6 +75,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLLs", "DLLs", "{F06D18F6-C foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll = foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll foreign dlls\MySql.Data.dll = foreign dlls\MySql.Data.dll foreign dlls\TidyNet.dll = foreign dlls\TidyNet.dll + foreign dlls\UmbracoExamine.dll = foreign dlls\UmbracoExamine.dll foreign dlls\UrlRewritingNet.UrlRewriter.dll = foreign dlls\UrlRewritingNet.UrlRewriter.dll foreign dlls\VistaDB For Umbraco.dll = foreign dlls\VistaDB For Umbraco.dll foreign dlls\VistaDB.NET20.dll = foreign dlls\VistaDB.NET20.dll diff --git a/umbraco/presentation/config/ClientDependency.config b/umbraco/presentation/config/ClientDependency.config index 135df0ecde..567c1af631 100644 --- a/umbraco/presentation/config/ClientDependency.config +++ b/umbraco/presentation/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 --> - + diff --git a/umbraco/presentation/web.STANDARD.config b/umbraco/presentation/web.STANDARD.config index 748cd552c2..f8152f33f1 100644 --- a/umbraco/presentation/web.STANDARD.config +++ b/umbraco/presentation/web.STANDARD.config @@ -165,24 +165,19 @@ + - - + - - + - - - - - - - - - + + + + + @@ -190,20 +185,18 @@ + + - - - - - - + + + + - - - +