Merge branch 'master' into feature/GH0831_AddQuerySupportForDecimal

fredericDelaporte · web-flow · commit 4b51cfb525ef · 2018-03-03T12:38:36.000+01:00
diff --git a/src/NHibernate.Example.Web/NHibernate.Example.Web.csproj b/src/NHibernate.Example.Web/NHibernate.Example.Web.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,10 +15,15 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
+    <PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
+  </ItemGroup>
+
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
   </ItemGroup>
diff --git a/src/NHibernate.Example.Web/Pages/_Layout.cshtml b/src/NHibernate.Example.Web/Pages/_Layout.cshtml
@@ -32,6 +32,10 @@
 <body>
     @RenderBody()
 
-    @RenderSection("Scripts", required: false)
+<p>
+    @Microsoft.Extensions.PlatformAbstractions.PlatformServices.Default.Application.RuntimeFramework
+</p>
+
+@RenderSection("Scripts", required: false)
 </body>
 </html>
diff --git a/src/NHibernate.Test/Linq/ByMethod/WithOptionsTests.cs b/src/NHibernate.Test/Linq/ByMethod/WithOptionsTests.cs
@@ -41,6 +41,10 @@ public void AppliesOptionsToQuery()
 			query.Received(1).SetCacheMode(CacheMode.Normal);
 			query.Received(1).SetCacheRegion("testregion");
 			query.Received(1).SetTimeout(10);
+
+			// Prevent garbage collection of session substitute before end of test, since the Linq query provider
+			// only has a weak reference on it.
+			Assert.That(session, Is.Not.Null);
 		}
 		
 		[Test]
@@ -72,6 +76,10 @@ public void DoNotContaminateQueryWithOptions()
 			query.Received(1).SetCacheMode(CacheMode.Normal);
 			query.Received(1).SetCacheRegion("testregion");
 			query.Received(1).SetTimeout(10);
+
+			// Prevent garbage collection of session substitute before end of test, since the Linq query provider
+			// only has a weak reference on it.
+			Assert.That(session, Is.Not.Null);
 		}
 
 		[Test]
@@ -101,6 +109,10 @@ public async Task AppliesOptionsToQueryAsync()
 			query.Received(1).SetCacheMode(CacheMode.Normal);
 			query.Received(1).SetCacheRegion("testregion");
 			query.Received(1).SetTimeout(10);
+
+			// Prevent garbage collection of session substitute before end of test, since the Linq query provider
+			// only has a weak reference on it.
+			Assert.That(session, Is.Not.Null);
 		}
 		
 		[Test]
@@ -133,6 +145,10 @@ public async Task DoNotContaminateQueryWithOptionsAsync()
 			query.Received(1).SetCacheMode(CacheMode.Normal);
 			query.Received(1).SetCacheRegion("testregion");
 			query.Received(1).SetTimeout(10);
+
+			// Prevent garbage collection of session substitute before end of test, since the Linq query provider
+			// only has a weak reference on it.
+			Assert.That(session, Is.Not.Null);
 		}
 	}
 }
