Skip to content

Commit 55fd0a0

Browse files
chester89chester89
committed
moving all dependencies to be pulled from NuGet. NH version stays 3.3.1 for the time being, MSpec, NUnit and RhinoMocks are upgraded to higher versions
1 parent 0947013 commit 55fd0a0

File tree

12 files changed

+64
-26
lines changed

12 files changed

+64
-26
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ build
2424

2525
*.swp
2626
TestResult.xml
27+
src/packages/

‎src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="NHibernate">
36-
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
35+
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
37+
</Reference>
38+
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
39+
<HintPath>..\packages\NHibernate.3.3.1.4000\lib\Net35\NHibernate.dll</HintPath>
3740
</Reference>
3841
<Reference Include="System" />
3942
<Reference Include="System.Core" />
@@ -54,6 +57,9 @@
5457
<Name>FluentNHibernate</Name>
5558
</ProjectReference>
5659
</ItemGroup>
60+
<ItemGroup>
61+
<None Include="packages.config" />
62+
</ItemGroup>
5763
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5864
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5965
Other similar extension points exist, see Microsoft.Common.targets.

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

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

‎src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,13 @@
5555
</PropertyGroup>
5656
<ItemGroup>
5757
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\tools\NHibernate\Iesi.Collections.dll</HintPath>
58+
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
6059
</Reference>
6160
<Reference Include="Machine.Specifications, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
6361
<HintPath>..\packages\Machine.Specifications.0.5.6.0\lib\net20\Machine.Specifications.dll</HintPath>
6462
</Reference>
65-
<Reference Include="NHibernate, Version=2.1.2.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
63+
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
64+
<HintPath>..\packages\NHibernate.3.3.1.4000\lib\Net35\NHibernate.dll</HintPath>
6865
</Reference>
6966
<Reference Include="System" />
7067
<Reference Include="System.Core">

‎src/FluentNHibernate.Specs/packages.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Machine.Specifications" version="0.5.6.0" />
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4+
<package id="Machine.Specifications" version="0.5.6.0" targetFramework="net35" />
5+
<package id="NHibernate" version="3.3.1.4000" targetFramework="net35" />
46
</packages>

‎src/FluentNHibernate.Testing/ConventionFinderTests/AddingTypeTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using FluentNHibernate.Conventions.Instances;
55
using FluentNHibernate.Conventions.Inspections;
66
using FluentNHibernate.Mapping;
7+
using Machine.Specifications;
78
using NUnit.Framework;
89

910
namespace FluentNHibernate.Testing.ConventionFinderTests

‎src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,30 @@
5858
</DocumentationFile>
5959
</PropertyGroup>
6060
<ItemGroup>
61-
<Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
61+
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
63+
</Reference>
64+
<Reference Include="Machine.Specifications">
65+
<HintPath>..\packages\Machine.Specifications.0.5.6.0\lib\net20\Machine.Specifications.dll</HintPath>
66+
</Reference>
67+
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
68+
<HintPath>..\packages\NHibernate.3.3.1.4000\lib\Net35\NHibernate.dll</HintPath>
69+
</Reference>
70+
<Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
6271
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\tools\NHibernate\Iesi.Collections.dll</HintPath>
72+
<HintPath>..\packages\NUnit.2.5.7.10213\lib\nunit.framework.dll</HintPath>
6473
</Reference>
65-
<Reference Include="NHibernate, Version=2.0.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
74+
<Reference Include="nunit.mocks, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
6675
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
76+
<HintPath>..\packages\NUnit.2.5.7.10213\lib\nunit.mocks.dll</HintPath>
6877
</Reference>
69-
<Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
78+
<Reference Include="pnunit.framework, Version=1.0.3865.21394, Culture=neutral, processorArchitecture=MSIL">
7079
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\tools\nunit\nunit.framework.dll</HintPath>
80+
<HintPath>..\packages\NUnit.2.5.7.10213\lib\pnunit.framework.dll</HintPath>
7281
</Reference>
73-
<Reference Include="Rhino.Mocks, Version=3.5.0.1, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
82+
<Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
7483
<SpecificVersion>False</SpecificVersion>
75-
<HintPath>..\..\tools\rhino\Rhino.Mocks.dll</HintPath>
84+
<HintPath>..\packages\RhinoMocks.3.6\lib\Rhino.Mocks.dll</HintPath>
7685
</Reference>
7786
<Reference Include="System" />
7887
<Reference Include="System.Configuration" />
@@ -101,9 +110,9 @@
101110
<Compile Include="AutoMapping\Apm\AlterationCollectionTests.cs" />
102111
<Compile Include="AutoMapping\Apm\AlterationTests.cs" />
103112
<Compile Include="AutoMapping\Apm\ConcreteBaseClassTests.cs" />
104-
<Compile Include="AutoMapping\Apm\Conventions\VersionConventionTests.cs" />
105-
<Compile Include="AutoMapping\DefaultAutoMappingConfigurationTests.cs" />
106-
<Compile Include="AutoMapping\Apm\IdentityTests.cs" />
113+
<Compile Include="AutoMapping\Apm\Conventions\VersionConventionTests.cs" />
114+
<Compile Include="AutoMapping\DefaultAutoMappingConfigurationTests.cs" />
115+
<Compile Include="AutoMapping\Apm\IdentityTests.cs" />
107116
<Compile Include="AutoMapping\Overrides\ReferenceComponentOverrides.cs" />
108117
<Compile Include="AutoMapping\Overrides\AutoMappingOverrideAlterationTests.cs" />
109118
<Compile Include="AutoMapping\Apm\CacheOverrideTests.cs" />
@@ -462,6 +471,7 @@
462471
<Compile Include="MappingModel\Output\XmlNaturalIdWriterTester.cs" />
463472
<Compile Include="MappingModel\SortingTests.cs" />
464473
<Compile Include="Utils\TypeReferenceEnumTests.cs" />
474+
<None Include="packages.config" />
465475
</ItemGroup>
466476
<ItemGroup>
467477
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">

‎src/FluentNHibernate.Testing/Infrastructure/ContainerTester.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using FluentNHibernate.Infrastructure;
3+
using Machine.Specifications;
34
using NUnit.Framework;
45

56
namespace FluentNHibernate.Testing.Infrastructure

‎src/FluentNHibernate.Testing/packages.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
4+
<package id="Machine.Specifications" version="0.5.6.0" targetFramework="net35" />
5+
<package id="NHibernate" version="3.3.1.4000" targetFramework="net35" />
6+
<package id="NUnit" version="2.5.7.10213" targetFramework="net35" />
7+
<package id="RhinoMocks" version="3.6" targetFramework="net35" />
8+
</packages>

‎src/FluentNHibernate/FluentNHibernate.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,11 @@
5959
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
6060
</PropertyGroup>
6161
<ItemGroup>
62-
<Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63-
<SpecificVersion>False</SpecificVersion>
64-
<HintPath>..\..\tools\NHibernate\Iesi.Collections.dll</HintPath>
62+
<Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
6564
</Reference>
66-
<Reference Include="NHibernate, Version=2.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
67-
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
65+
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
66+
<HintPath>..\packages\NHibernate.3.3.1.4000\lib\Net35\NHibernate.dll</HintPath>
6967
</Reference>
7068
<Reference Include="System" />
7169
<Reference Include="System.configuration" />
@@ -769,6 +767,7 @@
769767
<Link>nhibernate-mapping.xsd</Link>
770768
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
771769
</None>
770+
<None Include="packages.config" />
772771
</ItemGroup>
773772
<ItemGroup>
774773
<None Include="..\FluentKey.snk">

0 commit comments

Comments
 (0)