Merge pull request #43 from marcwittke/hotfix/3.2.12

Hotfix/3.2.12
marcwittke · Jul 25, 2018 · 3d2c7b5 · 3d2c7b5
2 parents 40c7fcd + ef08dfa
commit 3d2c7b5
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 46 deletions.
diff --git a/demo/DemoBlog.Application/DemoBlog.csproj b/demo/DemoBlog.Application/DemoBlog.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentScheduler" Version="5.3.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/demo/DemoBlog.Mvc/DemoBlog.Mvc.csproj b/demo/DemoBlog.Mvc/DemoBlog.Mvc.csproj
@@ -12,23 +12,23 @@
     <UserSecretsId>aspnet-DemoBlog.Mvc-5cbe09ad-9a77-44bb-8a63-757aec42ff7e</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.3.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="2.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.3" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.3" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.4" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.3" />
-    <PackageReference Include="Polly" Version="6.0.1" />
-    <PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="4.3.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.1" />
+    <PackageReference Include="Polly" Version="6.1.0" />
+    <PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="4.3.1" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />

diff --git a/src/Backend.Fx.AspNetCore/Backend.Fx.AspNetCore.csproj b/src/Backend.Fx.AspNetCore/Backend.Fx.AspNetCore.csproj
@@ -6,8 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.2" />
-    <PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="4.3.0" />
+    <PackageReference Include="SimpleInjector.Integration.AspNetCore.Mvc" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Backend.Fx.Bootstrapping/Backend.Fx.Bootstrapping.csproj b/src/Backend.Fx.Bootstrapping/Backend.Fx.Bootstrapping.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
     <PackageReference Include="SimpleInjector" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/src/Backend.Fx.EfCorePersistence/Backend.Fx.EfCorePersistence.csproj b/src/Backend.Fx.EfCorePersistence/Backend.Fx.EfCorePersistence.csproj
@@ -22,8 +22,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Backend.Fx.EfCorePersistence/Mssql/MsSqlFullTextSearchService.cs b/src/Backend.Fx.EfCorePersistence/Mssql/MsSqlFullTextSearchService.cs
@@ -3,24 +3,29 @@
     using System.Linq;
     using BuildingBlocks;
     using EfCorePersistence;
+    using Environment.MultiTenancy;
     using Microsoft.EntityFrameworkCore;
     using Patterns.Authorization;
+    using Patterns.DependencyInjection;
 
     public class MsSqlFullTextSearchService<TAggregateRoot> : IFullTextSearchService<TAggregateRoot> where TAggregateRoot : AggregateRoot
     {
         private readonly EasyFts easyFts = new EasyFts();
         private readonly DbContext dbContext;
+        private readonly ICurrentTHolder<TenantId> currentTenantholder;
         private readonly IAggregateMapping<TAggregateRoot> aggregateMapping;
         private readonly IAggregateAuthorization<TAggregateRoot> aggregateAuthorization;
         private readonly string schema;
         private readonly string table;
-        
+
         public MsSqlFullTextSearchService(
-            DbContext dbContext, 
-            IAggregateMapping<TAggregateRoot> aggregateMapping, 
+            DbContext dbContext,
+            ICurrentTHolder<TenantId> currentTenantholder,
+            IAggregateMapping<TAggregateRoot> aggregateMapping,
             IAggregateAuthorization<TAggregateRoot> aggregateAuthorization)
         {
             this.dbContext = dbContext;
+            this.currentTenantholder = currentTenantholder;
             this.aggregateMapping = aggregateMapping;
             this.aggregateAuthorization = aggregateAuthorization;
 
@@ -42,9 +47,15 @@ public IQueryable<TAggregateRoot> Search(string searchQuery)
             else
             {
                 var sql = $"SELECT * FROM [{schema}].[{table}] WHERE Contains ({table}.*, '{ftsQuery}')";
+#pragma warning disable EF1000 // Possible SQL injection vulnerability.
                 queryable = aggregateAuthorization.Filter(dbContext.Set<TAggregateRoot>().FromSql(sql));
+#pragma warning restore EF1000 // Possible SQL injection vulnerability.
             }
 
+            queryable = currentTenantholder.Current.HasValue
+                                                           ? queryable.Where(agg => agg.TenantId == currentTenantholder.Current.Value)
+                                                           : queryable.Where(agg => false);
+
             foreach (var includeDefinition in aggregateMapping.IncludeDefinitions)
             {
                 queryable = queryable.Include(includeDefinition);

diff --git a/src/Backend.Fx.NLogLogging/Backend.Fx.NLogLogging.csproj b/src/Backend.Fx.NLogLogging/Backend.Fx.NLogLogging.csproj
@@ -22,8 +22,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.2" />
-    <PackageReference Include="NLog" Version="4.5.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
+    <PackageReference Include="NLog" Version="4.5.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Backend.Fx.RabbitMq/Backend.Fx.RabbitMq.csproj b/src/Backend.Fx.RabbitMq/Backend.Fx.RabbitMq.csproj
@@ -23,8 +23,8 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="Polly" Version="6.0.1" />
-    <PackageReference Include="RabbitMQ.Client" Version="5.0.1" />
+    <PackageReference Include="Polly" Version="6.1.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Backend.Fx.Testing/Backend.Fx.Testing.csproj b/src/Backend.Fx.Testing/Backend.Fx.Testing.csproj
@@ -24,10 +24,10 @@
 
     <ItemGroup>
     <PackageReference Include="Docker.DotNet" Version="3.125.2" />
-    <PackageReference Include="FakeItEasy" Version="4.6.0" />
-    <PackageReference Include="Polly" Version="6.0.1" />
+    <PackageReference Include="FakeItEasy" Version="4.7.1" />
+    <PackageReference Include="Polly" Version="6.1.0" />
     <PackageReference Include="SharpZipLib.NETStandard" Version="1.0.7" />
-    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Backend.Fx/Backend.Fx.csproj b/src/Backend.Fx/Backend.Fx.csproj
@@ -22,9 +22,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.2" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
     <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
     <PackageReference Include="System.Security.Principal" Version="4.3.0" />
   </ItemGroup>

diff --git a/tests/Backend.Fx.Bootstrapping.Tests/Backend.Fx.Bootstrapping.Tests.csproj b/tests/Backend.Fx.Bootstrapping.Tests/Backend.Fx.Bootstrapping.Tests.csproj
@@ -5,11 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="FakeItEasy" Version="4.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Backend.Fx.EfCorePersistence.Tests/Backend.Fx.EfCorePersistence.Tests.csproj b/tests/Backend.Fx.EfCorePersistence.Tests/Backend.Fx.EfCorePersistence.Tests.csproj
@@ -5,14 +5,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="4.6.0" />
-    <PackageReference Include="Microsoft.Data.SQLite" Version="2.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="2.0.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="FakeItEasy" Version="4.7.1" />
+    <PackageReference Include="Microsoft.Data.SQLite" Version="2.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="2.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Backend.Fx.Tests/Backend.Fx.Tests.csproj b/tests/Backend.Fx.Tests/Backend.Fx.Tests.csproj
@@ -5,11 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="FakeItEasy" Version="4.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>