From 47822a46934ce14521fba309c7b83187edd3815d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holger@boerchers.org>
Date: Wed, 9 Dec 2020 22:21:24 +0100
Subject: [PATCH] updated to net 5

---
 PhotoRenamer.Base/PhotoRenamer.Base.csproj   | 17 -----------------
 PhotoRenamer.Base/RegionNames.cs             |  8 --------
 PhotoRenamer.Test/PhotoRenamer.Test.csproj   |  3 +--
 PhotoRenamer.sln                             |  8 +-------
 PhotoRenamer/FilesHelper.cs                  |  3 +--
 PhotoRenamer/PhotoRenamer.csproj             |  5 +++--
 PhotoRenamer/PhotoRenamer.csproj.DotSettings |  2 ++
 7 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 PhotoRenamer.Base/PhotoRenamer.Base.csproj
 delete mode 100644 PhotoRenamer.Base/RegionNames.cs
 create mode 100644 PhotoRenamer/PhotoRenamer.csproj.DotSettings

diff --git a/PhotoRenamer.Base/PhotoRenamer.Base.csproj b/PhotoRenamer.Base/PhotoRenamer.Base.csproj
deleted file mode 100644
index f63a054..0000000
--- a/PhotoRenamer.Base/PhotoRenamer.Base.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="ExifLibNet" Version="2.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>
diff --git a/PhotoRenamer.Base/RegionNames.cs b/PhotoRenamer.Base/RegionNames.cs
deleted file mode 100644
index ed8dfa7..0000000
--- a/PhotoRenamer.Base/RegionNames.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace PhotoRenamer.Base
-{
-    public static class RegionNames
-    {
-        public static string ContentRegion { get; } = "ContentRegion";
-        public static string LoggingRegion { get; } = "LoggingRegion";
-    }
-}
\ No newline at end of file
diff --git a/PhotoRenamer.Test/PhotoRenamer.Test.csproj b/PhotoRenamer.Test/PhotoRenamer.Test.csproj
index d3a917d..2c1ee47 100644
--- a/PhotoRenamer.Test/PhotoRenamer.Test.csproj
+++ b/PhotoRenamer.Test/PhotoRenamer.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -39,7 +39,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\PhotoRenamer.Base\PhotoRenamer.Base.csproj" />
     <ProjectReference Include="..\PhotoRenamer\PhotoRenamer.csproj" />
   </ItemGroup>
 
diff --git a/PhotoRenamer.sln b/PhotoRenamer.sln
index a3101ed..8043c38 100644
--- a/PhotoRenamer.sln
+++ b/PhotoRenamer.sln
@@ -5,9 +5,7 @@ VisualStudioVersion = 16.0.29609.76
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PhotoRenamer", "PhotoRenamer\PhotoRenamer.csproj", "{C2C8C238-CB3D-4DDA-96FC-297D029F6022}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoRenamer.Test", "PhotoRenamer.Test\PhotoRenamer.Test.csproj", "{07F827BC-CF99-4E81-A5C7-54085C97FC10}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoRenamer.Base", "PhotoRenamer.Base\PhotoRenamer.Base.csproj", "{DE85C395-3D50-4C12-9B7A-021180E26CE1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PhotoRenamer.Test", "PhotoRenamer.Test\PhotoRenamer.Test.csproj", "{07F827BC-CF99-4E81-A5C7-54085C97FC10}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,10 +21,6 @@ Global
 		{07F827BC-CF99-4E81-A5C7-54085C97FC10}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07F827BC-CF99-4E81-A5C7-54085C97FC10}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07F827BC-CF99-4E81-A5C7-54085C97FC10}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE85C395-3D50-4C12-9B7A-021180E26CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE85C395-3D50-4C12-9B7A-021180E26CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE85C395-3D50-4C12-9B7A-021180E26CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE85C395-3D50-4C12-9B7A-021180E26CE1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/PhotoRenamer/FilesHelper.cs b/PhotoRenamer/FilesHelper.cs
index 254549b..af8f744 100644
--- a/PhotoRenamer/FilesHelper.cs
+++ b/PhotoRenamer/FilesHelper.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using PhotoRenamer.Types;
 
 namespace PhotoRenamer
 {
@@ -15,7 +14,7 @@ namespace PhotoRenamer
             foreach (var file in files)
             {
                 var fileExt = Path.GetExtension(file);
-                if (fileExt == null) continue;
+                if (fileExt is null) continue;
                 foreach (var supportedFileExtension in SupportedFileExtensions)
                 {
                     if (fileExt.Equals(supportedFileExtension, StringComparison.InvariantCultureIgnoreCase))
diff --git a/PhotoRenamer/PhotoRenamer.csproj b/PhotoRenamer/PhotoRenamer.csproj
index dafa349..f6c6ec4 100644
--- a/PhotoRenamer/PhotoRenamer.csproj
+++ b/PhotoRenamer/PhotoRenamer.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/PhotoRenamer/PhotoRenamer.csproj.DotSettings b/PhotoRenamer/PhotoRenamer.csproj.DotSettings
new file mode 100644
index 0000000..6162834
--- /dev/null
+++ b/PhotoRenamer/PhotoRenamer.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp90</s:String></wpf:ResourceDictionary>
\ No newline at end of file