Merge pull request #13 from rurku/fix_system_memory_conflict

Fix System.Memory conflict
rurku · Nov 17, 2018 · 7d026f1 · 7d026f1
2 parents 4bc2e95 + f38b04d
commit 7d026f1
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 23 deletions.
diff --git a/ShowPics.Cli/ShowPics.Cli.csproj b/ShowPics.Cli/ShowPics.Cli.csproj
@@ -1,13 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0003" />
-    <!-- Had to add System.Numerics.Vectors explicitly to fix compilation errors with ImageSharp 1.0.0-beta0003. Might not be needed with future versions. -->
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview1-26216-02" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ShowPics.Cli/ThumbnailCreator.cs b/ShowPics.Cli/ThumbnailCreator.cs
@@ -11,7 +11,6 @@
 using SixLabors.ImageSharp.MetaData;
 using System.Globalization;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Transforms;
 using System.Runtime.Serialization;
 
 namespace ShowPics.Cli

diff --git a/ShowPics.Data.Abstractions/ShowPics.Data.Abstractions.csproj b/ShowPics.Data.Abstractions/ShowPics.Data.Abstractions.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ShowPics.Data/ShowPics.Data.csproj b/ShowPics.Data/ShowPics.Data.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ShowPics.Entities/ShowPics.Entities.csproj b/ShowPics.Entities/ShowPics.Entities.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/ShowPics.Utilities/PathHelper.cs b/ShowPics.Utilities/PathHelper.cs
@@ -28,7 +28,7 @@ public PathHelper(IOptions<FolderSettings> folderSettings)
         public string JoinLogicalPaths(params string[] paths)
         {
             var normalized = paths.Select(x => x.Trim('/')).Where(x => !string.IsNullOrEmpty(x));
-            return string.Join('/', normalized);
+            return string.Join("/", normalized);
         }
 
         public string GetPhysicalPath(string logicalPath)
@@ -67,15 +67,15 @@ public string GetApiPath(string originalPath)
 
         public string GetParentPath(string logicalPath)
         {
-            var split = logicalPath.Split('/', options: StringSplitOptions.RemoveEmptyEntries);
+            var split = logicalPath.Split(new[] { '/' }, options: StringSplitOptions.RemoveEmptyEntries);
             if (split.Length == 0)
                 return null;
-            return string.Join('/', split.Take(split.Length - 1));
+            return string.Join("/", split.Take(split.Length - 1));
         }
 
         public string GetName(string logicalPath)
         {
-            var split = logicalPath.Split('/', options: StringSplitOptions.RemoveEmptyEntries);
+            var split = logicalPath.Split(new[] { '/' }, options: StringSplitOptions.RemoveEmptyEntries);
             if (split.Length == 0)
                 return "";
             return split.Last();

diff --git a/ShowPics.Utilities/ShowPics.Utilities.csproj b/ShowPics.Utilities/ShowPics.Utilities.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ShowPics/appsettings.json b/ShowPics/appsettings.json
@@ -24,16 +24,11 @@
   },
   "folderSettings": {
     "Folders": [
-      //{
-      //  "Name": "Zdjęcia",
-      //  "PhysicalPath": "S:\\Obrazy\\Zdjęcia"
-      //},
       {
         "Name": "foty",
         "PhysicalPath": "C:\\workspace\\temp\\foty"
       }
     ],
-    //"ThumbnailsPath": "S:\\showpicsthumbnails",
     "ThumbnailsPath": "C:\\workspace\\temp\\ShowPicsThumbnails",
     "ConversionThreads": 4,
     "ForceGCAfterEachImage": false