SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Consolidate into MPF.Core

Browse Source
This commit is contained in:
Matt Nadareski
2023-10-06 20:39:59 -04:00
parent 4a30f94007
commit e3948ba91b
33 changed files with 33 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -20,6 +20,7 @@
- Be trickier when it comes to type from size
- Fix "detected" message
- Be smarter about media type based on system
- Consolidate into MPF.Core
### 2.6.6 (2023-10-04)

1
MPF.Check/MPF.Check.csproj
View File

@@ -17,7 +17,6 @@
<ItemGroup>
<ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
<ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
</ItemGroup>
<ItemGroup>

2
MPF.Check/Program.cs
View File

@@ -1,10 +1,10 @@
using System;
using System.IO;
using BurnOutSharp;
using MPF.Core;
using MPF.Core.Converters;
using MPF.Core.Data;
using MPF.Core.Utilities;
using MPF.Library;
using SabreTools.RedumpLib.Data;
using SabreTools.RedumpLib.Web;

4
MPF.Core/AssemblyInfo.cs
View File

@@ -1,4 +0,0 @@
using System.Runtime.CompilerServices;
// Anything marked as internal can be used by the test methods
[assembly: InternalsVisibleTo("MPF.Test")]

5
MPF.Library/DumpEnvironment.cs → MPF.Core/DumpEnvironment.cs
View File

@@ -4,12 +4,13 @@ using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using BurnOutSharp;
using MPF.Core;
using MPF.Core.Data;
using MPF.Core.Utilities;
using MPF.Modules;
using MPF.Core.Modules;
using SabreTools.RedumpLib.Data;
namespace MPF.Library
namespace MPF.Core
{
/// <summary>
/// Represents the state of all settings to be used during dumping

4
MPF.Library/InfoTool.cs → MPF.Core/InfoTool.cs
View File

@@ -11,13 +11,13 @@ using System.Xml;
using BurnOutSharp;
using MPF.Core.Data;
using MPF.Core.Utilities;
using MPF.Modules;
using MPF.Core.Modules;
using Newtonsoft.Json;
using SabreTools.RedumpLib.Data;
using SabreTools.RedumpLib.Web;
using Formatting = Newtonsoft.Json.Formatting;
namespace MPF.Library
namespace MPF.Core
{
public static class InfoTool
{

9
MPF.Core/MPF.Core.csproj
View File

@@ -10,11 +10,20 @@
</PropertyGroup>
<ItemGroup>
<InternalsVisibleTo Include="MPF.Test" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.8.0" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0-preview.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.Models" Version="1.1.4" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
<PackageReference Include="SabreTools.Serialization" Version="1.1.6" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
<PackageReference Include="System.IO.Hashing" Version="7.0.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
</ItemGroup>

2
MPF.Modules/Aaru/Constants.cs → MPF.Core/Modules/Aaru/Constants.cs
View File

@@ -1,4 +1,4 @@
namespace MPF.Modules.Aaru
namespace MPF.Core.Modules.Aaru
{
/// <summary>
/// Top-level commands for Aaru

2
MPF.Modules/Aaru/Converters.cs → MPF.Core/Modules/Aaru/Converters.cs
View File

@@ -1,6 +1,6 @@
using SabreTools.RedumpLib.Data;
namespace MPF.Modules.Aaru
namespace MPF.Core.Modules.Aaru
{
public static class Converters
{

2
MPF.Modules/Aaru/Parameters.cs → MPF.Core/Modules/Aaru/Parameters.cs
View File

@@ -16,7 +16,7 @@ using Schemas;
// Ignore "Type or member is obsolete"
#pragma warning disable CS0618
namespace MPF.Modules.Aaru
namespace MPF.Core.Modules.Aaru
{
/// <summary>
/// Represents a generic set of Aaru parameters

0
MPF.Modules/Aaru/cicm.cs → MPF.Core/Modules/Aaru/cicm.cs
View File

2
MPF.Modules/BaseParameters.cs → MPF.Core/Modules/BaseParameters.cs
View File

@@ -15,7 +15,7 @@ using MPF.Core.Utilities;
using SabreTools.Models.PIC;
using SabreTools.RedumpLib.Data;
namespace MPF.Modules
namespace MPF.Core.Modules
{
public abstract class BaseParameters
{

2
MPF.Modules/CleanRIp/Parameters.cs → MPF.Core/Modules/CleanRIp/Parameters.cs
View File

@@ -7,7 +7,7 @@ using MPF.Core.Converters;
using MPF.Core.Data;
using SabreTools.RedumpLib.Data;
namespace MPF.Modules.CleanRip
namespace MPF.Core.Modules.CleanRip
{
/// <summary>
/// Represents a generic set of CleanRip parameters

2
MPF.Modules/Datafile.cs → MPF.Core/Modules/Datafile.cs
View File

@@ -1,6 +1,6 @@
using System.Xml.Serialization;
namespace MPF.Modules
namespace MPF.Core.Modules
{
[XmlRoot("datafile")]
public class Datafile

2
MPF.Modules/DiscImageCreator/Constants.cs → MPF.Core/Modules/DiscImageCreator/Constants.cs
View File

@@ -1,4 +1,4 @@
namespace MPF.Modules.DiscImageCreator
namespace MPF.Core.Modules.DiscImageCreator
{
/// <summary>
/// Top-level commands for DiscImageCreator

2
MPF.Modules/DiscImageCreator/Converters.cs → MPF.Core/Modules/DiscImageCreator/Converters.cs
View File

@@ -1,6 +1,6 @@
using SabreTools.RedumpLib.Data;
namespace MPF.Modules.DiscImageCreator
namespace MPF.Core.Modules.DiscImageCreator
{
public static class Converters
{

2
MPF.Modules/DiscImageCreator/Parameters.cs → MPF.Core/Modules/DiscImageCreator/Parameters.cs
View File

@@ -9,7 +9,7 @@ using MPF.Core.Utilities;
using SabreTools.Models.PIC;
using SabreTools.RedumpLib.Data;
namespace MPF.Modules.DiscImageCreator
namespace MPF.Core.Modules.DiscImageCreator
{
/// <summary>
/// Represents a generic set of DiscImageCreator parameters

2
MPF.Modules/Redumper/Constants.cs → MPF.Core/Modules/Redumper/Constants.cs
View File

@@ -1,4 +1,4 @@
namespace MPF.Modules.Redumper
namespace MPF.Core.Modules.Redumper
{
/// <summary>
/// Top-level commands for Redumper

2
MPF.Modules/Redumper/Converters.cs → MPF.Core/Modules/Redumper/Converters.cs
View File

@@ -1,6 +1,6 @@
using SabreTools.RedumpLib.Data;
namespace MPF.Modules.Redumper
namespace MPF.Core.Modules.Redumper
{
public static class Converters
{

2
MPF.Modules/Redumper/Parameters.cs → MPF.Core/Modules/Redumper/Parameters.cs
View File

@@ -8,7 +8,7 @@ using MPF.Core.Data;
using MPF.Core.Utilities;
using SabreTools.RedumpLib.Data;
namespace MPF.Modules.Redumper
namespace MPF.Core.Modules.Redumper
{
/// <summary>
/// Represents a generic set of Redumper parameters

2
MPF.Modules/UmdImageCreator/Parameters.cs → MPF.Core/Modules/UmdImageCreator/Parameters.cs
View File

@@ -6,7 +6,7 @@ using MPF.Core.Converters;
using MPF.Core.Data;
using SabreTools.RedumpLib.Data;
namespace MPF.Modules.UmdImageCreator
namespace MPF.Core.Modules.UmdImageCreator
{
/// <summary>
/// Represents a generic set of UmdImageCreator parameters

2
MPF.Library/Protection.cs → MPF.Core/Protection.cs
View File

@@ -8,7 +8,7 @@ using BinaryObjectScanner.Protection;
using BurnOutSharp;
using psxt001z;
namespace MPF.Library
namespace MPF.Core
{
public static class Protection
{

4
MPF.Library/AssemblyInfo.cs
View File

@@ -1,4 +0,0 @@
using System.Runtime.CompilerServices;
// Anything marked as internal can be used by the test methods
[assembly: InternalsVisibleTo("MPF.Test")]

33
MPF.Library/MPF.Library.csproj
View File

@@ -1,33 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
<Copyright>Copyright (c)2019-2023</Copyright>
<VersionPrefix>2.6.6</VersionPrefix>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
<ProjectReference Include="..\MPF.Modules\MPF.Modules.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.8.0" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.Models" Version="1.1.4" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
</ItemGroup>
</Project>

4
MPF.Modules/AssemblyInfo.cs
View File

@@ -1,4 +0,0 @@
using System.Runtime.CompilerServices;
// Anything marked as internal can be used by the test methods
[assembly: InternalsVisibleTo("MPF.Test")]

24
MPF.Modules/MPF.Modules.csproj
View File

@@ -1,24 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
<Copyright>Copyright (c)2019-2023</Copyright>
<VersionPrefix>2.6.6</VersionPrefix>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.Models" Version="1.1.4" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
<PackageReference Include="SabreTools.Serialization" Version="1.1.6" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
</ItemGroup>
</Project>

3
MPF.Test/Library/DumpEnvironmentTests.cs
View File

@@ -1,6 +1,5 @@
using System.IO;
using MPF.Core;
using MPF.Core.Data;
using MPF.Library;
using SabreTools.RedumpLib.Data;
using Xunit;

2
MPF.Test/MPF.Test.csproj
View File

@@ -7,8 +7,6 @@
<ItemGroup>
<ProjectReference Include="..\MPF\MPF.csproj" />
<ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
<ProjectReference Include="..\MPF.Modules\MPF.Modules.csproj" />
</ItemGroup>
<ItemGroup>

2
MPF.Test/Modules/DiscImageCreatorTests.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
using MPF.Core.Data;
using MPF.Modules.DiscImageCreator;
using MPF.Core.Modules.DiscImageCreator;
using SabreTools.RedumpLib.Data;
using Xunit;

1
MPF.UI.Core/MPF.UI.Core.csproj
View File

@@ -17,7 +17,6 @@
<ItemGroup>
<ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
<ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net48'">

2
MPF.UI.Core/ViewModels/MainViewModel.cs
View File

@@ -5,9 +5,9 @@ using System.Linq;
using System.Windows;
using System.Windows.Controls;
using BurnOutSharp;
using MPF.Core;
using MPF.Core.Data;
using MPF.Core.Utilities;
using MPF.Library;
using MPF.UI.Core.ComboBoxItems;
using MPF.UI.Core.Windows;
using SabreTools.RedumpLib.Data;

14
MPF.sln
View File

@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF", "MPF\MPF.csproj", "{7
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Test", "MPF.Test\MPF.Test.csproj", "{7CC064D2-38AB-4A05-8519-28660DE4562A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Library", "MPF.Library\MPF.Library.csproj", "{51AB0928-13F9-44BF-A407-B6957A43A056}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Check", "MPF.Check\MPF.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D1DCF5A-F0B0-4E81-A05B-F1A7D37C9D9D}"
@@ -25,8 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Core", "MPF.Core\MPF.Core.csproj", "{70B1265D-FE49-472A-A83D-0B462152D37A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Modules", "MPF.Modules\MPF.Modules.csproj", "{8A4254BD-552F-4238-B8EB-D59AACD768B9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.UI.Core", "MPF.UI.Core\MPF.UI.Core.csproj", "{EA3768DB-694A-4653-82E4-9FF71B8963F3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MPF", "MPF", "{4160167D-681D-480B-ABC6-06AC869E5769}"
@@ -45,10 +41,6 @@ Global
{7CC064D2-38AB-4A05-8519-28660DE4562A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7CC064D2-38AB-4A05-8519-28660DE4562A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7CC064D2-38AB-4A05-8519-28660DE4562A}.Release|Any CPU.Build.0 = Release|Any CPU
{51AB0928-13F9-44BF-A407-B6957A43A056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{51AB0928-13F9-44BF-A407-B6957A43A056}.Debug|Any CPU.Build.0 = Debug|Any CPU
{51AB0928-13F9-44BF-A407-B6957A43A056}.Release|Any CPU.ActiveCfg = Release|Any CPU
{51AB0928-13F9-44BF-A407-B6957A43A056}.Release|Any CPU.Build.0 = Release|Any CPU
{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CFDE289-E171-4D49-A40D-5293265C1253}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -57,10 +49,6 @@ Global
{70B1265D-FE49-472A-A83D-0B462152D37A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70B1265D-FE49-472A-A83D-0B462152D37A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70B1265D-FE49-472A-A83D-0B462152D37A}.Release|Any CPU.Build.0 = Release|Any CPU
{8A4254BD-552F-4238-B8EB-D59AACD768B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A4254BD-552F-4238-B8EB-D59AACD768B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A4254BD-552F-4238-B8EB-D59AACD768B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A4254BD-552F-4238-B8EB-D59AACD768B9}.Release|Any CPU.Build.0 = Release|Any CPU
{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,10 +60,8 @@ Global
GlobalSection(NestedProjects) = preSolution
{7B1B75EB-8940-466F-BD51-76471A57F9BE} = {4160167D-681D-480B-ABC6-06AC869E5769}
{7CC064D2-38AB-4A05-8519-28660DE4562A} = {4160167D-681D-480B-ABC6-06AC869E5769}
{51AB0928-13F9-44BF-A407-B6957A43A056} = {4160167D-681D-480B-ABC6-06AC869E5769}
{8CFDE289-E171-4D49-A40D-5293265C1253} = {4160167D-681D-480B-ABC6-06AC869E5769}
{70B1265D-FE49-472A-A83D-0B462152D37A} = {4160167D-681D-480B-ABC6-06AC869E5769}
{8A4254BD-552F-4238-B8EB-D59AACD768B9} = {4160167D-681D-480B-ABC6-06AC869E5769}
{EA3768DB-694A-4653-82E4-9FF71B8963F3} = {4160167D-681D-480B-ABC6-06AC869E5769}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution

1
MPF/MPF.csproj
View File

@@ -21,7 +21,6 @@
<ItemGroup>
<ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
<ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
<ProjectReference Include="..\MPF.UI.Core\MPF.UI.Core.csproj" />
</ItemGroup>