Hi all,
We use a local fork of Lucene.NET 2.9.2, and have made made several
small changes we'd like to see incorporated to the main branches (2_9_2
and trunk). I'm attaching the patches with this message.
The changes are for making the AlreadyClosedException serializable, CLS
compliance, and for signing the assembly.
Thanks,
Itamar.
commit 40f81a3fc4ee9a25719980ca41fa07143166aa45
Author: Ayende Rahien <aye...@ayende.com>
Date: Wed Nov 10 16:30:31 2010 +0200
* Making sure that the exception can be serialized
* Making sure that Lucene is marked as cls compliant
diff --git a/SharedLibs/Lucene.Net.dll b/SharedLibs/Lucene.Net.dll
index 24ac82f..ca1f241 100644
Binary files a/SharedLibs/Lucene.Net.dll and b/SharedLibs/Lucene.Net.dll differ
diff --git a/SharedLibs/Lucene.Net.pdb b/SharedLibs/Lucene.Net.pdb
index e9bc6c8..cd81d15 100644
Binary files a/SharedLibs/Lucene.Net.pdb and b/SharedLibs/Lucene.Net.pdb differ
diff --git a/SharedLibs/Sources/Lucene2.9.2/src/Lucene.Net/AssemblyInfo.cs
b/SharedLibs/Sources/Lucene2.9.2/src/Lucene.Net/AssemblyInfo.cs
index 5dbc338..854e9eb 100644
--- a/SharedLibs/Sources/Lucene2.9.2/src/Lucene.Net/AssemblyInfo.cs
+++ b/SharedLibs/Sources/Lucene2.9.2/src/Lucene.Net/AssemblyInfo.cs
@@ -15,6 +15,7 @@
* limitations under the License.
*/
+using System;
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -32,7 +33,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyTrademark("Copyright 2006 - 2009 The Apache Software
Foundation")]
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-
+[assembly: CLSCompliant(true)]
[assembly: AssemblyInformationalVersionAttribute("2.9.2")]
diff --git
a/SharedLibs/Sources/Lucene2.9.2/src/Lucene.Net/Store/AlreadyClosedException.cs
b/SharedLibs/Sources/Lucene2.9.2/src/Lucene.Net/Store/AlreadyClosedException.cs
index b53c4b3..c52bbec 100644
---
a/SharedLibs/Sources/Lucene2.9.2/src/Lucene.Net/Store/AlreadyClosedException.cs
+++
b/SharedLibs/Sources/Lucene2.9.2/src/Lucene.Net/Store/AlreadyClosedException.cs
@@ -16,6 +16,7 @@
*/
using System;
+using System.Runtime.Serialization;
namespace Lucene.Net.Store
{
@@ -29,5 +30,12 @@ namespace Lucene.Net.Store
public AlreadyClosedException(System.String
message):base(message)
{
}
+
+
+ protected AlreadyClosedException(
+ SerializationInfo info,
+ StreamingContext context) : base(info, context)
+ {
+ }
}
}
Index: Lucene.Net.csproj
===================================================================
--- Lucene.Net.csproj (revision 1086075)
+++ Lucene.Net.csproj (working copy)
@@ -11,8 +11,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>Lucene.Net</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>Lucene.NET.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -26,6 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
<OutputPath>bin\Debug\</OutputPath>
@@ -900,6 +900,7 @@
<None Include="Analysis\Standard\StandardTokenizerImpl.jflex" />
<None Include="Lucene.Net.Search.RemoteSearchable.config" />
<None Include="Lucene.Net.Search.TestSort.config" />
+ <None Include="Lucene.NET.snk" />
<None Include="QueryParser\QueryParser.jj" />
<Content Include="Analysis\Package.html" />
<Content Include="Analysis\Standard\Package.html" />
Index: Lucene.NET.snk
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: Lucene.NET.snk
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
