diff --git a/lib/Iesi.Collections.dll b/lib/Iesi.Collections.dll
index 848ca52..894206a 100644
Binary files a/lib/Iesi.Collections.dll and b/lib/Iesi.Collections.dll differ
diff --git a/lib/NHibernate.dll b/lib/NHibernate.dll
index 21232aa..20f0b15 100644
Binary files a/lib/NHibernate.dll and b/lib/NHibernate.dll differ
diff --git a/src/Castle.ActiveRecord.Framework.Internal.Tests/Castle.ActiveRecord.Framework.Internal.Tests-vs2010.csproj b/src/Castle.ActiveRecord.Framework.Internal.Tests/Castle.ActiveRecord.Framework.Internal.Tests-vs2010.csproj
index 15d8eb1..e985330 100644
--- a/src/Castle.ActiveRecord.Framework.Internal.Tests/Castle.ActiveRecord.Framework.Internal.Tests-vs2010.csproj
+++ b/src/Castle.ActiveRecord.Framework.Internal.Tests/Castle.ActiveRecord.Framework.Internal.Tests-vs2010.csproj
@@ -104,12 +104,10 @@
False
..\..\lib\$(BuildConfigKey)\Castle.Core.dll
-
- False
+
..\..\lib\Iesi.Collections.dll
-
- False
+
..\..\lib\NHibernate.dll
diff --git a/src/Castle.ActiveRecord.Tests.Model/Castle.ActiveRecord.Tests.Model-vs2010.csproj b/src/Castle.ActiveRecord.Tests.Model/Castle.ActiveRecord.Tests.Model-vs2010.csproj
index 5ebf5bc..90d61bc 100644
--- a/src/Castle.ActiveRecord.Tests.Model/Castle.ActiveRecord.Tests.Model-vs2010.csproj
+++ b/src/Castle.ActiveRecord.Tests.Model/Castle.ActiveRecord.Tests.Model-vs2010.csproj
@@ -4,7 +4,7 @@
$(MSBuildProjectDirectory)\..\..
v4.0
Client
- NET40-Debug
+ NET40-Debug
AnyCPU
@@ -21,11 +21,10 @@
3.5
-
v4.0
-
+
bin\NET40-Debug\
true
full
@@ -42,7 +41,7 @@
v4.0
-
+
bin\NET40-Release\
pdbonly
true
@@ -81,14 +80,12 @@
AnyCPU
prompt
-
False
..\..\lib\$(BuildConfigKey)\Castle.Components.Validator.dll
-
- False
+
..\..\lib\NHibernate.dll
diff --git a/src/Castle.ActiveRecord.Tests/Castle.ActiveRecord.Tests-vs2010.csproj b/src/Castle.ActiveRecord.Tests/Castle.ActiveRecord.Tests-vs2010.csproj
index 2ffae67..1042b64 100644
--- a/src/Castle.ActiveRecord.Tests/Castle.ActiveRecord.Tests-vs2010.csproj
+++ b/src/Castle.ActiveRecord.Tests/Castle.ActiveRecord.Tests-vs2010.csproj
@@ -114,8 +114,7 @@
False
..\..\lib\$(BuildConfigKey)\Castle.Core.dll
-
- False
+
..\..\lib\Iesi.Collections.dll
@@ -126,8 +125,7 @@
False
..\..\lib\Lucene.Net.dll
-
- False
+
..\..\lib\NHibernate.dll
diff --git a/src/Castle.ActiveRecord.Web/Castle.ActiveRecord.Web.csproj b/src/Castle.ActiveRecord.Web/Castle.ActiveRecord.Web.csproj
index de734ed..1461872 100644
--- a/src/Castle.ActiveRecord.Web/Castle.ActiveRecord.Web.csproj
+++ b/src/Castle.ActiveRecord.Web/Castle.ActiveRecord.Web.csproj
@@ -4,7 +4,7 @@
$(MSBuildProjectDirectory)\..\..
v4.0
Client
- NET40-Debug
+ NET40-Debug
AnyCPU
@@ -21,7 +21,7 @@
v4.0
-
+
bin\NET40-Debug\
true
full
@@ -38,12 +38,12 @@
v4.0
-
+
bin\NET40-Release\
pdbonly
true
TRACE;PHYSICALASSEMBLY DOTNET DOTNET40 CLIENTPROFILE
- bin\NET40-Release\Castle.ActiveRecord.Web.xml
+ bin\NET40-Release\Castle.ActiveRecord.Web.xml
prompt
4
1591
@@ -71,7 +71,7 @@
bin\NET35-Release\
TRACE;PHYSICALASSEMBLY DOTNET DOTNET35
- bin\NET40-Release\Castle.ActiveRecord.Web.xml
+ bin\NET40-Release\Castle.ActiveRecord.Web.xml
true
true
1591
diff --git a/src/Castle.ActiveRecord/ByteCode/ProxyFactory.cs b/src/Castle.ActiveRecord/ByteCode/ProxyFactory.cs
index e9e7a54..02e0e8a 100644
--- a/src/Castle.ActiveRecord/ByteCode/ProxyFactory.cs
+++ b/src/Castle.ActiveRecord/ByteCode/ProxyFactory.cs
@@ -63,7 +63,7 @@ public override INHibernateProxy GetProxy(object id, ISessionImplementor session
/// Returns a proxy capable of field interception.
///
///
- public override object GetFieldInterceptionProxy()
+ public override object GetFieldInterceptionProxy(object instanceToWrap)
{
var proxyGenerationOptions = new ProxyGenerationOptions();
var interceptor = new LazyFieldInterceptor();
diff --git a/src/Castle.ActiveRecord/Castle.ActiveRecord-vs2010.csproj b/src/Castle.ActiveRecord/Castle.ActiveRecord-vs2010.csproj
index 6bc3638..d6e091c 100644
--- a/src/Castle.ActiveRecord/Castle.ActiveRecord-vs2010.csproj
+++ b/src/Castle.ActiveRecord/Castle.ActiveRecord-vs2010.csproj
@@ -117,12 +117,10 @@
False
..\..\lib\$(BuildConfigKey)\Castle.Core.dll
-
- False
+
..\..\lib\Iesi.Collections.dll
-
- False
+
..\..\lib\NHibernate.dll
diff --git a/src/Castle.ActiveRecord/Framework/Queries/LinqQuery.cs b/src/Castle.ActiveRecord/Framework/Queries/LinqQuery.cs
index ea2c0b8..034870d 100644
--- a/src/Castle.ActiveRecord/Framework/Queries/LinqQuery.cs
+++ b/src/Castle.ActiveRecord/Framework/Queries/LinqQuery.cs
@@ -56,7 +56,7 @@ public Type RootType
///
public object Execute(ISession session)
{
- var result = new NhQueryProvider((ISessionImplementor) session).Execute(expression);
+ var result = new DefaultQueryProvider((ISessionImplementor)session).Execute(expression);
if (result is IEnumerable)
Result = new List(result as IEnumerable);
return result;
diff --git a/src/Castle.ActiveRecord/Framework/StatelessSessionWrapper.cs b/src/Castle.ActiveRecord/Framework/StatelessSessionWrapper.cs
index e4a00be..76f0c52 100644
--- a/src/Castle.ActiveRecord/Framework/StatelessSessionWrapper.cs
+++ b/src/Castle.ActiveRecord/Framework/StatelessSessionWrapper.cs
@@ -449,15 +449,25 @@ public void Lock(object obj, LockMode lockMode)
throw new NotWrappedException();
}
- public object Merge(string entityName, object obj)
- {
- throw new NotWrappedException();
- }
-
- public object Merge(object obj)
- {
- throw new NotWrappedException();
- }
+ public object Merge(string entityName, object obj)
+ {
+ throw new NotWrappedException();
+ }
+
+ public object Merge(object obj)
+ {
+ throw new NotWrappedException();
+ }
+
+ public T Merge(T entity) where T : class
+ {
+ throw new NotWrappedException();
+ }
+
+ public T Merge(string entityName, T entity) where T : class
+ {
+ throw new NotWrappedException();
+ }
public void Persist(string entityName, object obj)
{
@@ -551,10 +561,20 @@ public void Update(object obj, object id)
///
/// An ICriteria<T> object
///
- public IQueryOver QueryOver() where T : class
- {
- throw new NotWrappedException();
- }
+ public IQueryOver QueryOver() where T : class
+ {
+ throw new NotWrappedException();
+ }
+
+ public IQueryOver QueryOver(string entityName) where T : class
+ {
+ throw new NotWrappedException();
+ }
+
+ public IQueryOver QueryOver(string entityName, Expression> alias) where T : class
+ {
+ throw new NotWrappedException();
+ }
#endregion