SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-02-14 21:33:29 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Migrate to Nuget package for Redump

Browse Source
This commit is contained in:
Matt Nadareski
2023-09-05 00:08:09 -04:00
parent c2ba58148a
commit 816c94de58
60 changed files with 151 additions and 8904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,13 +23,6 @@
<UserSecretsId>27abb4ca-bf7a-431e-932f-49153303d5ff</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Resource Include="Images\ring-code-guide-1-layer.png" />
<Resource Include="Images\ring-code-guide-2-layer.png" />
@@ -37,13 +30,20 @@
<ItemGroup>
<ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
<ProjectReference Include="..\RedumpLib\RedumpLib.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationFramework.Aero" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Images\" />
</ItemGroup>

12
MPF.UI.Core/ViewModels/DiscInformationViewModel.cs
View File

@@ -5,7 +5,7 @@ using MPF.Core.Data;
using MPF.Core.Utilities;
using MPF.UI.Core.ComboBoxItems;
using MPF.UI.Core.Windows;
using RedumpLib.Data;
using SabreTools.RedumpLib.Data;
namespace MPF.UI.Core.ViewModels
{
@@ -536,9 +536,17 @@ namespace MPF.UI.Core.ViewModels
// Initialize the dictionaries, if needed
if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields == null)
#if NET48
SubmissionInfo.CommonDiscInfo.CommentsSpecialFields = new Dictionary<SiteCode?, string>();
#else
SubmissionInfo.CommonDiscInfo.CommentsSpecialFields = new Dictionary<SiteCode, string>();
#endif
if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields == null)
#if NET48
SubmissionInfo.CommonDiscInfo.ContentsSpecialFields = new Dictionary<SiteCode?, string>();
#else
SubmissionInfo.CommonDiscInfo.ContentsSpecialFields = new Dictionary<SiteCode, string>();
#endif
#region Comment Fields
@@ -801,7 +809,7 @@ namespace MPF.UI.Core.ViewModels
}
}
#endregion
#endregion
#region Event Handlers

2
MPF.UI.Core/Windows/DiscInformationWindow.xaml.cs
View File

@@ -1,6 +1,6 @@
using MPF.Core.Data;
using MPF.UI.Core.ViewModels;
using RedumpLib.Data;
using SabreTools.RedumpLib.Data;
namespace MPF.UI.Core.Windows
{