diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj index ebf94c3e..94d6e08c 100644 --- a/ArcFormats/ArcFormats.csproj +++ b/ArcFormats/ArcFormats.csproj @@ -9,7 +9,7 @@ Properties GameRes.Formats ArcFormats - v4.6 + v4.6.1 512 ..\ @@ -49,40 +49,49 @@ MinimumRecommendedRules.ruleset - - ..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll ..\packages\NAudio.1.7.3\lib\net35\NAudio.dll - - ..\packages\NVorbis.0.10.1\lib\net45\NVorbis.dll + + ..\packages\NVorbis.0.10.4\lib\net45\NVorbis.dll - ..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + + + ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + - ..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net46\System.Security.Cryptography.Algorithms.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll @@ -789,6 +798,7 @@ + @@ -806,7 +816,6 @@ - diff --git a/ArcFormats/Properties/Settings.Designer.cs b/ArcFormats/Properties/Settings.Designer.cs index c3674968..e45f2062 100644 --- a/ArcFormats/Properties/Settings.Designer.cs +++ b/ArcFormats/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace GameRes.Formats.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/ArcFormats/Strings/arcStrings.Designer.cs b/ArcFormats/Strings/arcStrings.Designer.cs index be107284..c42b4340 100644 --- a/ArcFormats/Strings/arcStrings.Designer.cs +++ b/ArcFormats/Strings/arcStrings.Designer.cs @@ -19,7 +19,7 @@ namespace GameRes.Formats.Strings { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class arcStrings { diff --git a/ArcFormats/app.config b/ArcFormats/app.config index 04d8e6c9..1b59f64c 100644 --- a/ArcFormats/app.config +++ b/ArcFormats/app.config @@ -201,7 +201,7 @@ - + @@ -226,7 +226,7 @@ - + diff --git a/ArcFormats/packages.config b/ArcFormats/packages.config index bd176038..d5d65c41 100644 --- a/ArcFormats/packages.config +++ b/ArcFormats/packages.config @@ -1,13 +1,14 @@  - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/Console/App.config b/Console/App.config index deaa9e27..45437954 100644 --- a/Console/App.config +++ b/Console/App.config @@ -1,6 +1,6 @@ - + diff --git a/Console/GARbro.Console.csproj b/Console/GARbro.Console.csproj index d645b9c8..e493e538 100644 --- a/Console/GARbro.Console.csproj +++ b/Console/GARbro.Console.csproj @@ -9,7 +9,7 @@ Properties GARbro GARbro.Console - v4.6 + v4.6.1 512 publish\ true diff --git a/Experimental/Experimental.csproj b/Experimental/Experimental.csproj index 82b6461f..297177f6 100644 --- a/Experimental/Experimental.csproj +++ b/Experimental/Experimental.csproj @@ -9,7 +9,7 @@ Properties GameRes.Extra ArcExtra - v4.6 + v4.6.1 512 @@ -49,16 +49,16 @@ MinimumRecommendedRules.ruleset - + ..\packages\Concentus.1.1.7\lib\portable-net45+win+wpa81+wp80\Concentus.dll ..\packages\Concentus.Oggfile.1.0.4\lib\net45\Concentus.Oggfile.dll - + ..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.dll - + ..\packages\MSFTCompressionCab.1.0.0\lib\Microsoft.Deployment.Compression.Cab.dll @@ -74,8 +74,8 @@ ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\lib\net46\System.Data.SQLite.dll @@ -105,8 +105,8 @@ ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net46\System.Security.Cryptography.Algorithms.dll + + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll @@ -114,8 +114,8 @@ ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -216,13 +216,15 @@ exit 0 - + This 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}. - + + +