From 197c86fb22521d9efc2583cc881287c1979dff37 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 21 Dec 2020 01:22:36 +0000 Subject: [PATCH] Update dependencies. --- .gitmodules | 3 --- EFCore.BulkExtensions | 1 - RomRepoMgr.Core/RomRepoMgr.Core.csproj | 6 +++--- .../RomRepoMgr.Database.csproj | 9 ++++---- RomRepoMgr.Settings/Interop/DetectOS.cs | 2 +- RomRepoMgr.Settings/Interop/Version.cs | 5 +---- .../RomRepoMgr.Settings.csproj | 2 +- RomRepoMgr.Settings/Settings.cs | 21 ++++++++++--------- RomRepoMgr.sln | 6 ------ RomRepoMgr/RomRepoMgr.csproj | 14 ++++++------- winfsp-netcore/winfsp-netcore.csproj | 4 ++-- 11 files changed, 30 insertions(+), 43 deletions(-) delete mode 160000 EFCore.BulkExtensions diff --git a/.gitmodules b/.gitmodules index 4b545c5..b0fa098 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "winfsp"] path = winfsp url = https://github.com/billziss-gh/winfsp/ -[submodule "EFCore.BulkExtensions"] - path = EFCore.BulkExtensions - url = https://github.com/claunia/EFCore.BulkExtensions diff --git a/EFCore.BulkExtensions b/EFCore.BulkExtensions deleted file mode 160000 index 39aa766..0000000 --- a/EFCore.BulkExtensions +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 39aa76658c4ba52cf7a2c2eb713cf975434e27ee diff --git a/RomRepoMgr.Core/RomRepoMgr.Core.csproj b/RomRepoMgr.Core/RomRepoMgr.Core.csproj index f89b47b..afc0520 100644 --- a/RomRepoMgr.Core/RomRepoMgr.Core.csproj +++ b/RomRepoMgr.Core/RomRepoMgr.Core.csproj @@ -7,17 +7,17 @@ - + + - + - diff --git a/RomRepoMgr.Database/RomRepoMgr.Database.csproj b/RomRepoMgr.Database/RomRepoMgr.Database.csproj index 8f9fba4..ab3b6c9 100644 --- a/RomRepoMgr.Database/RomRepoMgr.Database.csproj +++ b/RomRepoMgr.Database/RomRepoMgr.Database.csproj @@ -6,14 +6,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + @@ -21,7 +21,6 @@ - diff --git a/RomRepoMgr.Settings/Interop/DetectOS.cs b/RomRepoMgr.Settings/Interop/DetectOS.cs index 93aa7b1..8ac71bb 100644 --- a/RomRepoMgr.Settings/Interop/DetectOS.cs +++ b/RomRepoMgr.Settings/Interop/DetectOS.cs @@ -73,7 +73,7 @@ namespace Aaru.CommonTypes.Interop { get { - if(!IsWindows) + if(!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return Environment.UserName == "root"; bool isAdmin; diff --git a/RomRepoMgr.Settings/Interop/Version.cs b/RomRepoMgr.Settings/Interop/Version.cs index 3bd51cd..f831f08 100644 --- a/RomRepoMgr.Settings/Interop/Version.cs +++ b/RomRepoMgr.Settings/Interop/Version.cs @@ -52,14 +52,11 @@ namespace Aaru.CommonTypes.Interop { Assembly assembly = typeof(GCSettings).Assembly; - string[] assemblyPath = assembly.CodeBase?.Split(new[] + string[] assemblyPath = assembly.Location.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries); - if(assemblyPath is null) - return null; - int netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App"); if(netCoreAppIndex > 0 && diff --git a/RomRepoMgr.Settings/RomRepoMgr.Settings.csproj b/RomRepoMgr.Settings/RomRepoMgr.Settings.csproj index 55c1924..ec2f282 100644 --- a/RomRepoMgr.Settings/RomRepoMgr.Settings.csproj +++ b/RomRepoMgr.Settings/RomRepoMgr.Settings.csproj @@ -6,7 +6,7 @@ - + diff --git a/RomRepoMgr.Settings/Settings.cs b/RomRepoMgr.Settings/Settings.cs index b99984f..93b6373 100644 --- a/RomRepoMgr.Settings/Settings.cs +++ b/RomRepoMgr.Settings/Settings.cs @@ -25,6 +25,7 @@ using System; using System.IO; +using System.Runtime.InteropServices; using System.Text.Json; using Aaru.CommonTypes.Interop; using Claunia.PropertyList; @@ -115,11 +116,11 @@ namespace RomRepoMgr.Settings #if !NETSTANDARD2_0 // In case of Windows settings will be saved in the registry: HKLM/SOFTWARE/Claunia.com/RomRepoMgr - case PlatformID.Win32NT: - case PlatformID.Win32S: - case PlatformID.Win32Windows: - case PlatformID.WinCE: - case PlatformID.WindowsPhone: + case PlatformID.Win32NT when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): + case PlatformID.Win32S when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): + case PlatformID.Win32Windows when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): + case PlatformID.WinCE when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): + case PlatformID.WindowsPhone when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): { RegistryKey parentKey = Registry.CurrentUser.OpenSubKey("SOFTWARE")?.OpenSubKey("Claunia.com"); @@ -234,11 +235,11 @@ namespace RomRepoMgr.Settings #if !NETSTANDARD2_0 // In case of Windows settings will be saved in the registry: HKLM/SOFTWARE/Claunia.com/RomRepoMgr - case PlatformID.Win32NT: - case PlatformID.Win32S: - case PlatformID.Win32Windows: - case PlatformID.WinCE: - case PlatformID.WindowsPhone: + case PlatformID.Win32NT when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): + case PlatformID.Win32S when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): + case PlatformID.Win32Windows when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): + case PlatformID.WinCE when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): + case PlatformID.WindowsPhone when RuntimeInformation.IsOSPlatform(OSPlatform.Windows): { RegistryKey parentKey = Registry.CurrentUser.OpenSubKey("SOFTWARE", true)?. CreateSubKey("Claunia.com"); diff --git a/RomRepoMgr.sln b/RomRepoMgr.sln index be9b931..c53ac64 100644 --- a/RomRepoMgr.sln +++ b/RomRepoMgr.sln @@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RomRepoMgr.Core", "RomRepoM EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winfsp-netcore", "winfsp-netcore\winfsp-netcore.csproj", "{4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.BulkExtensions", "EFCore.BulkExtensions\EFCore.BulkExtensions\EFCore.BulkExtensions.csproj", "{E17E880B-F3A7-4D0E-9583-A0645CE25135}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.DatFiles", "SabreTools\SabreTools.DatFiles\SabreTools.DatFiles.csproj", "{2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Core", "SabreTools\SabreTools.Core\SabreTools.Core.csproj", "{77E643AF-F6A9-45CE-B76D-0C1A4533A13E}" @@ -52,10 +50,6 @@ Global {4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Release|Any CPU.Build.0 = Release|Any CPU - {E17E880B-F3A7-4D0E-9583-A0645CE25135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E17E880B-F3A7-4D0E-9583-A0645CE25135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E17E880B-F3A7-4D0E-9583-A0645CE25135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E17E880B-F3A7-4D0E-9583-A0645CE25135}.Release|Any CPU.Build.0 = Release|Any CPU {2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Debug|Any CPU.Build.0 = Debug|Any CPU {2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/RomRepoMgr/RomRepoMgr.csproj b/RomRepoMgr/RomRepoMgr.csproj index 74476ae..e956b9a 100644 --- a/RomRepoMgr/RomRepoMgr.csproj +++ b/RomRepoMgr/RomRepoMgr.csproj @@ -19,13 +19,13 @@ - - - - - - - + + + + + + + diff --git a/winfsp-netcore/winfsp-netcore.csproj b/winfsp-netcore/winfsp-netcore.csproj index e090cb8..fe74805 100644 --- a/winfsp-netcore/winfsp-netcore.csproj +++ b/winfsp-netcore/winfsp-netcore.csproj @@ -28,7 +28,7 @@ - - + +