diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 11d9004a34..aacd55d4be 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -25,7 +25,7 @@
-
+
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 4258e14aa0..75c3f5a230 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -48,7 +48,7 @@
-
+
diff --git a/src/Umbraco.Examine/UmbracoExamineIndex.cs b/src/Umbraco.Examine/UmbracoExamineIndex.cs
index 3a7a21bdb3..1933874fc7 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndex.cs
@@ -86,37 +86,7 @@ namespace Umbraco.Examine
private readonly bool _configBased = false;
- ///
- /// A type that defines the type of index for each Umbraco field (non user defined fields)
- /// Alot of standard umbraco fields shouldn't be tokenized or even indexed, just stored into lucene
- /// for retreival after searching.
- ///
- public static readonly FieldDefinition[] UmbracoIndexFieldDefinitions =
- {
- new FieldDefinition("parentID", FieldDefinitionTypes.Integer),
- new FieldDefinition("level", FieldDefinitionTypes.Integer),
- new FieldDefinition("writerID", FieldDefinitionTypes.Integer),
- new FieldDefinition("creatorID", FieldDefinitionTypes.Integer),
- new FieldDefinition("sortOrder", FieldDefinitionTypes.Integer),
- new FieldDefinition("template", FieldDefinitionTypes.Integer),
-
- new FieldDefinition("createDate", FieldDefinitionTypes.DateTime),
- new FieldDefinition("updateDate", FieldDefinitionTypes.DateTime),
-
- new FieldDefinition("key", FieldDefinitionTypes.InvariantCultureIgnoreCase),
- new FieldDefinition("version", FieldDefinitionTypes.Raw),
- new FieldDefinition("nodeType", FieldDefinitionTypes.InvariantCultureIgnoreCase),
- new FieldDefinition("template", FieldDefinitionTypes.Raw),
- new FieldDefinition("urlName", FieldDefinitionTypes.InvariantCultureIgnoreCase),
- new FieldDefinition("path", FieldDefinitionTypes.Raw),
-
- new FieldDefinition("email", FieldDefinitionTypes.EmailAddress),
-
- new FieldDefinition(PublishedFieldName, FieldDefinitionTypes.Raw),
- new FieldDefinition(NodeKeyFieldName, FieldDefinitionTypes.Raw),
- new FieldDefinition(IndexPathFieldName, FieldDefinitionTypes.Raw),
- new FieldDefinition(IconFieldName, FieldDefinitionTypes.Raw)
- };
+
protected ProfilingLogger ProfilingLogger { get; }
@@ -155,7 +125,7 @@ namespace Umbraco.Examine
}
//this is config based, so add the default definitions
- foreach (var field in UmbracoIndexFieldDefinitions)
+ foreach (var field in UmbracoFieldDefinitionCollection.UmbracoIndexFieldDefinitions)
{
FieldDefinitionCollection.TryAdd(field);
}
diff --git a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
index ce59501046..97d1f68727 100644
--- a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
+++ b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
@@ -9,10 +9,42 @@ namespace Umbraco.Examine
{
public UmbracoFieldDefinitionCollection()
- : base(UmbracoExamineIndex.UmbracoIndexFieldDefinitions)
+ : base(UmbracoIndexFieldDefinitions)
{
}
+ ///
+ /// A type that defines the type of index for each Umbraco field (non user defined fields)
+ /// Alot of standard umbraco fields shouldn't be tokenized or even indexed, just stored into lucene
+ /// for retreival after searching.
+ ///
+ public static readonly FieldDefinition[] UmbracoIndexFieldDefinitions =
+ {
+ new FieldDefinition("parentID", FieldDefinitionTypes.Integer),
+ new FieldDefinition("level", FieldDefinitionTypes.Integer),
+ new FieldDefinition("writerID", FieldDefinitionTypes.Integer),
+ new FieldDefinition("creatorID", FieldDefinitionTypes.Integer),
+ new FieldDefinition("sortOrder", FieldDefinitionTypes.Integer),
+ new FieldDefinition("template", FieldDefinitionTypes.Integer),
+
+ new FieldDefinition("createDate", FieldDefinitionTypes.DateTime),
+ new FieldDefinition("updateDate", FieldDefinitionTypes.DateTime),
+
+ new FieldDefinition("key", FieldDefinitionTypes.InvariantCultureIgnoreCase),
+ new FieldDefinition("version", FieldDefinitionTypes.Raw),
+ new FieldDefinition("nodeType", FieldDefinitionTypes.InvariantCultureIgnoreCase),
+ new FieldDefinition("template", FieldDefinitionTypes.Raw),
+ new FieldDefinition("urlName", FieldDefinitionTypes.InvariantCultureIgnoreCase),
+ new FieldDefinition("path", FieldDefinitionTypes.Raw),
+
+ new FieldDefinition("email", FieldDefinitionTypes.EmailAddress),
+
+ new FieldDefinition(UmbracoExamineIndex.PublishedFieldName, FieldDefinitionTypes.Raw),
+ new FieldDefinition(UmbracoExamineIndex.NodeKeyFieldName, FieldDefinitionTypes.Raw),
+ new FieldDefinition(UmbracoExamineIndex.IndexPathFieldName, FieldDefinitionTypes.Raw),
+ new FieldDefinition(UmbracoExamineIndex.IconFieldName, FieldDefinitionTypes.Raw)
+ };
+
/////
///// Overridden to dynamically add field definitions for culture variations
/////
@@ -40,4 +72,4 @@ namespace Umbraco.Examine
//}
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 810ebe5ab4..2d20c588b5 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -77,7 +77,7 @@
-
+
1.8.9
diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
index 8156f640d6..3e96e30c6a 100644
--- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
@@ -5,6 +5,7 @@ using LightInject;
using Examine;
using NUnit.Framework;
using Examine.LuceneEngine.SearchCriteria;
+using Examine.SearchCriteria;
using Moq;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence;
@@ -74,7 +75,7 @@ namespace Umbraco.Tests.UmbracoExamine
var stringSortedCriteria = searcher.CreateCriteria()
.ParentId(1148).And()
- .OrderBy("sortOrder"); //will default to string
+ .OrderBy(new SortableField("sortOrder"));//will default to string
var stringSortedResult = searcher.Search(stringSortedCriteria.Compile());
Assert.AreEqual(12, numberSortedResult.TotalItemCount);
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 4a34e23afb..465544960c 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -88,7 +88,7 @@
-
+
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
index f203d5d2c9..3f776830a6 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -8,6 +8,7 @@ using System.Xml.XPath;
using Examine;
using Examine.LuceneEngine.SearchCriteria;
using Examine.Providers;
+using Examine.SearchCriteria;
using Lucene.Net.Store;
using Umbraco.Core;
using Umbraco.Core.Logging;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8006277c73..eb6eab9829 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -62,7 +62,7 @@
-
+
2.6.2.25