Update packages

This commit is contained in:
Matt Nadareski
2024-12-03 13:20:05 -05:00
parent e72336a835
commit 7f061f22e0
10 changed files with 23 additions and 22 deletions

View File

@@ -1,3 +1,7 @@
### WIP (xxxx-xx-xx)
- Update packages
### 3.2.4 (2024-11-24)
- Update Redumper to build 438

View File

@@ -42,10 +42,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.2.3" GeneratePathProperty="true">
<PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.3.1" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SabreTools.RedumpLib" Version="1.5.2" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -46,10 +46,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.2.3" GeneratePathProperty="true">
<PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.3.1" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SabreTools.RedumpLib" Version="1.5.2" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -26,7 +26,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.RedumpLib" Version="1.5.2" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.0" />
</ItemGroup>
</Project>

View File

@@ -460,7 +460,7 @@ namespace MPF.Frontend
if (seedInfo != null)
{
resultProgress?.Report(ResultEventArgs.Success("Injecting user-supplied information..."));
Builder.InjectSubmissionInformation(submissionInfo, seedInfo);
submissionInfo = Builder.InjectSubmissionInformation(submissionInfo, seedInfo);
resultProgress?.Report(ResultEventArgs.Success("Information injection complete!"));
}
@@ -479,7 +479,7 @@ namespace MPF.Frontend
// Process special fields for site codes
resultProgress?.Report(ResultEventArgs.Success("Processing site codes..."));
Formatter.ProcessSpecialFields(submissionInfo);
Formatter.ProcessSpecialFields(submissionInfo!);
resultProgress?.Report(ResultEventArgs.Success("Processing complete!"));
// Format the information for the text output
@@ -636,9 +636,9 @@ namespace MPF.Frontend
/// </summary>
/// <param name="outputDirectory">Output folder to write to</param>
/// <param name="filenameSuffix">Optional suffix to append to the filename</param>
/// <param name="lines">Preformatted list of lines to write out to the file</param>
/// <param name="lines">Preformatted string of lines to write out to the file</param>
/// <returns>True on success, false on error</returns>
private static bool WriteOutputData(string? outputDirectory, string? filenameSuffix, List<string>? lines, out string status)
private static bool WriteOutputData(string? outputDirectory, string? filenameSuffix, string? lines, out string status)
{
// Check to see if the inputs are valid
if (lines == null)
@@ -662,10 +662,7 @@ namespace MPF.Frontend
path = Path.Combine(outputDirectory, $"!submissionInfo_{filenameSuffix}.txt");
using var sw = new StreamWriter(File.Open(path, FileMode.Create, FileAccess.Write), Encoding.UTF8);
foreach (string line in lines)
{
sw.WriteLine(line);
}
sw.Write(lines);
}
catch (Exception ex)
{

View File

@@ -40,12 +40,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.2.3" GeneratePathProperty="true">
<PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.3.1" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="LibIRD" Version="0.9.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.5.2" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.0" />
</ItemGroup>
</Project>

View File

@@ -37,9 +37,9 @@
<ItemGroup>
<PackageReference Include="psxt001z.Library" Version="0.21.0-rc2" />
<PackageReference Include="SabreTools.Hashing" Version="1.4.0" />
<PackageReference Include="SabreTools.Models" Version="1.5.3" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.5.2" />
<PackageReference Include="SabreTools.Serialization" Version="1.7.6" />
<PackageReference Include="SabreTools.Models" Version="1.5.5" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.0" />
<PackageReference Include="SabreTools.Serialization" Version="1.8.1" />
</ItemGroup>
</Project>

View File

@@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.CodeCoverage" Version="17.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.5.2" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="1.17.0" />

View File

@@ -73,10 +73,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.2.3" GeneratePathProperty="true">
<PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.3.1" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SabreTools.RedumpLib" Version="1.5.2" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -252,7 +252,7 @@ namespace MPF.UI.Windows
{
var submissionInfo = MainViewModel.CreateDebugSubmissionInfo();
_ = ShowDiscInformationWindow(ref submissionInfo);
Formatter.ProcessSpecialFields(submissionInfo);
Formatter.ProcessSpecialFields(submissionInfo!);
}
/// <summary>