removed references to Iesi.Collections

chester89 · chester89 · commit 3eba4ecebefc · 2013-08-15T03:08:53.000+04:00
diff --git a/src/FluentNHibernate.Specs/Conventions/Fixtures/CollectionTarget.cs b/src/FluentNHibernate.Specs/Conventions/Fixtures/CollectionTarget.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using FluentNHibernate.Mapping;
-using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Specs.Conventions.Fixtures
 {
diff --git a/src/FluentNHibernate.Specs/Conventions/Fixtures/SetCollectionEntity.cs b/src/FluentNHibernate.Specs/Conventions/Fixtures/SetCollectionEntity.cs
@@ -1,5 +1,4 @@
 ﻿using System.Collections.Generic;
-using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Specs.Conventions.Fixtures
 {
diff --git a/src/FluentNHibernate.Specs/Conventions/Fixtures/SetCompositeElementCollectionEntity.cs b/src/FluentNHibernate.Specs/Conventions/Fixtures/SetCompositeElementCollectionEntity.cs
@@ -1,5 +1,4 @@
 ﻿using System.Collections.Generic;
-using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Specs.Conventions.Fixtures
 {
diff --git a/src/FluentNHibernate.Specs/Conventions/Fixtures/SetElementCollectionEntity.cs b/src/FluentNHibernate.Specs/Conventions/Fixtures/SetElementCollectionEntity.cs
@@ -1,5 +1,4 @@
 ﻿using System.Collections.Generic;
-using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Specs.Conventions.Fixtures
 {
diff --git a/src/FluentNHibernate.Specs/FluentInterface/Fixtures/EntityWithCollections.cs b/src/FluentNHibernate.Specs/FluentInterface/Fixtures/EntityWithCollections.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Specs.FluentInterface.Fixtures
 {
diff --git a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
@@ -55,10 +55,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\tools\NHibernate\Iesi.Collections.dll</HintPath>
-    </Reference>
     <Reference Include="Machine.Specifications, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Machine.Specifications.0.5.6.0\lib\net20\Machine.Specifications.dll</HintPath>
diff --git a/src/FluentNHibernate.Testing/AutoMapping/ManyToMany.cs b/src/FluentNHibernate.Testing/AutoMapping/ManyToMany.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Testing.Automapping
 {
diff --git a/src/FluentNHibernate.Testing/AutoMapping/Steps/HasManyStepTests.cs b/src/FluentNHibernate.Testing/AutoMapping/Steps/HasManyStepTests.cs
@@ -7,7 +7,6 @@
 using FluentNHibernate.MappingModel.ClassBased;
 using FluentNHibernate.MappingModel.Collections;
 using FluentNHibernate.Utils.Reflection;
-using Iesi.Collections.Generic;
 using NUnit.Framework;
 
 namespace FluentNHibernate.Testing.AutoMapping.Steps
diff --git a/src/FluentNHibernate.Testing/AutoMapping/Steps/ReferenceStepTests.cs b/src/FluentNHibernate.Testing/AutoMapping/Steps/ReferenceStepTests.cs
@@ -3,9 +3,7 @@
 using System.Linq.Expressions;
 using FluentNHibernate.Automapping;
 using FluentNHibernate.Automapping.Steps;
-using FluentNHibernate.Testing.Automapping;
 using FluentNHibernate.Utils.Reflection;
-using Iesi.Collections.Generic;
 using NUnit.Framework;
 
 namespace FluentNHibernate.Testing.AutoMapping.Steps
diff --git a/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs b/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs
@@ -10,9 +10,7 @@
 using FluentNHibernate.Conventions.AcceptanceCriteria;
 using FluentNHibernate.Conventions.Inspections;
 using FluentNHibernate.Conventions.Instances;
-using FluentNHibernate.Mapping;
 using FluentNHibernate.Conventions;
-using Iesi.Collections.Generic;
 using NHibernate;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
diff --git a/src/FluentNHibernate.Testing/DomainModel/Access/ParentModel.cs b/src/FluentNHibernate.Testing/DomainModel/Access/ParentModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Iesi.Collections.Generic;
 using System.Collections;
 
 namespace FluentNHibernate.Testing.DomainModel.Access
diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/ManyToManyTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/ManyToManyTester.cs
@@ -2,11 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using FluentNHibernate.Conventions;
-using FluentNHibernate.Conventions.Instances;
-using FluentNHibernate.Mapping;
-using FluentNHibernate.MappingModel.Collections;
-using Iesi.Collections.Generic;
 using NUnit.Framework;
 
 namespace FluentNHibernate.Testing.DomainModel.Mapping
diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToManyTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToManyTester.cs
@@ -1,13 +1,8 @@
 ﻿using System;
 using System.Collections.Generic;
 using FluentNHibernate.Cfg.Db;
-using FluentNHibernate.Conventions;
-using FluentNHibernate.Conventions.AcceptanceCriteria;
-using FluentNHibernate.Conventions.Instances;
-using FluentNHibernate.Conventions.Inspections;
 using FluentNHibernate.Mapping;
 using FluentNHibernate.MappingModel.Collections;
-using Iesi.Collections.Generic;
 using NHibernate.Cfg;
 using NUnit.Framework;
 
diff --git a/src/FluentNHibernate.Testing/DomainModel/Music.cs b/src/FluentNHibernate.Testing/DomainModel/Music.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using FluentNHibernate.Data;
-using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Testing.DomainModel
 {
@@ -12,7 +11,7 @@ public class Artist : Entity
 
         public Artist()
         {
-            Albums = new HashedSet<Album>();
+            Albums = new HashSet<Album>();
         }
     }
 
@@ -43,8 +42,8 @@ public class Album
 
         public Album()
         {
-            Tracks = new HashedSet<Track>();
-            Tags = new HashedSet<Tag>();
+            Tracks = new HashSet<Track>();
+            Tags =   new HashSet<Tag>();
         }
     }
 
diff --git a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj
@@ -59,10 +59,6 @@
     </DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\tools\NHibernate\Iesi.Collections.dll</HintPath>
-    </Reference>
     <Reference Include="NHibernate, Version=2.0.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
diff --git a/src/FluentNHibernate.Testing/Testing/Values/Entities.cs b/src/FluentNHibernate.Testing/Testing/Values/Entities.cs
@@ -1,8 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using Iesi.Collections;
-using Iesi.Collections.Generic;
 
 namespace FluentNHibernate.Testing.Testing.Values
 {
@@ -16,7 +14,7 @@ public ListEntity()
             GetterAndSetter = new List<string>();
             GetterAndPrivateSetter = new List<string>();
 
-            TypedSet = new LinkedHashSet<string>();
+            TypedSet = new HashSet<string>();
             //Set = new HashedSet();
             Collection = new StringCollection();
             List = new List<string>();
diff --git a/src/FluentNHibernate/FluentNHibernate.csproj b/src/FluentNHibernate/FluentNHibernate.csproj
@@ -60,10 +60,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\tools\NHibernate\Iesi.Collections.dll</HintPath>
-    </Reference>
     <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\tools\NHibernate\NHibernate.dll</HintPath>
diff --git a/src/FluentNHibernate/Testing/Values/List.cs b/src/FluentNHibernate/Testing/Values/List.cs
@@ -2,8 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Iesi.Collections;
-using Iesi.Collections.Generic;
 using FluentNHibernate.Utils;
 
 namespace FluentNHibernate.Testing.Values
@@ -38,7 +36,7 @@ public override Action<T, Accessor, IEnumerable<TListElement>> ValueSetter
                     // infallible.
                     if (propertyAccessor.PropertyType.IsAssignableFrom(typeof(ISet<TListElement>)))
                     {
-                        collection = new LinkedHashSet<TListElement>(Expected.ToList());
+                        collection = new HashSet<TListElement>(Expected.ToList());
                     }
                     //else if (propertyAccessor.PropertyType.IsAssignableFrom(typeof(ISet)))
                     //{
@@ -97,9 +95,7 @@ private void AssertGenericListMatches(IEnumerable actualEnumerable, IEnumerable<
                 throw new ApplicationException(String.Format("Actual count ({0}) does not equal expected count ({1})", actualList.Count, expectedList.Count));
             }
 
-            var equalsFunc = (EntityEqualityComparer != null)
-                ? new Func<object, object, bool>((a, b) => EntityEqualityComparer.Equals(a, b))
-                : new Func<object, object, bool>(Equals);
+            var equalsFunc = (EntityEqualityComparer != null) ? ((a, b) => EntityEqualityComparer.Equals(a, b)): new Func<object, object, bool>(Equals);
 
             for (var i = 0; i < actualList.Count; i++)
             {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using FluentNHibernate.Mapping;`
`3`		`-using Iesi.Collections.Generic;`
`4`	`3`
`5`	`4`	`namespace FluentNHibernate.Specs.Conventions.Fixtures`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using Iesi.Collections.Generic;`
`3`	`2`
`4`	`3`	`namespace FluentNHibernate.Specs.Conventions.Fixtures`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using Iesi.Collections.Generic;`
`4`	`3`
`5`	`4`	`namespace FluentNHibernate.Specs.FluentInterface.Fixtures`
`6`	`5`	`{`