From d55413979467f7055f26192ae46ec20ba47e7786 Mon Sep 17 00:00:00 2001
From: Bart Koelman <bart@degreed.com>
Date: Thu, 19 Nov 2020 13:53:21 +0100
Subject: [PATCH 1/2] Package updates

---
 Directory.Build.props                                           | 2 +-
 .../NoEntityFrameworkExample/NoEntityFrameworkExample.csproj    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0710d72cd6..80b7734180 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -17,6 +17,6 @@
     <XUnitVersion>2.4.1</XUnitVersion>
     <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
     <BogusVersion>31.0.3</BogusVersion>
-    <MoqVersion>4.14.6</MoqVersion>
+    <MoqVersion>4.15.1</MoqVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
index e1b85e00cc..ac1ab0f142 100644
--- a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
+++ b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
@@ -8,7 +8,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.35" />
+    <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
   </ItemGroup>
 </Project>

From 662fa258dc1789a8d3d81c2dba68f77f30f0abe2 Mon Sep 17 00:00:00 2001
From: Bart Koelman <bart@degreed.com>
Date: Thu, 19 Nov 2020 13:56:13 +0100
Subject: [PATCH 2/2] Moved IResourceHookExecutorFacade outside Internal
 sub-namespace, so that uses don't need to reference Internal namespaces when
 inheriting from resource service.

---
 .../JsonApiDotNetCoreExample/Services/CustomArticleService.cs   | 2 +-
 .../Configuration/JsonApiApplicationBuilder.cs                  | 1 +
 .../Hooks/{Internal => }/IResourceHookExecutorFacade.cs         | 2 +-
 src/JsonApiDotNetCore/Services/JsonApiResourceService.cs        | 2 +-
 test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs              | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename src/JsonApiDotNetCore/Hooks/{Internal => }/IResourceHookExecutorFacade.cs (97%)

diff --git a/src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs b/src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs
index 0680e22a4a..688e713194 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Hooks.Internal;
+using JsonApiDotNetCore.Hooks;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Repositories;
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
index b0761d267e..74bc6cf4a5 100644
--- a/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
+++ b/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JsonApiDotNetCore.Hooks;
 using JsonApiDotNetCore.Hooks.Internal;
 using JsonApiDotNetCore.Hooks.Internal.Discovery;
 using JsonApiDotNetCore.Hooks.Internal.Execution;
diff --git a/src/JsonApiDotNetCore/Hooks/Internal/IResourceHookExecutorFacade.cs b/src/JsonApiDotNetCore/Hooks/IResourceHookExecutorFacade.cs
similarity index 97%
rename from src/JsonApiDotNetCore/Hooks/Internal/IResourceHookExecutorFacade.cs
rename to src/JsonApiDotNetCore/Hooks/IResourceHookExecutorFacade.cs
index 8d0683d202..88e812105b 100644
--- a/src/JsonApiDotNetCore/Hooks/Internal/IResourceHookExecutorFacade.cs
+++ b/src/JsonApiDotNetCore/Hooks/IResourceHookExecutorFacade.cs
@@ -2,7 +2,7 @@
 using JsonApiDotNetCore.Hooks.Internal.Execution;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Hooks.Internal
+namespace JsonApiDotNetCore.Hooks
 {
     /// <summary>
     /// Facade for execution of resource hooks.
diff --git a/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs b/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs
index c880c147f7..871ae177a6 100644
--- a/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs
+++ b/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Errors;
-using JsonApiDotNetCore.Hooks.Internal;
+using JsonApiDotNetCore.Hooks;
 using JsonApiDotNetCore.Hooks.Internal.Execution;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries;
diff --git a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
index bd6d99489a..697542588b 100644
--- a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
+++ b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Hooks.Internal;
+using JsonApiDotNetCore.Hooks;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Repositories;