From 598837d99963d15855cc848798f1351005047869 Mon Sep 17 00:00:00 2001 From: Lauri Kotilainen Date: Sun, 11 Jan 2015 19:54:20 +0200 Subject: [PATCH 1/3] Added a project that builds a version of the library against NHibernate 4.0.2.4000 --- NHibernate.SqlAzure.sln | 10 +- .../NHibernate4.SqlAzure.Standalone.nuspec | 46 +++++++ .../NHibernate4.SqlAzure.csproj | 120 ++++++++++++++++++ .../NHibernate4.SqlAzure.nuspec | 44 +++++++ .../Properties/AssemblyInfo.cs | 36 ++++++ NHibernate4.SqlAzure/packages.config | 8 ++ packages/repositories.config | 1 + 7 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 NHibernate4.SqlAzure/NHibernate4.SqlAzure.Standalone.nuspec create mode 100644 NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj create mode 100644 NHibernate4.SqlAzure/NHibernate4.SqlAzure.nuspec create mode 100644 NHibernate4.SqlAzure/Properties/AssemblyInfo.cs create mode 100644 NHibernate4.SqlAzure/packages.config diff --git a/NHibernate.SqlAzure.sln b/NHibernate.SqlAzure.sln index 0b113d7..d7b9225 100644 --- a/NHibernate.SqlAzure.sln +++ b/NHibernate.SqlAzure.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 14 +VisualStudioVersion = 14.0.22310.1 +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}" @@ -13,6 +15,8 @@ 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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,6 +31,10 @@ 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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.Standalone.nuspec b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.Standalone.nuspec new file mode 100644 index 0000000..df97388 --- /dev/null +++ b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.Standalone.nuspec @@ -0,0 +1,46 @@ + + + + + NHibernate4.SqlAzure.Standalone + + + 2.0.0 + + + Robert Moore, Matthew Davies + + + 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. + + + 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. + + + https://github.com/MRCollective/NHibernate.SqlAzure + + + https://github.com/MRCollective/NHibernate.SqlAzure/blob/master/LICENSE + + + https://raw.github.com/MRCollective/NHibernate.SqlAzure/master/logo.png + + + nhibernate, azure, sql, sql azure, transient + + + en-US + + + + + + + + + + + + + \ No newline at end of file diff --git a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj new file mode 100644 index 0000000..012314c --- /dev/null +++ b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj @@ -0,0 +1,120 @@ + + + + + Debug + AnyCPU + {BF649532-3E8A-4DC7-9F43-9AB25E475BF8} + Library + Properties + NHibernate.SqlAzure + NHibernate.SqlAzure + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + bin\Debug\NHibernate.SqlAzure.XML + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + bin\Release\NHibernate.SqlAzure.XML + + + + ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + + + ..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll + + + ..\packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll + + + ..\packages\NHibernate.4.0.2.4000\lib\net40\NHibernate.dll + + + + + + + + + + + + DefaultReliableSql2008ClientDriver.cs + + + ReliableAdoNetTransactionFactory.cs + + + ReliableAdoNetWithDistributedTransactionFactory.cs + + + ReliableAdoTransaction.cs + + + ReliableSql2008ClientDriver.cs + + + ReliableSqlClientBatchingBatcher.cs + + + ReliableSqlClientBatchingBatcherFactory.cs + + + ReliableSqlCommand.cs + + + ReliableSqlDbConnection.cs + component + + + RetryStrategies\SqlAzureTransientErrorDetectionStrategy.cs + + + RetryStrategies\SqlAzureTransientErrorDetectionStrategyWithTimeouts.cs + + + SqlAzureClientDriver.cs + + + SqlAzureClientDriverWithTimeoutRetries.cs + + + + + + Designer + + + Designer + + + + + + 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" + + + \ No newline at end of file diff --git a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.nuspec b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.nuspec new file mode 100644 index 0000000..6381376 --- /dev/null +++ b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.nuspec @@ -0,0 +1,44 @@ + + + + + NHibernate4.SqlAzure + + + 2.0.0 + + + Robert Moore, Matthew Davies + + + 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. + + + 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. + + + https://github.com/MRCollective/NHibernate.SqlAzure + + + https://github.com/MRCollective/NHibernate.SqlAzure/blob/master/LICENSE + + + https://raw.github.com/MRCollective/NHibernate.SqlAzure/master/logo.png + + + nhibernate, azure, sql, sql azure, transient + + + en-US + + + + + + + + + + + \ No newline at end of file diff --git a/NHibernate4.SqlAzure/Properties/AssemblyInfo.cs b/NHibernate4.SqlAzure/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..90363b0 --- /dev/null +++ b/NHibernate4.SqlAzure/Properties/AssemblyInfo.cs @@ -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")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("NHibernate4.SqlAzure")] +[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("bf649532-3e8a-4dc7-9f43-9ab25e475bf8")] + +// 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")] diff --git a/NHibernate4.SqlAzure/packages.config b/NHibernate4.SqlAzure/packages.config new file mode 100644 index 0000000..07f6eb2 --- /dev/null +++ b/NHibernate4.SqlAzure/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/packages/repositories.config b/packages/repositories.config index 1df7f62..c20003b 100644 --- a/packages/repositories.config +++ b/packages/repositories.config @@ -2,4 +2,5 @@ + \ No newline at end of file From 9ea6cbb20c654545b87a7ed591e8417d3c74d30e Mon Sep 17 00:00:00 2001 From: Lauri Kotilainen Date: Thu, 12 Feb 2015 09:47:40 +0200 Subject: [PATCH 2/3] - Include files from NHibernate.SqlAzure with a wildcard include --- .../NHibernate4.SqlAzure.csproj | 41 +------------------ 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj index 012314c..35f7b02 100644 --- a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj +++ b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj @@ -53,46 +53,7 @@ - - DefaultReliableSql2008ClientDriver.cs - - - ReliableAdoNetTransactionFactory.cs - - - ReliableAdoNetWithDistributedTransactionFactory.cs - - - ReliableAdoTransaction.cs - - - ReliableSql2008ClientDriver.cs - - - ReliableSqlClientBatchingBatcher.cs - - - ReliableSqlClientBatchingBatcherFactory.cs - - - ReliableSqlCommand.cs - - - ReliableSqlDbConnection.cs - component - - - RetryStrategies\SqlAzureTransientErrorDetectionStrategy.cs - - - RetryStrategies\SqlAzureTransientErrorDetectionStrategyWithTimeouts.cs - - - SqlAzureClientDriver.cs - - - SqlAzureClientDriverWithTimeoutRetries.cs - + From 3add83e12ffc00f4e16be5dfcdddbae2e7fa174a Mon Sep 17 00:00:00 2001 From: Lauri Kotilainen Date: Thu, 12 Feb 2015 09:49:21 +0200 Subject: [PATCH 3/3] - Test project for NHibernate4 version --- NHibernate.SqlAzure.sln | 8 +- NHibernate4.SqlAzure.Tests/App.config | 7 ++ .../NHibernate4.SqlAzure.Tests.csproj | 95 +++++++++++++++++++ .../Properties/AssemblyInfo.cs | 36 +++++++ NHibernate4.SqlAzure.Tests/packages.config | 15 +++ packages/repositories.config | 1 + 6 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 NHibernate4.SqlAzure.Tests/App.config create mode 100644 NHibernate4.SqlAzure.Tests/NHibernate4.SqlAzure.Tests.csproj create mode 100644 NHibernate4.SqlAzure.Tests/Properties/AssemblyInfo.cs create mode 100644 NHibernate4.SqlAzure.Tests/packages.config diff --git a/NHibernate.SqlAzure.sln b/NHibernate.SqlAzure.sln index d7b9225..9a8903a 100644 --- a/NHibernate.SqlAzure.sln +++ b/NHibernate.SqlAzure.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22310.1 +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 @@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.SqlAzure.Tests", 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 @@ -35,6 +37,10 @@ Global {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 diff --git a/NHibernate4.SqlAzure.Tests/App.config b/NHibernate4.SqlAzure.Tests/App.config new file mode 100644 index 0000000..112e658 --- /dev/null +++ b/NHibernate4.SqlAzure.Tests/App.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/NHibernate4.SqlAzure.Tests/NHibernate4.SqlAzure.Tests.csproj b/NHibernate4.SqlAzure.Tests/NHibernate4.SqlAzure.Tests.csproj new file mode 100644 index 0000000..7a553fb --- /dev/null +++ b/NHibernate4.SqlAzure.Tests/NHibernate4.SqlAzure.Tests.csproj @@ -0,0 +1,95 @@ + + + + + Debug + AnyCPU + {4864689E-5B40-4EA2-A797-63B2AEBFE5DC} + Library + Properties + NHibernate4.SqlAzure.Tests + NHibernate4.SqlAzure.Tests + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + ..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll + + + ..\packages\FluentMigrator.1.1.2.1\lib\40\FluentMigrator.dll + + + ..\packages\FluentMigrator.Runner.1.1.1.26\lib\NET40\FluentMigrator.Runner.dll + + + False + ..\packages\FluentNHibernate.2.0.1.0\lib\net40\FluentNHibernate.dll + + + ..\packages\NHibernateProfiler.1.0.0.951\lib\Net40\HibernatingRhinos.Profiler.Appender.v4.0.dll + + + ..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll + + + ..\packages\NHibernate.4.0.2.4000\lib\net40\NHibernate.dll + + + ..\packages\NUnit.2.6.2\lib\nunit.framework.dll + + + + + + + + + + + + + + + + + + Designer + + + Designer + + + + + {bf649532-3e8a-4dc7-9f43-9ab25e475bf8} + NHibernate4.SqlAzure + + + + + \ No newline at end of file diff --git a/NHibernate4.SqlAzure.Tests/Properties/AssemblyInfo.cs b/NHibernate4.SqlAzure.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..007fd21 --- /dev/null +++ b/NHibernate4.SqlAzure.Tests/Properties/AssemblyInfo.cs @@ -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")] diff --git a/NHibernate4.SqlAzure.Tests/packages.config b/NHibernate4.SqlAzure.Tests/packages.config new file mode 100644 index 0000000..86c1542 --- /dev/null +++ b/NHibernate4.SqlAzure.Tests/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/repositories.config b/packages/repositories.config index c20003b..0cd3a84 100644 --- a/packages/repositories.config +++ b/packages/repositories.config @@ -2,5 +2,6 @@ + \ No newline at end of file