Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Nuget package contains intellisense file instead of pdb #131

Merged
merged 2 commits into from

2 participants

@citizenmatt

Hi folks. I've modified the rake file to pick up the xml doc file and package that instead of including the .pdb file. This means you'll get intellisense docs, but won't be able to debug - that should be handled by a symbols nuget package

James Gregory and others added some commits
James Gregory Revert "Merge pull request #116 from firo222/master"
This reverts commit 3c48bf83044a1572f442c235fc6ee8ca41a46cd4, reversing
changes made to dbbdb3f12a4617fc84735e3c81bae7fc319af2dc.
ee08c70
@citizenmatt citizenmatt Nuget package contains intellisense file instead of pdb 60e8fac
@jagregory jagregory merged commit 60e8fac into jagregory:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 27, 2012
  1. Revert "Merge pull request #116 from firo222/master"

    James Gregory authored
    This reverts commit 3c48bf83044a1572f442c235fc6ee8ca41a46cd4, reversing
    changes made to dbbdb3f12a4617fc84735e3c81bae7fc319af2dc.
Commits on Apr 5, 2012
  1. @citizenmatt
This page is out of date. Refresh to see the latest.
View
2  RakeFile
@@ -175,7 +175,7 @@ namespace :package do
nu.working_directory = 'build'
nu.output_file = 'fluentnhibernate.nuspec'
nu.file 'FluentNHibernate.dll', 'lib'
- nu.file 'FluentNHibernate.pdb', 'lib'
+ nu.file 'FluentNHibernate.xml', 'lib'
nu.tags = 'orm dal nhibernate conventions'
end
View
25 src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs
@@ -159,26 +159,6 @@ public void MixedKeyPropertyAndManyToOneOrdering()
.RootElement.Element("class/composite-id/*[2]")
.HasName("key-property");
}
-
- [Test]
- public void CompositeIdWithSubclass()
- {
- new MappingTester<CompIdTarget>()
- .SubClassMapping<ComIdSubclass>(s =>
- {
- s.Table("subclasstable");
- s.KeyColumn("subclass_longId");
- s.KeyColumn("subclass_nullablelongId");
- })
- .ForMapping(c => c.CompositeId()
- .KeyProperty(x => x.LongId)
- .KeyProperty(x => x.NullableLongId))
- .Element("class/joined-subclass/key/*[1]")
- .Exists().HasName("column").HasAttribute("name", "subclass_longId")
- .RootElement.Element("class/joined-subclass/key/*[2]")
- .Exists().HasName("column").HasAttribute("name", "subclass_nullablelongId")
- ;
- }
public class CompIdTarget
{
@@ -203,10 +183,5 @@ public class ComponentKey
public virtual int KeyCol1 { get; set; }
public virtual int KeyCol2 { get; set; }
}
-
- public class ComIdSubclass : CompIdTarget
- {
-
- }
}
}
View
22 src/FluentNHibernate/MappingModel/Collections/AttributeLayeredValues.cs
@@ -1,27 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Runtime.Serialization;
namespace FluentNHibernate.MappingModel.Collections
{
[Serializable]
- public class AttributeLayeredValues : ISerializable
+ public class AttributeLayeredValues
{
- readonly Dictionary<string, LayeredValues> inner;
+ readonly Dictionary<string, LayeredValues> inner = new Dictionary<string, LayeredValues>();
- public AttributeLayeredValues()
- {
- inner = new Dictionary<string, LayeredValues>();
- }
-
- public AttributeLayeredValues(SerializationInfo info, StreamingContext context)
- {
- inner = (Dictionary<string, LayeredValues>)info
- .GetValue("inner", typeof(Dictionary<string, LayeredValues>));
- inner.OnDeserialization(this);
- }
-
public LayeredValues this[string attribute]
{
get
@@ -103,10 +90,5 @@ public override int GetHashCode()
return hashCode;
}
-
- public void GetObjectData(SerializationInfo info, StreamingContext context)
- {
- info.AddValue("inner", inner);
- }
}
}
View
7 src/FluentNHibernate/MappingModel/ColumnMapping.cs
@@ -94,14 +94,13 @@ public ColumnMapping Clone()
public bool Equals(ColumnMapping other)
{
- return (other != null) &&
- Equals(other.attributes, attributes) &&
- Equals(other.Member, Member);
+ return Equals(other.attributes, attributes) && Equals(other.Member, Member);
}
public override bool Equals(object obj)
{
- return Equals(obj as ColumnMapping);
+ if (obj.GetType() != typeof(ColumnMapping)) return false;
+ return Equals((ColumnMapping)obj);
}
public override int GetHashCode()
Something went wrong with that request. Please try again.