From fc2fc18a268380e85d96330b8d8cf6fb7225fd16 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 4 Nov 2019 19:22:17 +0100
Subject: [PATCH] Moved filesytem abstractions + removed resharper warnings

---
 .../IO/IFileSystem.cs                                  |  0
 .../IO/IFileSystems.cs                                 |  0
 src/Umbraco.Abstractions/Umbraco.Abstractions.csproj   |  4 ----
 src/Umbraco.Core/Umbraco.Core.csproj                   | 10 ++++------
 src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs   |  1 +
 src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs    |  1 +
 src/Umbraco.Web/Mvc/RenderActionInvoker.cs             |  1 +
 src/Umbraco.Web/Umbraco.Web.csproj                     |  3 +--
 8 files changed, 8 insertions(+), 12 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/IO/IFileSystem.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/IO/IFileSystems.cs (100%)

diff --git a/src/Umbraco.Core/IO/IFileSystem.cs b/src/Umbraco.Abstractions/IO/IFileSystem.cs
similarity index 100%
rename from src/Umbraco.Core/IO/IFileSystem.cs
rename to src/Umbraco.Abstractions/IO/IFileSystem.cs
diff --git a/src/Umbraco.Core/IO/IFileSystems.cs b/src/Umbraco.Abstractions/IO/IFileSystems.cs
similarity index 100%
rename from src/Umbraco.Core/IO/IFileSystems.cs
rename to src/Umbraco.Abstractions/IO/IFileSystems.cs
diff --git a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
index cf38e5119b..4a3654ede6 100644
--- a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
+++ b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
@@ -6,8 +6,4 @@
         <RootNamespace>Umbraco.Core</RootNamespace>
     </PropertyGroup>
 
-    <ItemGroup>
-      <Folder Include="Models\ContentEditing" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index f8d5293fb5..c693def365 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -225,6 +225,9 @@
     <Compile Include="Composing\TargetedServiceFactory.cs" />
     <Compile Include="Composing\TypeFinder.cs" />
     <Compile Include="Composing\TypeLoader.cs" />
+    <Compile Include="IO\IMediaFileSystem.cs" />
+    <Compile Include="IO\IMediaPathScheme.cs" />
+    <Compile Include="IO\IOHelper.cs" />
     <Compile Include="IO\MediaPathSchemes\UniqueMediaPathScheme.cs" />
     <Compile Include="Logging\Viewer\LogTimePeriod.cs" />
     <Compile Include="Manifest\IManifestFilter.cs" />
@@ -339,6 +342,7 @@
     <Compile Include="Services\Changes\TreeChange.cs" />
     <Compile Include="Services\Changes\TreeChangeExtensions.cs" />
     <Compile Include="Services\IDataTypeService.cs" />
+    <Compile Include="Services\IEntityService.cs" />
     <Compile Include="Services\IFileService.cs" />
     <Compile Include="Services\ILocalizationService.cs" />
     <Compile Include="Services\IMacroService.cs" />
@@ -408,11 +412,8 @@
     <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
     <Compile Include="Events\CancellableObjectEventArgsOfTEventObject.cs" />
     <Compile Include="Events\RolesEventArgs.cs" />
-    <Compile Include="IO\IFileSystems.cs" />
-    <Compile Include="IO\IMediaFileSystem.cs" />
     <Compile Include="GuidUtils.cs" />
     <Compile Include="IO\MediaPathSchemes\CombinedGuidsMediaPathScheme.cs" />
-    <Compile Include="IO\IMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\OriginalMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\TwoGuidsMediaPathScheme.cs" />
     <Compile Include="IO\SupportingFileSystems.cs" />
@@ -594,8 +595,6 @@
     <Compile Include="IO\FileSystemExtensions.cs" />
     <Compile Include="IO\FileSystems.cs" />
     <Compile Include="IO\FileSystemWrapper.cs" />
-    <Compile Include="IO\IFileSystem.cs" />
-    <Compile Include="IO\IOHelper.cs" />
     <Compile Include="IO\MediaFileSystem.cs" />
     <Compile Include="IO\PhysicalFileSystem.cs" />
     <Compile Include="IO\ShadowFileSystem.cs" />
@@ -1160,7 +1159,6 @@
     <Compile Include="Services\IContentTypeService.cs" />
     <Compile Include="Services\IContentTypeServiceBase.cs" />
     <Compile Include="Services\IdkMap.cs" />
-    <Compile Include="Services\IEntityService.cs" />
     <Compile Include="Services\IExternalLoginService.cs" />
     <Compile Include="Services\IMediaService.cs" />
     <Compile Include="Services\IMediaTypeService.cs" />
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 135172460d..340f24ef28 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -196,6 +196,7 @@ namespace Umbraco.Tests.Routing
 
             public ActionResult HomePage(ContentModel model)
             {
+                // ReSharper disable once Mvc.ViewNotResolved
                 return View();
             }
 
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 1a789023a5..a9c405237b 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -184,6 +184,7 @@ namespace Umbraco.Tests.Web.Mvc
 
             public ActionResult Index()
             {
+                // ReSharper disable once Mvc.ViewNotResolved
                 return View();
             }
 
diff --git a/src/Umbraco.Web/Mvc/RenderActionInvoker.cs b/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
index 88d30db507..c86d2f77c3 100644
--- a/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
+++ b/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
@@ -32,6 +32,7 @@ namespace Umbraco.Web.Mvc
                 //check if the controller is an instance of IRenderController and find the index
                 if (controllerContext.Controller is IRenderController)
                 {
+                    // ReSharper disable once Mvc.ActionNotResolved
                     return controllerDescriptor.FindAction(controllerContext, "Index");
                 }
             }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index fe1baf8fd3..317786b970 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -94,7 +94,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
     <PackageReference Include="Umbraco.Code">
       <Version>1.0.5</Version>
@@ -1283,4 +1282,4 @@
       <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
     </SGen>
   </Target>
-</Project>
+</Project>
\ No newline at end of file