Skip to content

Commit 109d726

Browse files
chester89chester89
committed
Merge pull request #277 from oskarb/nh3-dependency
Lock Nuget NHibernate versions to < 4.0.
2 parents df86a70 + 086a979 commit 109d726

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

‎RakeFile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ namespace :package do
170170
nu.language = 'en-US'
171171
nu.licenseUrl = 'http://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE.txt'
172172
nu.projectUrl = 'http://fluentnhibernate.org'
173-
nu.dependency 'NHibernate', '3.3.1.4000'
173+
nu.dependency 'NHibernate', '[3.3.1.4000,4)'
174174
nu.working_directory = 'build'
175175
nu.output_file = 'fluentnhibernate.nuspec'
176176
nu.file 'FluentNHibernate.dll', 'lib'

‎src/Examples.FirstAutomappedProject/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4-
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" />
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" allowedVersions="[3,4)"/>
4+
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" allowedVersions="[3,4)"/>
55
<package id="System.Data.SQLite" version="1.0.66.1" targetFramework="net35" />
66
</packages>

‎src/Examples.FirstProject/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4-
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" />
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" allowedVersions="[3,4)"/>
4+
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" allowedVersions="[3,4)"/>
55
<package id="System.Data.SQLite" version="1.0.66.1" targetFramework="net35" />
66
</packages>

‎src/FluentNHibernate.Specs.ExternalFixtures/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4-
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" />
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" allowedVersions="[3,4)"/>
4+
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" allowedVersions="[3,4)"/>
55
</packages>

‎src/FluentNHibernate.Specs/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" allowedVersions="[3,4)"/>
44
<package id="Machine.Specifications" version="0.5.15" targetFramework="net35" />
5-
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" />
5+
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" allowedVersions="[3,4)"/>
66
</packages>

‎src/FluentNHibernate.Testing/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FakeItEasy" version="1.15.0" targetFramework="net35" />
4-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" allowedVersions="[3,4)"/>
55
<package id="Machine.Specifications" version="0.5.15" targetFramework="net35" />
6-
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" />
6+
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" allowedVersions="[3,4)"/>
77
<package id="NUnit" version="2.5.7.10213" targetFramework="net35" />
88
<package id="System.Data.SQLite" version="1.0.66.1" targetFramework="net35" />
99
</packages>

‎src/FluentNHibernate.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<licenseUrl>http://github.com/jagregory/fluent-nhibernate/blob/master/LICENSE.txt</licenseUrl>
99
<projectUrl>http://github.com/jagregory/fluent-nhibernate/</projectUrl>
1010
<dependencies>
11-
<dependency id="NHibernate" version="[3.3.1.4000,)" />
11+
<dependency id="NHibernate" version="[3.3.1.4000,4)" />
1212
</dependencies>
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.</description>
15-
<summary>Fluent NHibernate provides a conventient way to configure NHibernate - no XML involved.</summary>
15+
<summary>Fluent NHibernate provides a convenient way to configure NHibernate - no XML involved.</summary>
1616
<tags>orm dal nhibernate conventions</tags>
1717
<language>en-US</language>
1818
</metadata>

‎src/FluentNHibernate/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4-
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" />
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" allowedVersions="[3,4)"/>
4+
<package id="NHibernate" version="3.3.3.4001" targetFramework="net35" allowedVersions="[3,4)"/>
55
</packages>

0 commit comments

Comments
 (0)