Skip to content

Commit 97b364e

Browse files
committed
NH-3750 - Do not merge ReLinq
1 parent 782b5a1 commit 97b364e

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@
100100
<Reference Include="System.Xml.Linq">
101101
<RequiredTargetFramework>3.5</RequiredTargetFramework>
102102
</Reference>
103-
</ItemGroup>
104-
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
105103
<Reference Include="Remotion.Linq, Version=1.15.15.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
106104
<HintPath>..\packages\Remotion.Linq.1.15.15.0\lib\portable-net45+wp80+wpa81+win\Remotion.Linq.dll</HintPath>
107105
</Reference>

src/NHibernate/NHibernate.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,7 @@
18191819
<!-- Note: _ReferenceAssembliesPath will contain a trailing backslash which /targetplatform
18201820
can't handle. Circumvented by adding a trailing period below. -->
18211821
</GetReferenceAssemblyPaths>
1822-
<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" />
18231823
</Target>
18241824
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
18251825
<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)