From 5720fc7465a229701ef857cb531802707c4e2593 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 8 Nov 2019 08:35:16 +0100
Subject: [PATCH 1/2] AB3653 - Fixed IOHelper on Current to be real static..

---
 src/Umbraco.Core/Composing/Current.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs
index b289e2aaf5..3f9c4db288 100644
--- a/src/Umbraco.Core/Composing/Current.cs
+++ b/src/Umbraco.Core/Composing/Current.cs
@@ -205,8 +205,7 @@ namespace Umbraco.Core.Composing
         public static IVariationContextAccessor VariationContextAccessor
             => Factory.GetInstance<IVariationContextAccessor>();
 
-        public static IIOHelper IOHelper
-            => new IOHelper();
+        public static readonly IIOHelper IOHelper = new IOHelper();
 
         #endregion
     }

From 0b7422c0d7650b10d5d911389f56e11e6cb18a07 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 8 Nov 2019 08:52:44 +0100
Subject: [PATCH 2/2] AB3653 - Moved IIOHelper interface to abstractions

---
 src/{Umbraco.Core => Umbraco.Abstractions}/IO/IIOHelper.cs | 0
 src/Umbraco.Core/Umbraco.Core.csproj                       | 1 -
 2 files changed, 1 deletion(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/IO/IIOHelper.cs (100%)

diff --git a/src/Umbraco.Core/IO/IIOHelper.cs b/src/Umbraco.Abstractions/IO/IIOHelper.cs
similarity index 100%
rename from src/Umbraco.Core/IO/IIOHelper.cs
rename to src/Umbraco.Abstractions/IO/IIOHelper.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 93631e5782..5f18cb3d95 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -185,7 +185,6 @@
     <Compile Include="Composing\TargetedServiceFactory.cs" />
     <Compile Include="Composing\TypeFinder.cs" />
     <Compile Include="Composing\TypeLoader.cs" />
-    <Compile Include="IO\IIOHelper.cs" />
     <Compile Include="IO\IMediaFileSystem.cs" />
     <Compile Include="IO\IMediaPathScheme.cs" />
     <Compile Include="IO\IOHelper.cs" />