claunia/romrepomgr
1
0
Fork 0
mirror of https://github.com/claunia/romrepomgr.git synced 2025-12-16 11:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies.

Browse Source
This commit is contained in:
Natalia Portillo
2020-12-21 01:22:36 +00:00
parent 5c87920c13
commit 197c86fb22
11 changed files with 30 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -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

1
EFCore.BulkExtensions

Submodule EFCore.BulkExtensions deleted from 39aa76658c

6
RomRepoMgr.Core/RomRepoMgr.Core.csproj
View File

@@ -7,17 +7,17 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.13.8" />
<PackageReference Include="DotNetZip" Version="1.15.0" />
<PackageReference Include="EFCore.BulkExtensions" Version="3.2.7" />
<PackageReference Include="Mono.Fuse.NETStandard" Version="1.1.0" />
<PackageReference Include="SharpCompress" Version="0.26.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RomRepoMgr.Database\RomRepoMgr.Database.csproj" />
<ProjectReference Include="..\RomRepoMgr.Settings\RomRepoMgr.Settings.csproj" />
<ProjectReference Include="..\SabreTools\SabreTools.DatFiles\SabreTools.DatFiles.csproj" />
<ProjectReference Include="..\SabreTools\SabreTools.Library\SabreTools.Library.csproj" />
<ProjectReference Include="..\winfsp-netcore\winfsp-netcore.csproj" />
</ItemGroup>

9
RomRepoMgr.Database/RomRepoMgr.Database.csproj
View File

@@ -6,14 +6,14 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.7">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.7" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
@@ -21,7 +21,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EFCore.BulkExtensions\EFCore.BulkExtensions\EFCore.BulkExtensions.csproj" />
<ProjectReference Include="..\RomRepoMgr.Settings\RomRepoMgr.Settings.csproj" />
</ItemGroup>

2
RomRepoMgr.Settings/Interop/DetectOS.cs
View File

@@ -73,7 +73,7 @@ namespace Aaru.CommonTypes.Interop
{
get
{
if(!IsWindows)
if(!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
return Environment.UserName == "root";
bool isAdmin;

5
RomRepoMgr.Settings/Interop/Version.cs
View File

@@ -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 &&

2
RomRepoMgr.Settings/RomRepoMgr.Settings.csproj
View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="plist-cil" Version="2.1.0" />
</ItemGroup>

21
RomRepoMgr.Settings/Settings.cs
View File

@@ -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");

6
RomRepoMgr.sln
View File

@@ -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

14
RomRepoMgr/RomRepoMgr.csproj
View File

@@ -19,13 +19,13 @@
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.0-preview5" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.0-preview5" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview5" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview5" />
<PackageReference Include="MessageBox.Avalonia" Version="0.10.0-prev2" />
<PackageReference Include="Svg.Skia.Avalonia" Version="0.10.0-preview3" />
<PackageReference Include="Avalonia" Version="0.10.0-rc1" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.0-rc1" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-rc1" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-rc1" />
<PackageReference Include="MessageBox.Avalonia" Version="0.10.7-rc1" />
<PackageReference Include="Svg.Skia.Avalonia" Version="0.10.0-preview7" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RomRepoMgr.Database\RomRepoMgr.Database.csproj" />

4
winfsp-netcore/winfsp-netcore.csproj
View File

@@ -28,7 +28,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
</ItemGroup>
</Project>