Skip to content

Commit

Permalink
Merge pull request #14 from rytmis/features/nhibernate4
Browse files Browse the repository at this point in the history
NHibernate 4 support
  • Loading branch information
robdmoore committed Feb 21, 2015
2 parents 3f9d777 + 3add83e commit 2cd9a26
Show file tree
Hide file tree
Showing 11 changed files with 385 additions and 1 deletion.
16 changes: 15 additions & 1 deletion NHibernate.SqlAzure.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 14
VisualStudioVersion = 14.0.22512.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.SqlAzure", "NHibernate.SqlAzure\NHibernate.SqlAzure.csproj", "{C51908DF-FAEA-4EAA-8F75-096346537C33}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{9C23CAA3-08A2-498A-AB98-F803AC42C49E}"
Expand All @@ -13,6 +15,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.SqlAzure.Tests", "NHibernate.SqlAzure.Tests\NHibernate.SqlAzure.Tests.csproj", "{887FD0A4-B8E0-4B3D-BF7E-4CC7090EB829}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate4.SqlAzure", "NHibernate4.SqlAzure\NHibernate4.SqlAzure.csproj", "{BF649532-3E8A-4DC7-9F43-9AB25E475BF8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate4.SqlAzure.Tests", "NHibernate4.SqlAzure.Tests\NHibernate4.SqlAzure.Tests.csproj", "{4864689E-5B40-4EA2-A797-63B2AEBFE5DC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -27,6 +33,14 @@ Global
{887FD0A4-B8E0-4B3D-BF7E-4CC7090EB829}.Debug|Any CPU.Build.0 = Debug|Any CPU
{887FD0A4-B8E0-4B3D-BF7E-4CC7090EB829}.Release|Any CPU.ActiveCfg = Release|Any CPU
{887FD0A4-B8E0-4B3D-BF7E-4CC7090EB829}.Release|Any CPU.Build.0 = Release|Any CPU
{BF649532-3E8A-4DC7-9F43-9AB25E475BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF649532-3E8A-4DC7-9F43-9AB25E475BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF649532-3E8A-4DC7-9F43-9AB25E475BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF649532-3E8A-4DC7-9F43-9AB25E475BF8}.Release|Any CPU.Build.0 = Release|Any CPU
{4864689E-5B40-4EA2-A797-63B2AEBFE5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4864689E-5B40-4EA2-A797-63B2AEBFE5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4864689E-5B40-4EA2-A797-63B2AEBFE5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4864689E-5B40-4EA2-A797-63B2AEBFE5DC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
7 changes: 7 additions & 0 deletions NHibernate4.SqlAzure.Tests/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<configuration>
<connectionStrings>
<add name="PooledDatabase" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=True;Initial Catalog=NHibernateSqlAzureTests"/>
<add name="NonPooledDatabase" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=True;Initial Catalog=NHibernateSqlAzureTests;Pooling=false"/>
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
95 changes: 95 additions & 0 deletions NHibernate4.SqlAzure.Tests/NHibernate4.SqlAzure.Tests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4864689E-5B40-4EA2-A797-63B2AEBFE5DC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NHibernate4.SqlAzure.Tests</RootNamespace>
<AssemblyName>NHibernate4.SqlAzure.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="FizzWare.NBuilder">
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
</Reference>
<Reference Include="FluentMigrator">
<HintPath>..\packages\FluentMigrator.1.1.2.1\lib\40\FluentMigrator.dll</HintPath>
</Reference>
<Reference Include="FluentMigrator.Runner">
<HintPath>..\packages\FluentMigrator.Runner.1.1.1.26\lib\NET40\FluentMigrator.Runner.dll</HintPath>
</Reference>
<Reference Include="FluentNHibernate, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FluentNHibernate.2.0.1.0\lib\net40\FluentNHibernate.dll</HintPath>
</Reference>
<Reference Include="HibernatingRhinos.Profiler.Appender.v4.0">
<HintPath>..\packages\NHibernateProfiler.1.0.0.951\lib\Net40\HibernatingRhinos.Profiler.Appender.v4.0.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling">
<HintPath>..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll</HintPath>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\packages\NHibernate.4.0.2.4000\lib\net40\NHibernate.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\NHibernate.SqlAzure.Tests\**\*.cs" Exclude="..\NHibernate.SqlAzure.Tests\Properties\AssemblyInfo.cs;..\NHibernate.SqlAzure.Tests\obj\**;..\NHibernate.SqlAzure.Tests\bin\**;" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NHibernate4.SqlAzure\NHibernate4.SqlAzure.csproj">
<Project>{bf649532-3e8a-4dc7-9f43-9ab25e475bf8}</Project>
<Name>NHibernate4.SqlAzure</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
36 changes: 36 additions & 0 deletions NHibernate4.SqlAzure.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("NHibernate4.SqlAzure.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("NHibernate4.SqlAzure.Tests")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("4864689e-5b40-4ea2-a797-63b2aebfe5dc")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
15 changes: 15 additions & 0 deletions NHibernate4.SqlAzure.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net45" />
<package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net45" />
<package id="FluentMigrator" version="1.1.2.1" targetFramework="net45" />
<package id="FluentMigrator.Runner" version="1.1.1.26" targetFramework="net45" />
<package id="FluentNHibernate" version="2.0.1.0" targetFramework="net45" />
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="NBuilder" version="3.0.1.1" targetFramework="net45" />
<package id="NHibernate" version="4.0.2.4000" targetFramework="net45" />
<package id="NHibernateProfiler" version="1.0.0.951" targetFramework="net45" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
<package id="WebActivator" version="1.4.4" targetFramework="net45" />
</packages>
46 changes: 46 additions & 0 deletions NHibernate4.SqlAzure/NHibernate4.SqlAzure.Standalone.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version='1.0' encoding='UTF-8'?>
<package>
<metadata>
<id>
NHibernate4.SqlAzure.Standalone
</id>
<version>
2.0.0
</version>
<authors>
Robert Moore, Matthew Davies
</authors>
<description>
Provides an NHibernate driver that uses the Microsoft Transient Fault Handling library to allow for reliable SQL Azure connections.
Unlike NHibernate.SqlAzure, this library doesn't come with TransientFaultHandling IL-merged - instead it's a NuGet dependency.
</description>
<releaseNotes>
Please see https://github.com/MRCollective/NHibernate.SqlAzure/releases for release notes and https://github.com/MRCollective/NHibernate.SqlAzure/blob/master/BREAKING_CHANGES.md for any breaking changes.
</releaseNotes>
<projectUrl>
https://github.com/MRCollective/NHibernate.SqlAzure
</projectUrl>
<licenseUrl>
https://github.com/MRCollective/NHibernate.SqlAzure/blob/master/LICENSE
</licenseUrl>
<iconUrl>
https://raw.github.com/MRCollective/NHibernate.SqlAzure/master/logo.png
</iconUrl>
<tags>
nhibernate, azure, sql, sql azure, transient
</tags>
<language>
en-US
</language>
<dependencies>
<dependency id="NHibernate" version="4.0.2.4000" />
<dependency id="EnterpriseLibrary.TransientFaultHandling" version="6.0" />
<dependency id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0" />
</dependencies>
</metadata>
<files>
<file src="bin\Release\NHibernate.SqlAzure.dll" target="lib\NET45" />
<file src="bin\Release\NHibernate.SqlAzure.pdb" target="lib\NET45" />
<file src="bin\Release\NHibernate.SqlAzure.XML" target="lib\NET45" />
</files>
</package>
81 changes: 81 additions & 0 deletions NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{BF649532-3E8A-4DC7-9F43-9AB25E475BF8}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NHibernate.SqlAzure</RootNamespace>
<AssemblyName>NHibernate.SqlAzure</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\NHibernate.SqlAzure.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\NHibernate.SqlAzure.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Iesi.Collections">
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling">
<HintPath>..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data">
<HintPath>..\packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll</HintPath>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\packages\NHibernate.4.0.2.4000\lib\net40\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\NHibernate.SqlAzure\**\*.cs" Exclude="..\NHibernate.SqlAzure\Properties\AssemblyInfo.cs;..\NHibernate.SqlAzure\obj\**;..\NHibernate.SqlAzure\bin\**;"/>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="NHibernate4.SqlAzure.nuspec">
<SubType>Designer</SubType>
</None>
<None Include="NHibernate4.SqlAzure.Standalone.nuspec">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>mkdir "$(TargetDir)Combined"
"$(ProjectDir)..\packages\ilmerge.2.13.0307\ILMerge.exe" /v4 /target:library "$(TargetPath)" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll" /out:"$(TargetDir)Combined\NHibernate.SqlAzure.dll"
copy "$(TargetDir)NHibernate.SqlAzure.XML" "$(TargetDir)Combined\NHibernate.SqlAzure.XML"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
44 changes: 44 additions & 0 deletions NHibernate4.SqlAzure/NHibernate4.SqlAzure.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version='1.0' encoding='UTF-8'?>
<package>
<metadata>
<id>
NHibernate4.SqlAzure
</id>
<version>
2.0.0
</version>
<authors>
Robert Moore, Matthew Davies
</authors>
<description>
Provides an NHibernate driver that uses the Microsoft Transient Fault Handling library to allow for reliable SQL Azure connections.
This package has the Microsoft Transient Fault Handling library IL-merged into it; for a version that doesn't see the NHibernate.SqlAzure.Standalone package.
</description>
<releaseNotes>
Please see https://github.com/MRCollective/NHibernate.SqlAzure/releases for release notes and https://github.com/MRCollective/NHibernate.SqlAzure/blob/master/BREAKING_CHANGES.md for any breaking changes.
</releaseNotes>
<projectUrl>
https://github.com/MRCollective/NHibernate.SqlAzure
</projectUrl>
<licenseUrl>
https://github.com/MRCollective/NHibernate.SqlAzure/blob/master/LICENSE
</licenseUrl>
<iconUrl>
https://raw.github.com/MRCollective/NHibernate.SqlAzure/master/logo.png
</iconUrl>
<tags>
nhibernate, azure, sql, sql azure, transient
</tags>
<language>
en-US
</language>
<dependencies>
<dependency id="NHibernate" version="4.0.2.4000" />
</dependencies>
</metadata>
<files>
<file src="bin\Release\Combined\NHibernate.SqlAzure.dll" target="lib\NET45" />
<file src="bin\Release\Combined\NHibernate.SqlAzure.pdb" target="lib\NET45" />
<file src="bin\Release\Combined\NHibernate.SqlAzure.XML" target="lib\NET45" />
</files>
</package>
Loading

0 comments on commit 2cd9a26

Please sign in to comment.