From 21c7caf2b2b4d2dd5983dc1d6dc67fafaba349ee Mon Sep 17 00:00:00 2001 From: Touchen Date: Wed, 14 Apr 2021 11:32:21 +0200 Subject: [PATCH] Update NH to 5.4 --- NHibernate5.SqlAzure.Tests/App.config | 24 +++++- .../NHibernateProfilerBootstrapper.vb | 22 ------ .../NHibernate5.SqlAzure.Tests.csproj | 79 ++++++++++++++++--- .../NHibernateProfilerBootstrapper.cs | 17 ++-- NHibernate5.SqlAzure.Tests/packages.config | 27 ++++++- .../NHibernate5.SqlAzure.Standalone.nuspec | 2 +- .../NHibernate5.SqlAzure.csproj | 4 +- .../NHibernate5.SqlAzure.nuspec | 2 +- NHibernate5.SqlAzure/packages.config | 2 +- 9 files changed, 124 insertions(+), 55 deletions(-) delete mode 100644 NHibernate5.SqlAzure.Tests/App_Start/NHibernateProfilerBootstrapper.vb rename NHibernate5.SqlAzure.Tests/{App_Start => }/NHibernateProfilerBootstrapper.cs (51%) diff --git a/NHibernate5.SqlAzure.Tests/App.config b/NHibernate5.SqlAzure.Tests/App.config index 2865826..81b738a 100644 --- a/NHibernate5.SqlAzure.Tests/App.config +++ b/NHibernate5.SqlAzure.Tests/App.config @@ -1,4 +1,4 @@ - + @@ -14,7 +14,27 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/NHibernate5.SqlAzure.Tests/App_Start/NHibernateProfilerBootstrapper.vb b/NHibernate5.SqlAzure.Tests/App_Start/NHibernateProfilerBootstrapper.vb deleted file mode 100644 index 7fc7edb..0000000 --- a/NHibernate5.SqlAzure.Tests/App_Start/NHibernateProfilerBootstrapper.vb +++ /dev/null @@ -1,22 +0,0 @@ -Imports HibernatingRhinos.Profiler.Appender.NHibernate - -' If you're using .NET Core please remove this line and call NHibernateProfiler.Initialize() on the very beginning of your application. - -Namespace App_Start - Public Class NHibernateProfilerBootstrapper - Public Shared Sub PreStart() - ' Initialize the profiler - NHibernateProfiler.Initialize() - - ' You can also use the profiler in an offline manner. - ' This will generate a file with a snapshot of all the NHibernate activity in the application, - ' which you can use for later analysis by loading the file into the profiler. - ' Dim FileName as String = @"c:\profiler-log"; - ' NHibernateProfiler.InitializeOfflineProfiling(FileName) - - ' You can use the following for production profiling. - ' NHibernateProfiler.InitializeForProduction(11234, "A strong password like: ze38r/b2ulve2HLQB8NK5AYig"); - End Sub - End Class -End Namespace - diff --git a/NHibernate5.SqlAzure.Tests/NHibernate5.SqlAzure.Tests.csproj b/NHibernate5.SqlAzure.Tests/NHibernate5.SqlAzure.Tests.csproj index 0403260..cfaa64a 100644 --- a/NHibernate5.SqlAzure.Tests/NHibernate5.SqlAzure.Tests.csproj +++ b/NHibernate5.SqlAzure.Tests/NHibernate5.SqlAzure.Tests.csproj @@ -40,6 +40,15 @@ ..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll + + ..\packages\Azure.Core.1.4.1\lib\netstandard2.0\Azure.Core.dll + + + ..\packages\Azure.Storage.Blobs.12.6.0\lib\netstandard2.0\Azure.Storage.Blobs.dll + + + ..\packages\Azure.Storage.Common.12.5.2\lib\netstandard2.0\Azure.Storage.Common.dll + ..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll @@ -49,15 +58,21 @@ ..\packages\FluentMigrator.Runner.1.1.1.26\lib\NET40\FluentMigrator.Runner.dll - - ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll + + ..\packages\FluentNHibernate.3.1.0\lib\net461\FluentNHibernate.dll - - ..\packages\NHibernateProfiler.5.0.5044\lib\net46\HibernatingRhinos.Profiler.Appender.dll + + ..\packages\Google.Protobuf.3.13.0\lib\net45\Google.Protobuf.dll + + + ..\packages\NHibernateProfiler.6.0.6021\lib\net461\HibernatingRhinos.Profiler.Appender.dll ..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll @@ -68,8 +83,11 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\NHibernate.5.2.3\lib\net461\NHibernate.dll + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NHibernate.5.3.8\lib\net461\NHibernate.dll ..\packages\NUnit.2.6.2\lib\nunit.framework.dll @@ -81,16 +99,56 @@ ..\packages\Remotion.Linq.EagerFetching.2.2.0\lib\net45\Remotion.Linq.EagerFetching.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + - - ..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + ..\packages\WebActivator.1.4.4\lib\net40\WebActivator.dll @@ -135,7 +193,7 @@ TransientErrorDetectionTests.cs - + @@ -157,9 +215,6 @@ NHibernate5.SqlAzure - - - diff --git a/NHibernate5.SqlAzure.Tests/App_Start/NHibernateProfilerBootstrapper.cs b/NHibernate5.SqlAzure.Tests/NHibernateProfilerBootstrapper.cs similarity index 51% rename from NHibernate5.SqlAzure.Tests/App_Start/NHibernateProfilerBootstrapper.cs rename to NHibernate5.SqlAzure.Tests/NHibernateProfilerBootstrapper.cs index 8b00753..99f15c6 100644 --- a/NHibernate5.SqlAzure.Tests/App_Start/NHibernateProfilerBootstrapper.cs +++ b/NHibernate5.SqlAzure.Tests/NHibernateProfilerBootstrapper.cs @@ -1,18 +1,16 @@ using HibernatingRhinos.Profiler.Appender.NHibernate; -// If you're using .NET Core please remove this line and call NHibernateProfiler.Initialize(); on the very beginning of your application. -[assembly: WebActivatorEx.PreApplicationStartMethod(typeof(NHibernate5.SqlAzure.Tests.App_Start.NHibernateProfilerBootstrapper), "PreStart")] -namespace NHibernate5.SqlAzure.Tests.App_Start +namespace NHibernate5.SqlAzure.Tests { - public static class NHibernateProfilerBootstrapper - { - public static void PreStart() + public class NHibernateProfilerBootstrapper + { + public static void PreStart() { // Initialize the profiler NHibernateProfiler.Initialize(); // You can also use the profiler in an offline manner. - // This will generate a file with a snapshot of all the NHibernate activity in the application, + // This will generate a file with a snapshot of all the EntityFramework activity in the application, // which you can use for later analysis by loading the file into the profiler. // var filename = @"c:\profiler-log"; // NHibernateProfiler.InitializeOfflineProfiling(filename); @@ -20,6 +18,5 @@ public static void PreStart() // You can use the following for production profiling. // NHibernateProfiler.InitializeForProduction(11234, "A strong password like: ze38r/b2ulve2HLQB8NK5AYig"); } - } -} - + } +} \ No newline at end of file diff --git a/NHibernate5.SqlAzure.Tests/packages.config b/NHibernate5.SqlAzure.Tests/packages.config index e6448bf..6a91696 100644 --- a/NHibernate5.SqlAzure.Tests/packages.config +++ b/NHibernate5.SqlAzure.Tests/packages.config @@ -1,22 +1,41 @@  + + + - + + + - - + + + - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NHibernate5.SqlAzure/NHibernate5.SqlAzure.Standalone.nuspec b/NHibernate5.SqlAzure/NHibernate5.SqlAzure.Standalone.nuspec index 8324a03..6defb82 100644 --- a/NHibernate5.SqlAzure/NHibernate5.SqlAzure.Standalone.nuspec +++ b/NHibernate5.SqlAzure/NHibernate5.SqlAzure.Standalone.nuspec @@ -33,7 +33,7 @@ en-US - + diff --git a/NHibernate5.SqlAzure/NHibernate5.SqlAzure.csproj b/NHibernate5.SqlAzure/NHibernate5.SqlAzure.csproj index 5333aeb..4d3ad77 100644 --- a/NHibernate5.SqlAzure/NHibernate5.SqlAzure.csproj +++ b/NHibernate5.SqlAzure/NHibernate5.SqlAzure.csproj @@ -44,8 +44,8 @@ ..\packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll - - ..\packages\NHibernate.5.2.3\lib\net461\NHibernate.dll + + ..\packages\NHibernate.5.3.8\lib\net461\NHibernate.dll ..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/NHibernate5.SqlAzure/NHibernate5.SqlAzure.nuspec b/NHibernate5.SqlAzure/NHibernate5.SqlAzure.nuspec index 8458fc3..fa93475 100644 --- a/NHibernate5.SqlAzure/NHibernate5.SqlAzure.nuspec +++ b/NHibernate5.SqlAzure/NHibernate5.SqlAzure.nuspec @@ -33,7 +33,7 @@ en-US - + diff --git a/NHibernate5.SqlAzure/packages.config b/NHibernate5.SqlAzure/packages.config index fbe3c5d..7b23b9a 100644 --- a/NHibernate5.SqlAzure/packages.config +++ b/NHibernate5.SqlAzure/packages.config @@ -5,7 +5,7 @@ - + \ No newline at end of file