diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj index aad1db4d..e4c9efd2 100644 --- a/ArcFormats/ArcFormats.csproj +++ b/ArcFormats/ArcFormats.csproj @@ -51,14 +51,11 @@ MinimumRecommendedRules.ruleset - - ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll - ..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll - - ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll ..\packages\NAudio.2.2.1\lib\net472\NAudio.dll @@ -89,8 +86,8 @@ - - ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll + + ..\packages\Snappier.1.3.0\lib\net472\Snappier.dll @@ -112,18 +109,16 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll + + ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll - - ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll + @@ -1402,5 +1397,7 @@ xcopy "$(ProjectDir)\Resources\*" "$(TargetDir)\GameData\" /D /Y >NULThis project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + \ No newline at end of file diff --git a/ArcFormats/YuRis/ArcYPF.cs b/ArcFormats/YuRis/ArcYPF.cs index bc864628..c9c12131 100644 --- a/ArcFormats/YuRis/ArcYPF.cs +++ b/ArcFormats/YuRis/ArcYPF.cs @@ -31,7 +31,6 @@ using System.ComponentModel.Composition; using GameRes.Compression; using GameRes.Formats.Strings; using GameRes.Utility; -using Snappy; namespace GameRes.Formats.YuRis { @@ -185,7 +184,7 @@ namespace GameRes.Formats.YuRis { var compress_data = new byte[entry.Size]; input.Read(compress_data, 0, compress_data.Length); - var decomprrss_data = SnappyCodec.Uncompress(compress_data); + var decomprrss_data = Snappier.Snappy.DecompressToArray (compress_data); input = new BinMemoryStream(decomprrss_data, entry.Name); break; } diff --git a/ArcFormats/app.config b/ArcFormats/app.config index b9794f44..5f0b48d7 100644 --- a/ArcFormats/app.config +++ b/ArcFormats/app.config @@ -228,6 +228,14 @@ + + + + + + + + diff --git a/ArcFormats/packages.config b/ArcFormats/packages.config index 42b37320..ee8141ba 100644 --- a/ArcFormats/packages.config +++ b/ArcFormats/packages.config @@ -1,7 +1,6 @@  - - + @@ -12,14 +11,14 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Experimental/Experimental.csproj b/Experimental/Experimental.csproj index 241b6df6..58198269 100644 --- a/Experimental/Experimental.csproj +++ b/Experimental/Experimental.csproj @@ -49,8 +49,8 @@ MinimumRecommendedRules.ruleset - - ..\packages\Concentus.2.2.1\lib\net452\Concentus.dll + + ..\packages\Concentus.2.2.2\lib\net452\Concentus.dll ..\packages\Concentus.Oggfile.1.0.6\lib\net452\Concentus.Oggfile.dll diff --git a/Experimental/app.config b/Experimental/app.config index 40322e94..eb980cb2 100644 --- a/Experimental/app.config +++ b/Experimental/app.config @@ -18,6 +18,14 @@ + + + + + + + + diff --git a/Experimental/packages.config b/Experimental/packages.config index 2e2dd0a8..93a83b6c 100644 --- a/Experimental/packages.config +++ b/Experimental/packages.config @@ -1,6 +1,6 @@  - + diff --git a/GUI/App.config b/GUI/App.config index 5e013a13..9a6e720d 100644 --- a/GUI/App.config +++ b/GUI/App.config @@ -1,4 +1,4 @@ - + @@ -98,6 +98,10 @@ + + + + diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj index daa458c6..c081bda2 100644 --- a/GUI/GARbro.GUI.csproj +++ b/GUI/GARbro.GUI.csproj @@ -89,8 +89,8 @@ - - ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll ..\packages\WindowsAPICodePack.8.0.14\lib\net472\Microsoft.WindowsAPICodePack.dll @@ -133,11 +133,11 @@ - - ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll + + ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll - - ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll ..\packages\WPFToolkits.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll diff --git a/GUI/packages.config b/GUI/packages.config index adc528e4..3e3cc0f5 100644 --- a/GUI/packages.config +++ b/GUI/packages.config @@ -1,6 +1,6 @@  - + @@ -8,8 +8,8 @@ - - + + \ No newline at end of file diff --git a/GameRes/GameRes.csproj b/GameRes/GameRes.csproj index 9809e9d6..1a544742 100644 --- a/GameRes/GameRes.csproj +++ b/GameRes/GameRes.csproj @@ -46,8 +46,8 @@ MinimumRecommendedRules.ruleset - - ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll ..\packages\NAudio.2.2.1\lib\net472\NAudio.dll @@ -78,11 +78,11 @@ - - ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll + + ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll - - ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll diff --git a/GameRes/app.config b/GameRes/app.config index 6286d485..c064e08f 100644 --- a/GameRes/app.config +++ b/GameRes/app.config @@ -1,4 +1,4 @@ - + @@ -18,4 +18,13 @@ - + + + + + + + + + + diff --git a/GameRes/packages.config b/GameRes/packages.config index 8ff8b4ed..a5d7ca18 100644 --- a/GameRes/packages.config +++ b/GameRes/packages.config @@ -1,6 +1,6 @@  - + @@ -9,6 +9,6 @@ - - + + \ No newline at end of file diff --git a/Legacy/Legacy.csproj b/Legacy/Legacy.csproj index 0f25d8c8..6606f24b 100644 --- a/Legacy/Legacy.csproj +++ b/Legacy/Legacy.csproj @@ -49,24 +49,24 @@ - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll diff --git a/Legacy/app.config b/Legacy/app.config index 5a5c7f7b..e86a8c53 100644 --- a/Legacy/app.config +++ b/Legacy/app.config @@ -4,11 +4,15 @@ - + - + + + + + diff --git a/Legacy/packages.config b/Legacy/packages.config index edc20be8..7e3839a4 100644 --- a/Legacy/packages.config +++ b/Legacy/packages.config @@ -1,9 +1,9 @@  - - - - - + + + + + \ No newline at end of file