From 54928d163151f76586e02027e83ef6b278062b67 Mon Sep 17 00:00:00 2001 From: poddav Date: Fri, 29 Apr 2022 13:29:22 +0400 Subject: [PATCH] upgraded nuget packages. --- ArcFormats/ArcFormats.csproj | 25 ++++++++--- ArcFormats/AudioOGG.cs | 6 +-- ArcFormats/Properties/AssemblyInfo.cs | 4 +- ArcFormats/app.config | 8 ++++ ArcFormats/packages.config | 12 +++-- Experimental/Experimental.csproj | 60 ++++++++++++++++++++++--- Experimental/Properties/AssemblyInfo.cs | 4 +- Experimental/packages.config | 29 ++++++++++-- GUI/GARbro.GUI.csproj | 5 +-- GUI/Properties/AssemblyInfo.cs | 4 +- GUI/packages.config | 2 +- GameRes/GameRes.csproj | 5 +-- GameRes/Properties/AssemblyInfo.cs | 4 +- GameRes/packages.config | 2 +- Legacy/Legacy.csproj | 3 ++ Legacy/Properties/AssemblyInfo.cs | 4 +- Legacy/app.config | 15 +++++++ 17 files changed, 150 insertions(+), 42 deletions(-) create mode 100644 Legacy/app.config diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj index 95ff52b7..b7178cc6 100644 --- a/ArcFormats/ArcFormats.csproj +++ b/ArcFormats/ArcFormats.csproj @@ -49,25 +49,35 @@ MinimumRecommendedRules.ruleset - - ..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll - True + + ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll ..\packages\NAudio.1.7.3\lib\net35\NAudio.dll - - ..\packages\NVorbis.0.8.6\lib\net35\NVorbis.dll - True + + ..\packages\NVorbis.0.10.4\lib\net45\NVorbis.dll + + ..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll + + + ..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll + @@ -95,6 +105,8 @@ + + @@ -296,6 +308,7 @@ + diff --git a/ArcFormats/AudioOGG.cs b/ArcFormats/AudioOGG.cs index 390aef1b..866598c9 100644 --- a/ArcFormats/AudioOGG.cs +++ b/ArcFormats/AudioOGG.cs @@ -40,13 +40,13 @@ namespace GameRes.Formats { get { - return (long)(m_reader.DecodedTime.TotalSeconds * m_reader.SampleRate * m_reader.Channels * sizeof(float)); + return (long)(m_reader.TimePosition.TotalSeconds * m_reader.SampleRate * m_reader.Channels * sizeof(float)); } set { if (value < 0 || value > Length) throw new ArgumentOutOfRangeException("value"); - m_reader.DecodedTime = TimeSpan.FromSeconds((double)value / m_reader.SampleRate / m_reader.Channels / sizeof(float)); + m_reader.TimePosition = TimeSpan.FromSeconds((double)value / m_reader.SampleRate / m_reader.Channels / sizeof(float)); } } @@ -75,7 +75,7 @@ namespace GameRes.Formats public override void Reset () { - m_reader.DecodedTime = TimeSpan.FromSeconds (0); + m_reader.TimePosition = TimeSpan.FromSeconds (0); } // This buffer can be static because it can only be used by 1 instance per thread diff --git a/ArcFormats/Properties/AssemblyInfo.cs b/ArcFormats/Properties/AssemblyInfo.cs index df1ffa68..a685200d 100644 --- a/ArcFormats/Properties/AssemblyInfo.cs +++ b/ArcFormats/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.2.48.2153")] -[assembly: AssemblyFileVersion ("1.2.48.2153")] +[assembly: AssemblyVersion ("1.2.48.2176")] +[assembly: AssemblyFileVersion ("1.2.48.2176")] diff --git a/ArcFormats/app.config b/ArcFormats/app.config index 4ab43b0e..f2b7e940 100644 --- a/ArcFormats/app.config +++ b/ArcFormats/app.config @@ -220,6 +220,14 @@ + + + + + + + + diff --git a/ArcFormats/packages.config b/ArcFormats/packages.config index 5a94be48..c9e8b0fb 100644 --- a/ArcFormats/packages.config +++ b/ArcFormats/packages.config @@ -1,9 +1,13 @@  - - + + + - - + + + + + \ No newline at end of file diff --git a/Experimental/Experimental.csproj b/Experimental/Experimental.csproj index a828663d..3240aae5 100644 --- a/Experimental/Experimental.csproj +++ b/Experimental/Experimental.csproj @@ -11,7 +11,8 @@ ArcExtra v4.6 512 - d57ff7cf + + ..\ true @@ -51,8 +52,9 @@ ..\packages\Concentus.1.1.7\lib\portable-net45+win+wpa81+wp80\Concentus.dll - - ..\packages\Concentus.OggFile.1.0.3\lib\portable-net45+win+wpa81+wp80\Concentus.Oggfile.dll + + ..\packages\Concentus.Oggfile.1.0.4\lib\net45\Concentus.Oggfile.dll + True ..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.dll @@ -62,12 +64,36 @@ + + ..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll + + + ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll + - - ..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\lib\net46\System.Data.SQLite.dll + + + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll True + + ..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll + + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll + @@ -75,7 +101,13 @@ + + ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll + + + ..\packages\ZstdNet.1.4.5\lib\net45\ZstdNet.dll + @@ -88,6 +120,7 @@ + @@ -101,6 +134,7 @@ + PreserveNewest @@ -135,6 +169,16 @@ + + + PreserveNewest + + + + + PreserveNewest + + ipt @@ -156,10 +200,10 @@ exit 0 This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + - @@ -172,6 +216,8 @@ exit 0 + +