Skip to content

Upgrade to NH 4.0 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afsharm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade to NH 4.0 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb76437
Upgraded to NH 4.0
Oct 19, 2014
e0111ed
removed pfx files temporary because of compile error
Oct 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions SharpLiteSrc/app/SharpLite.Domain/SharpLite.Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>SharpLite.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -61,9 +62,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Validators\HasUniqueDomainSignatureAttribute.cs" />
</ItemGroup>
<ItemGroup>
<None Include="SharpLite.pfx" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)build\"</PostBuildEvent>
Expand Down
Binary file removed SharpLiteSrc/app/SharpLite.Domain/SharpLite.pfx
View file
Open in desktop
Binary file not shown.
6 changes: 2 additions & 4 deletions SharpLiteSrc/app/SharpLite.EntityFrameworkProvider/SharpLite.EntityFrameworkProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>SharpLite.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
Expand Down Expand Up @@ -63,9 +64,6 @@
<Name>SharpLite.Domain</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="SharpLite.pfx" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)build\"</PostBuildEvent>
Expand Down
Binary file removed SharpLiteSrc/app/SharpLite.EntityFrameworkProvider/SharpLite.pfx
View file
Open in desktop
Binary file not shown.
6 changes: 2 additions & 4 deletions SharpLiteSrc/app/SharpLite.NHibernateProvider/SharpLite.NHibernateProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>SharpLite.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="NHibernate">
Expand Down Expand Up @@ -70,9 +71,6 @@
<Name>SharpLite.Domain</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="SharpLite.pfx" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)build\"</PostBuildEvent>
Expand Down
Binary file removed SharpLiteSrc/app/SharpLite.NHibernateProvider/SharpLite.pfx
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion SharpLiteSrc/app/SharpLite.Web/Mvc/ModelBinder/SharpModelBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private static bool IsSimpleGenericBindableEntityCollection(Type propertyType) {
(propertyType.GetGenericTypeDefinition() == typeof(IList<>) ||
propertyType.GetGenericTypeDefinition() == typeof(ICollection<>) ||
propertyType.GetGenericTypeDefinition() ==
typeof(Iesi.Collections.Generic.ISet<>) ||
typeof(ISet<>) ||
propertyType.GetGenericTypeDefinition() == typeof(IEnumerable<>));

var isSimpleGenericBindableEntityCollection = isSimpleGenericBindableCollection &&
Expand Down
6 changes: 2 additions & 4 deletions SharpLiteSrc/app/SharpLite.Web/SharpLite.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>SharpLite.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Iesi.Collections">
Expand Down Expand Up @@ -66,9 +67,6 @@
<Name>SharpLite.Domain</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="SharpLite.pfx" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)build\"</PostBuildEvent>
Expand Down
Binary file removed SharpLiteSrc/app/SharpLite.Web/SharpLite.pfx
View file
Open in desktop
Binary file not shown.
Binary file modified SharpLiteSrc/build/SharpLite.Domain.dll
View file
Open in desktop
Binary file not shown.
Binary file modified SharpLiteSrc/build/SharpLite.EntityFrameworkProvider.dll
View file
Open in desktop
Binary file not shown.
Binary file modified SharpLiteSrc/build/SharpLite.NHibernateProvider.dll
View file
Open in desktop
Binary file not shown.
Binary file modified SharpLiteSrc/build/SharpLite.Web.dll
View file
Open in desktop
Binary file not shown.
Binary file modified SharpLiteSrc/lib/Iesi.Collections.dll
View file
Open in desktop
Binary file not shown.
2,006 changes: 322 additions & 1,684 deletions SharpLiteSrc/lib/Iesi.Collections.xml
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified SharpLiteSrc/lib/NHibernate.dll
View file
Open in desktop
Binary file not shown.
2,787 changes: 1,254 additions & 1,533 deletions SharpLiteSrc/lib/NHibernate.xml
View file
Open in desktop

Large diffs are not rendered by default.