Skip to content

Upgraded Castle ActiveRecord's NHibernate to 3.3.1.4000 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justintoth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded Castle ActiveRecord's NHibernate to 3.3.1.4000 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified lib/Iesi.Collections.dll
View file
Open in desktop
Binary file not shown.
Binary file modified lib/NHibernate.dll
View file
Open in desktop
Binary file not shown.
6 changes: 2 additions & 4 deletions ...ecord.Framework.Internal.Tests/Castle.ActiveRecord.Framework.Internal.Tests-vs2010.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\$(BuildConfigKey)\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Iesi.Collections">
<HintPath>..\..\lib\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=2.1.0.2002, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="NHibernate">
<HintPath>..\..\lib\NHibernate.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
Expand Down
11 changes: 4 additions & 7 deletions src/Castle.ActiveRecord.Tests.Model/Castle.ActiveRecord.Tests.Model-vs2010.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootPath Condition=" '$(RootPath)' == '' ">$(MSBuildProjectDirectory)\..\..</RootPath>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<Configuration Condition=" '$(Configuration)' == '' ">NET40-Debug</Configuration>
<Configuration Condition=" '$(Configuration)' == '' ">NET40-Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -21,11 +21,10 @@
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NET40-Debug|AnyCPU' ">
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</TargetFrameworkProfile>
<OutputPath>bin\NET40-Debug\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand All @@ -42,7 +41,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NET40-Release|AnyCPU' ">
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</TargetFrameworkProfile>
<OutputPath>bin\NET40-Release\</OutputPath>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
Expand Down Expand Up @@ -81,14 +80,12 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>

<ItemGroup>
<Reference Include="Castle.Components.Validator, Version=1.1.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\$(BuildConfigKey)\Castle.Components.Validator.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=2.1.0.2002, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="NHibernate">
<HintPath>..\..\lib\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
Expand Down
6 changes: 2 additions & 4 deletions src/Castle.ActiveRecord.Tests/Castle.ActiveRecord.Tests-vs2010.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\$(BuildConfigKey)\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Iesi.Collections">
<HintPath>..\..\lib\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
Expand All @@ -126,8 +125,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=2.1.0.2002, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="NHibernate">
<HintPath>..\..\lib\NHibernate.dll</HintPath>
</Reference>
<Reference Include="NHibernate.ByteCode.Castle, Version=2.1.0.2002, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
Expand Down
10 changes: 5 additions & 5 deletions src/Castle.ActiveRecord.Web/Castle.ActiveRecord.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootPath Condition=" '$(RootPath)' == '' ">$(MSBuildProjectDirectory)\..\..</RootPath>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<Configuration Condition=" '$(Configuration)' == '' ">NET40-Debug</Configuration>
<Configuration Condition=" '$(Configuration)' == '' ">NET40-Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -21,7 +21,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NET40-Debug|AnyCPU' ">
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</TargetFrameworkProfile>
<OutputPath>bin\NET40-Debug\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand All @@ -38,12 +38,12 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NET40-Release|AnyCPU' ">
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</TargetFrameworkProfile>
<OutputPath>bin\NET40-Release\</OutputPath>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE;PHYSICALASSEMBLY DOTNET DOTNET40 CLIENTPROFILE</DefineConstants>
<DocumentationFile>bin\NET40-Release\Castle.ActiveRecord.Web.xml</DocumentationFile>
<DocumentationFile>bin\NET40-Release\Castle.ActiveRecord.Web.xml</DocumentationFile>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
Expand Down Expand Up @@ -71,7 +71,7 @@
</TargetFrameworkProfile>
<OutputPath>bin\NET35-Release\</OutputPath>
<DefineConstants>TRACE;PHYSICALASSEMBLY DOTNET DOTNET35</DefineConstants>
<DocumentationFile>bin\NET40-Release\Castle.ActiveRecord.Web.xml</DocumentationFile>
<DocumentationFile>bin\NET40-Release\Castle.ActiveRecord.Web.xml</DocumentationFile>
<Optimize>true</Optimize>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1591</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion src/Castle.ActiveRecord/ByteCode/ProxyFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public override INHibernateProxy GetProxy(object id, ISessionImplementor session
/// Returns a proxy capable of field interception.
/// </summary>
/// <returns></returns>
public override object GetFieldInterceptionProxy()
public override object GetFieldInterceptionProxy(object instanceToWrap)
{
var proxyGenerationOptions = new ProxyGenerationOptions();
var interceptor = new LazyFieldInterceptor();
Expand Down
6 changes: 2 additions & 4 deletions src/Castle.ActiveRecord/Castle.ActiveRecord-vs2010.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\$(BuildConfigKey)\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Iesi.Collections">
<HintPath>..\..\lib\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=2.1.0.2002, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="NHibernate">
<HintPath>..\..\lib\NHibernate.dll</HintPath>
</Reference>
<Reference Include="NHibernate.ByteCode.Castle, Version=2.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/Castle.ActiveRecord/Framework/Queries/LinqQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public Type RootType
/// <inheritDoc />
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<T>)
Result = new List<T>(result as IEnumerable<T>);
return result;
Expand Down
46 changes: 33 additions & 13 deletions src/Castle.ActiveRecord/Framework/StatelessSessionWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(T entity) where T : class
{
throw new NotWrappedException();
}

public T Merge<T>(string entityName, T entity) where T : class
{
throw new NotWrappedException();
}

public void Persist(string entityName, object obj)
{
Expand Down Expand Up @@ -551,10 +561,20 @@ public void Update(object obj, object id)
/// <returns>
/// An ICriteria&lt;T&gt; object
/// </returns>
public IQueryOver<T, T> QueryOver<T>() where T : class
{
throw new NotWrappedException();
}
public IQueryOver<T, T> QueryOver<T>() where T : class
{
throw new NotWrappedException();
}

public IQueryOver<T, T> QueryOver<T>(string entityName) where T : class
{
throw new NotWrappedException();
}

public IQueryOver<T, T> QueryOver<T>(string entityName, Expression<Func<T>> alias) where T : class
{
throw new NotWrappedException();
}

#endregion

Expand Down