Skip to content

Commit 0f88aa1

Browse files
hazzikhazzik
committed
Merge branch 'NH-3750'
2 parents 034af1a + 97b364e commit 0f88aa1

File tree

11 files changed

+21
-25
lines changed

11 files changed

+21
-25
lines changed

‎src/NHibernate.DomainModel/NHibernate.DomainModel.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
<ItemGroup>
6262
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
6363
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
64-
<Private>True</Private>
6564
</Reference>
6665
<Reference Include="System" />
6766
<Reference Include="System.Core">

‎src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<ItemGroup>
5555
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
5656
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
57-
<Private>True</Private>
5857
</Reference>
5958
<Reference Include="System" />
6059
<Reference Include="System.Data" />

‎src/NHibernate.Test/NHibernate.Test.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@
8383
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
8484
<Private>True</Private>
8585
</Reference>
86-
<Reference Include="Remotion.Linq, Version=1.13.183.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL" Condition=" '$(Configuration)' == 'Debug' ">
87-
<HintPath>..\packages\Remotion.Linq.1.13.183.0\lib\net35\Remotion.Linq.dll</HintPath>
88-
<Private>True</Private>
89-
</Reference>
9086
<Reference Include="System" />
9187
<Reference Include="System.configuration" />
9288
<Reference Include="System.Core">
@@ -104,6 +100,9 @@
104100
<Reference Include="System.Xml.Linq">
105101
<RequiredTargetFramework>3.5</RequiredTargetFramework>
106102
</Reference>
103+
<Reference Include="Remotion.Linq, Version=1.15.15.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
104+
<HintPath>..\packages\Remotion.Linq.1.15.15.0\lib\portable-net45+wp80+wpa81+win\Remotion.Linq.dll</HintPath>
105+
</Reference>
107106
</ItemGroup>
108107
<ItemGroup>
109108
<Compile Include="..\SharedAssemblyInfo.cs">
@@ -2732,7 +2731,9 @@
27322731
<EmbeddedResource Include="ReadOnly\TextHolder.hbm.xml" />
27332732
<EmbeddedResource Include="ReadOnly\VersionedNode.hbm.xml" />
27342733
<EmbeddedResource Include="NHSpecificTest\NH2554\Mappings.hbm.xml" />
2735-
<None Include="packages.config" />
2734+
<None Include="packages.config">
2735+
<SubType>Designer</SubType>
2736+
</None>
27362737
</ItemGroup>
27372738
<ItemGroup>
27382739
<ProjectReference Include="..\NHibernate.DomainModel\NHibernate.DomainModel.csproj">

‎src/NHibernate.Test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net461" />
55
<package id="log4net" version="2.0.7" targetFramework="net461" />
66
<package id="NUnit" version="3.6.0" targetFramework="net461" />
7-
<package id="Remotion.Linq" version="1.13.183.0" targetFramework="net461" />
7+
<package id="Remotion.Linq" version="1.15.15.0" targetFramework="net461" />
88
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net461" />
99
</packages>

‎src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
</Reference>
6969
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
7070
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
71-
<Private>True</Private>
7271
</Reference>
7372
<Reference Include="System" />
7473
<Reference Include="System.Core">

‎src/NHibernate/Linq/Clauses/NhJoinClause.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Collections.ObjectModel;
34
using System.Linq.Expressions;
45
using NHibernate.Linq.Visitors;
56
using Remotion.Linq.Clauses;
67
using Remotion.Linq.Clauses.Expressions;
7-
using Remotion.Linq.Collections;
88

99
namespace NHibernate.Linq.Clauses
1010
{

‎src/NHibernate/Linq/EagerFetchingExtensionMethods.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Linq.Expressions;
55
using System.Reflection;
66
using Remotion.Linq;
7-
using Remotion.Linq.Utilities;
87

98
namespace NHibernate.Linq
109
{
@@ -13,8 +12,8 @@ public static class EagerFetchingExtensionMethods
1312
public static INhFetchRequest<TOriginating, TRelated> Fetch<TOriginating, TRelated>(
1413
this IQueryable<TOriginating> query, Expression<Func<TOriginating, TRelated>> relatedObjectSelector)
1514
{
16-
ArgumentUtility.CheckNotNull("query", query);
17-
ArgumentUtility.CheckNotNull("relatedObjectSelector", relatedObjectSelector);
15+
if (query == null) throw new ArgumentNullException(nameof(query));
16+
if (relatedObjectSelector == null) throw new ArgumentNullException(nameof(relatedObjectSelector));
1817

1918
var methodInfo = ((MethodInfo)MethodBase.GetCurrentMethod()).MakeGenericMethod(typeof(TOriginating), typeof(TRelated));
2019
return CreateFluentFetchRequest<TOriginating, TRelated>(methodInfo, query, relatedObjectSelector);
@@ -23,8 +22,8 @@ public static INhFetchRequest<TOriginating, TRelated> Fetch<TOriginating, TRelat
2322
public static INhFetchRequest<TOriginating, TRelated> FetchMany<TOriginating, TRelated>(
2423
this IQueryable<TOriginating> query, Expression<Func<TOriginating, IEnumerable<TRelated>>> relatedObjectSelector)
2524
{
26-
ArgumentUtility.CheckNotNull("query", query);
27-
ArgumentUtility.CheckNotNull("relatedObjectSelector", relatedObjectSelector);
25+
if (query == null) throw new ArgumentNullException(nameof(query));
26+
if (relatedObjectSelector == null) throw new ArgumentNullException(nameof(relatedObjectSelector));
2827

2928
var methodInfo = ((MethodInfo)MethodBase.GetCurrentMethod()).MakeGenericMethod(typeof(TOriginating), typeof(TRelated));
3029
return CreateFluentFetchRequest<TOriginating, TRelated>(methodInfo, query, relatedObjectSelector);
@@ -33,8 +32,8 @@ public static INhFetchRequest<TOriginating, TRelated> FetchMany<TOriginating, TR
3332
public static INhFetchRequest<TQueried, TRelated> ThenFetch<TQueried, TFetch, TRelated>(
3433
this INhFetchRequest<TQueried, TFetch> query, Expression<Func<TFetch, TRelated>> relatedObjectSelector)
3534
{
36-
ArgumentUtility.CheckNotNull("query", query);
37-
ArgumentUtility.CheckNotNull("relatedObjectSelector", relatedObjectSelector);
35+
if (query == null) throw new ArgumentNullException(nameof(query));
36+
if (relatedObjectSelector == null) throw new ArgumentNullException(nameof(relatedObjectSelector));
3837

3938
var methodInfo = ((MethodInfo)MethodBase.GetCurrentMethod()).MakeGenericMethod(typeof(TQueried), typeof(TFetch), typeof(TRelated));
4039
return CreateFluentFetchRequest<TQueried, TRelated>(methodInfo, query, relatedObjectSelector);
@@ -43,8 +42,8 @@ public static INhFetchRequest<TQueried, TRelated> ThenFetch<TQueried, TFetch, TR
4342
public static INhFetchRequest<TQueried, TRelated> ThenFetchMany<TQueried, TFetch, TRelated>(
4443
this INhFetchRequest<TQueried, TFetch> query, Expression<Func<TFetch, IEnumerable<TRelated>>> relatedObjectSelector)
4544
{
46-
ArgumentUtility.CheckNotNull("query", query);
47-
ArgumentUtility.CheckNotNull("relatedObjectSelector", relatedObjectSelector);
45+
if (query == null) throw new ArgumentNullException(nameof(query));
46+
if (relatedObjectSelector == null) throw new ArgumentNullException(nameof(relatedObjectSelector));
4847

4948
var methodInfo = ((MethodInfo)MethodBase.GetCurrentMethod()).MakeGenericMethod(typeof(TQueried), typeof(TFetch), typeof(TRelated));
5049
return CreateFluentFetchRequest<TQueried, TRelated>(methodInfo, query, relatedObjectSelector);

‎src/NHibernate/NHibernate.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@
7979
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
82-
<Reference Include="Remotion.Linq, Version=1.13.183.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
83-
<HintPath>..\packages\Remotion.Linq.1.13.183.0\lib\net35\Remotion.Linq.dll</HintPath>
84-
<Private>True</Private>
82+
<Reference Include="Remotion.Linq, Version=1.15.15.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Remotion.Linq.1.15.15.0\lib\portable-net45+wp80+wpa81+win\Remotion.Linq.dll</HintPath>
8584
</Reference>
8685
<Reference Include="System" />
8786
<Reference Include="System.Core" />
@@ -1820,7 +1819,7 @@
18201819
<!-- Note: _ReferenceAssembliesPath will contain a trailing backslash which /targetplatform
18211820
can't handle. Circumvented by adding a trailing period below. -->
18221821
</GetReferenceAssemblyPaths>
1823-
<Exec Command="$(SolutionDir)..\Tools\ilrepack\ilrepack.exe /verbose /t:library /targetplatform:v4,&quot;$(_ReferenceAssembliesPath).&quot; /keyfile:$(AssemblyOriginatorKeyFile) /internalize:internalize.exclude /out:$(OutputPath)\NHibernate.dll $(IntermediateOutputPath)\NHibernate.dll $(OutputPath)\Remotion.Linq.dll $(OutputPath)\Antlr3.Runtime.dll" />
1822+
<Exec Command="$(SolutionDir)..\Tools\ilrepack\ilrepack.exe /verbose /t:library /targetplatform:v4,&quot;$(_ReferenceAssembliesPath).&quot; /keyfile:$(AssemblyOriginatorKeyFile) /internalize /out:$(OutputPath)\NHibernate.dll $(IntermediateOutputPath)\NHibernate.dll $(OutputPath)\Antlr3.Runtime.dll" />
18241823
</Target>
18251824
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
18261825
<PropertyGroup>

‎src/NHibernate/NHibernate.nuspec.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<dependencies>
1616
<!-- Bet that if there is ever an Iesi.Collections 5.0, it would be incompatible. -->
1717
<dependency id="Iesi.Collections" version="[4,5)" />
18+
<dependency id="Remotion.Linq" version="[1.15.15,2)" />
1819
</dependencies>
1920
<projectUrl>
2021
http://nhibernate.info

‎src/NHibernate/internalize.exclude‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)