SM64-Rom-Manager/Administration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update nuget packages

Browse Source
This commit is contained in:
Pascal
2023-11-20 18:30:28 +01:00
parent b4c2459440
commit bf946021ad
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SM64RomManager.LangResCollector/Program.cs
View File

@@ -22,6 +22,8 @@ namespace SM64RomManager.LangRes_Collector
var myAppDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var myConfigFilePath = Path.Combine(myAppDir, "FilterConfig.json");
var filterConfig = JObject.Parse(File.ReadAllText(myConfigFilePath)).ToObject<LangResFilterConfig>();
var allLoadedAssemblies = AppDomain.CurrentDomain.GetAssemblies().Select(x => x.GetName()).ToArray();
var typeNameString = typeof(string).Name;
// Get root path
ofd.Title = "Root (repository) directory";
@@ -68,7 +70,10 @@ namespace SM64RomManager.LangRes_Collector
// Copy and prepair files
foreach (var resFileInput in resFiles)
{
var resReader = new ResXResourceReader(resFileInput);
var resReader = new ResXResourceReader(resFileInput)
{
UseResXDataNodes = true
};
var propsToCopy = new Dictionary<string, string>();
// Collect input properties
@@ -85,10 +90,16 @@ namespace SM64RomManager.LangRes_Collector
}
// Hold property to write later, if it's a string
if (useProp && kvp.Value is string val)
try
{
if (useProp && kvp.Value is ResXDataNode node && node.GetValue(allLoadedAssemblies) is string val)
{
if (!string.IsNullOrEmpty(val))
propsToCopy.Add(propName, val);
}
}
catch(FileNotFoundException)
{
if (!string.IsNullOrEmpty(val))
propsToCopy.Add(propName, (string)kvp.Value);
}
}

10
SM64RomManager.ProgressUpdater/SM64RomManager.ProgressUpdater.csproj
View File

@@ -45,7 +45,7 @@
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.ComponentModel.Composition" Version="7.0.0" />
<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="UI.for.WinForms.AllControls.Net60">
<Version>2023.2.718</Version>
@@ -149,9 +149,9 @@
<Content Include="1443729764_forest_mushroom.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Discord.Net" Version="3.12.0" />
<PackageReference Include="Discord.Net" Version="3.13.0" />
<PackageReference Include="Markdig" Version="0.33.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
@@ -159,11 +159,11 @@
<PackageReference Include="System.AppContext" Version="4.3.0" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
<PackageReference Include="System.Console" Version="4.3.1" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
<PackageReference Include="System.Globalization" Version="4.3.0" />

2
SM64RomManager.UpdateInstallerAddOn/SM64RomManager.UpdateInstallerAddOn.csproj
View File

@@ -65,6 +65,6 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Pilz.Updating" Version="1.2023.914.1123" />
<PackageReference Include="Pilz.Updating" Version="1.2023.1120.1825" />
</ItemGroup>
</Project>