Skip to content

Commit

Permalink
Fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeroen committed Sep 24, 2016
2 parents 1645e65 + 36d734a commit abd8761
Show file tree
Hide file tree
Showing 12 changed files with 148 additions and 119 deletions.
18 changes: 6 additions & 12 deletions DataAnnotations/AdditionalSearchContentAttribute.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Copyright© 2015 Jeroen Stemerdink.
//
// Copyright © 2016 Jeroen Stemerdink.
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without
Expand All @@ -8,10 +7,8 @@
// copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following
// conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
Expand All @@ -20,19 +17,18 @@
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.

using System;

namespace EPi.Libraries.BlockSearch.DataAnnotations
{
using System;

/// <summary>
/// Class AdditionalSearchContentAttribute. This class cannot be inherited.
/// Class AdditionalSearchContentAttribute. This class cannot be inherited.
/// </summary>
/// <seealso cref="System.Attribute" />
/// <author>Jeroen Stemerdink</author>
[AttributeUsage(AttributeTargets.Property)]
public sealed class AdditionalSearchContentAttribute : Attribute
{
#region Public Properties

/// <summary>
/// Gets a value indicating whether the property is used for additional search content.
/// </summary>
Expand All @@ -44,7 +40,5 @@ public static bool AdditionalSearchContent
return true;
}
}

#endregion
}
}
65 changes: 59 additions & 6 deletions EPi.Libraries.BlockSearch.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,75 @@
<AssemblyOriginatorKeyFile>EPiServer.Libraries.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="EPiServer, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.CMS.Core.9.0.3\lib\net45\EPiServer.dll</HintPath>
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Data, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Data.dll</HintPath>
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Framework, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Framework.dll</HintPath>
<Reference Include="EPiServer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.ApplicationModules, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.ApplicationModules.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Configuration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.Configuration.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Data, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Data.Cache, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Data.Cache.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Enterprise, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.Enterprise.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Events, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Events.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.ImageLibrary, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.ImageLibrary.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Licensing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Licensing.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.LinkAnalyzer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.LinkAnalyzer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Web.WebControls, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.Web.WebControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.XForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.XForms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="DataAnnotations\AdditionalSearchContentAttribute.cs" />
Expand Down
6 changes: 3 additions & 3 deletions EPi.Libraries.BlockSearch.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<iconUrl>http://jstemerdink.net/images/js-nuget.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<releaseNotes>Updated for EPiServer 9.</releaseNotes>
<copyright>Copyright © Jeroen Stemerdink 2015</copyright>
<releaseNotes>Updated to work with EPiServer 10.</releaseNotes>
<copyright>Copyright © Jeroen Stemerdink 2016</copyright>
<tags>search blocks</tags>
<dependencies>
<dependency id="EPiServer.CMS.Core" version="[9.0.3, 10.0)" />
<dependency id="EPiServer.CMS.Core" version="10.0.0" />
</dependencies>
</metadata>
<files>
Expand Down
1 change: 1 addition & 0 deletions EPi.Libraries.BlockSearch.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
Solution Files\EPiServer.Libraries.ruleset = Solution Files\EPiServer.Libraries.ruleset
Solution Files\EPiServer.Libraries.snk = Solution Files\EPiServer.Libraries.snk
license.txt = license.txt
README.md = README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{434037DF-5B72-4434-B744-9F195600D846}"
Expand Down
Binary file modified GlobalSuppressions.cs
View file
Binary file not shown.
17 changes: 5 additions & 12 deletions Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Copyright© 2015 Jeroen Stemerdink.
//
// Copyright © 2016 Jeroen Stemerdink.
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without
Expand All @@ -8,10 +7,8 @@
// copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following
// conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
Expand All @@ -20,31 +17,27 @@
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.

using System;
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.

[assembly: AssemblyTitle("EPi.Libraries.BlockSearch")]
[assembly: AssemblyDescription("Library to enable indexing of blocks on a page.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Jeroen Stemerdink")]
[assembly: AssemblyProduct("EPi.Libraries.BlockSearch")]
[assembly: AssemblyCopyright("Copyright © Jeroen Stemerdink 2015")]
[assembly: AssemblyCopyright("Copyright © Jeroen Stemerdink 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.

[assembly: ComVisible(false)]
[assembly: CLSCompliant(true)]

// The following GUID is for the ID of the typelib if this project is exposed to COM

[assembly: Guid("f425d829-3a07-4a89-978d-c96e9d76b2f3")]
9 changes: 2 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![GitHub version](https://badge.fury.io/gh/jstemerdink%2FEPi.Libraries.BlockSearch.svg)](http://badge.fury.io/gh/jstemerdink%2FEPi.Libraries.BlockSearch)
[![Semver](http://img.shields.io/SemVer/2.0.0.png)](http://semver.org/spec/v2.0.0.html)
[![Platform](https://img.shields.io/badge/platform-.NET 4.5-blue.svg?style=flat)](https://msdn.microsoft.com/en-us/library/w0x726c2%28v=vs.110%29.aspx)
[![Platform](https://img.shields.io/badge/EPiServer-%209.0.3-orange.svg?style=flat)](http://world.episerver.com/cms/)
[![Platform](https://img.shields.io/badge/EPiServer-%2010.0.0-orange.svg?style=flat)](http://world.episerver.com/cms/)
[![NuGet](https://img.shields.io/badge/NuGet-Release-blue.svg)](http://nuget.episerver.com/en/OtherPages/Package/?packageId=EPi.Libraries.BlockSearch)
[![GitHub license](https://img.shields.io/badge/license-MIT%20license-blue.svg?style=flat)](license.txt)
[![Issue Count](https://codeclimate.com/github/jstemerdink/EPi.Libraries.BlockSearch/badges/issue_count.svg)](https://codeclimate.com/github/jstemerdink/EPi.Libraries.BlockSearch)
Expand All @@ -22,12 +22,7 @@ Note the ScaffoldColumn(false) attribute, which hides it in edit mode.
The aggregated content from string properties marked ```Searchable``` in the Blocks are added to the property marked with ```[AdditionalSearchContent]```.
Note: If for some reason you don't want a property on a Block indexed, just add ```[Seachable(false)]``` to it.
The content of the property marked with ```[AdditionalSearchContent]`` is added to the index and you get results also if the term you are looking for is only used in a Block on the page.
## Requirements
* EPiServer >= 9.0.3
* .Net 4.5
## Deploy
* Compile the project.
* Drop the dll in the bin.


> *Powered by ReSharper*
> [![image](http://resources.jetbrains.com/assets/media/open-graph/jetbrains_250x250.png)](http://jetbrains.com)
Loading

0 comments on commit abd8761

Please sign in to comment.