diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj index b5a4f579..d4c9f0e0 100644 --- a/ArcFormats/ArcFormats.csproj +++ b/ArcFormats/ArcFormats.csproj @@ -9,7 +9,7 @@ Properties GameRes.Formats ArcFormats - v4.6.1 + v4.7.2 512 ..\ @@ -51,61 +51,16 @@ MinimumRecommendedRules.ruleset - - ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll - - - ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll - - - ..\packages\NAudio.1.7.3\lib\net35\NAudio.dll - - - ..\packages\NVorbis.0.10.4\lib\net45\NVorbis.dll - - - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.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\net461\System.Memory.dll - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\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\net461\System.ValueTuple.dll - @@ -113,9 +68,6 @@ - - ..\packages\ZstdNet.1.4.5\lib\net45\ZstdNet.dll - @@ -941,7 +893,6 @@ - Code @@ -1378,18 +1329,4 @@ exit 0 if not exist "$(TargetDir)\GameData" mkdir "$(TargetDir)\GameData" xcopy "$(ProjectDir)\Resources\*" "$(TargetDir)\GameData\" /D /Y >NUL - - - - 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}. - - - - \ No newline at end of file diff --git a/ArcFormats/Properties/Settings.Designer.cs b/ArcFormats/Properties/Settings.Designer.cs index 2c870f61..092b151f 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", "17.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -585,20 +585,7 @@ namespace GameRes.Formats.Properties { this["BELLTitle"] = value; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string BELLDATATitle - { - get { - return ((string)(this["BELLDATATitle"])); - } - set { - this["BELLDATATitle"] = value; - } - } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] diff --git a/ArcFormats/Strings/arcStrings.Designer.cs b/ArcFormats/Strings/arcStrings.Designer.cs index accb3959..1a032887 100644 --- a/ArcFormats/Strings/arcStrings.Designer.cs +++ b/ArcFormats/Strings/arcStrings.Designer.cs @@ -754,14 +754,14 @@ namespace GameRes.Formats.Strings { /// /// Looks up a localized string similar to Choose Tim2 image alpha format. - /// It can't be read correctly from the file. + ///It can't be read correctly from the file.. /// public static string Tim2AlphaFormat { get { return ResourceManager.GetString("Tim2AlphaFormat", resourceCulture); } } - + /// /// Looks up a localized string similar to Hex number. /// diff --git a/ArcFormats/app.config b/ArcFormats/app.config index ef1cc161..a24fb93f 100644 --- a/ArcFormats/app.config +++ b/ArcFormats/app.config @@ -1,17 +1,17 @@ - + -
+
- + - + 4294967295 @@ -35,7 +35,7 @@ None - + False @@ -62,22 +62,22 @@ 8 - + - + - + Default - + - + 65432 @@ -86,37 +86,37 @@ 1139247708 - + - + - + 0 - + - + - + - + - + - + - + Optimal @@ -125,49 +125,49 @@ 932 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + True @@ -179,7 +179,7 @@ True - + False @@ -194,10 +194,10 @@ 932 - + - + 932 @@ -213,33 +213,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ArcFormats/packages.config b/ArcFormats/packages.config deleted file mode 100644 index 74a50b67..00000000 --- a/ArcFormats/packages.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Console/App.config b/Console/App.config index 45437954..de277144 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 1e0788c2..c19a1fa7 100644 --- a/Console/GARbro.Console.csproj +++ b/Console/GARbro.Console.csproj @@ -9,7 +9,7 @@ Properties GARbro GARbro.Console - v4.6.1 + v4.7.2 512 publish\ true diff --git a/Experimental/Experimental.csproj b/Experimental/Experimental.csproj index b6643c32..93f89df6 100644 --- a/Experimental/Experimental.csproj +++ b/Experimental/Experimental.csproj @@ -9,7 +9,7 @@ Properties GameRes.Extra ArcExtra - v4.6.1 + v4.7.2 512 @@ -49,88 +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 - - - ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - - - ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll - - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\lib\net46\System.Data.SQLite.dll - - - ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - - - ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.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\net461\System.Memory.dll - - - ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - - - ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.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 - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll - @@ -138,13 +66,7 @@ - - ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll - - - ..\packages\ZstdNet.1.4.5\lib\net45\ZstdNet.dll - @@ -175,13 +97,6 @@ - - - PreserveNewest - - - PreserveNewest - @@ -209,16 +124,6 @@ - - - PreserveNewest - - - - - PreserveNewest - - ipt @@ -235,15 +140,6 @@ exit 0 $(ProjectDir)Artemis\IPT - - - 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}. - - - - - - @@ -256,21 +152,4 @@ 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}. - - - - - - - \ No newline at end of file diff --git a/Experimental/app.config b/Experimental/app.config index 741af0df..3476ffe1 100644 --- a/Experimental/app.config +++ b/Experimental/app.config @@ -1,15 +1,7 @@ - + - - - - - - - - - \ No newline at end of file + diff --git a/Experimental/packages.config b/Experimental/packages.config deleted file mode 100644 index a6bfb595..00000000 --- a/Experimental/packages.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GUI/App.config b/GUI/App.config index c702f329..5e013a13 100644 --- a/GUI/App.config +++ b/GUI/App.config @@ -6,7 +6,7 @@ - + @@ -98,10 +98,6 @@ - - - - diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj index 8291753f..c1f90b3c 100644 --- a/GUI/GARbro.GUI.csproj +++ b/GUI/GARbro.GUI.csproj @@ -9,7 +9,7 @@ Properties GARbro.GUI GARbro.GUI - v4.6.1 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -89,38 +89,18 @@ - - ..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll - - - ..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll - - - ..\packages\NAudio.1.10.0\lib\net35\NAudio.dll - - - ..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll - - - ..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Layout.Toolkit.dll - - - 4.0 - + - - ..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll - @@ -277,7 +257,6 @@ - SettingsSingleFileGenerator @@ -309,23 +288,6 @@ False - - - False - Microsoft .NET Framework 4.5 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - @@ -347,11 +309,4 @@ exit 0 - \ No newline at end of file diff --git a/GUI/Properties/Settings.Designer.cs b/GUI/Properties/Settings.Designer.cs index ec0b8a0c..bfc80ad0 100644 --- a/GUI/Properties/Settings.Designer.cs +++ b/GUI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace GARbro.GUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/GUI/Strings/guiStrings.Designer.cs b/GUI/Strings/guiStrings.Designer.cs index 9ffc54d4..62afcc87 100644 --- a/GUI/Strings/guiStrings.Designer.cs +++ b/GUI/Strings/guiStrings.Designer.cs @@ -790,7 +790,7 @@ namespace GARbro.GUI.Strings { } /// - /// Looks up a localized string similar to Image {0} x {1} x {2}bpp. + /// Looks up a localized string similar to Image {0} x {1} x {2}bpp [{3}]. /// public static string MsgImageSize { get { diff --git a/GUI/packages.config b/GUI/packages.config deleted file mode 100644 index e54fbbaf..00000000 --- a/GUI/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/GameRes/GameRes.csproj b/GameRes/GameRes.csproj index 90d24440..0e95d8ef 100644 --- a/GameRes/GameRes.csproj +++ b/GameRes/GameRes.csproj @@ -9,7 +9,7 @@ Properties GameRes GameRes - v4.6.1 + v4.7.2 512 ..\ @@ -46,12 +46,6 @@ MinimumRecommendedRules.ruleset - - ..\packages\NAudio.1.10.0\lib\net35\NAudio.dll - - - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - @@ -120,7 +114,6 @@ - PublicSettingsSingleFileGenerator Settings.Designer.cs @@ -131,11 +124,4 @@ perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) exit 0 - \ No newline at end of file diff --git a/GameRes/Properties/Settings.Designer.cs b/GameRes/Properties/Settings.Designer.cs index 03225883..46fe0780 100644 --- a/GameRes/Properties/Settings.Designer.cs +++ b/GameRes/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace GameRes.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.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/GameRes/app.config b/GameRes/app.config index 7c7361cd..6286d485 100644 --- a/GameRes/app.config +++ b/GameRes/app.config @@ -18,4 +18,4 @@ - + diff --git a/GameRes/packages.config b/GameRes/packages.config deleted file mode 100644 index 07609041..00000000 --- a/GameRes/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Image.Convert/App.config b/Image.Convert/App.config index 45437954..de277144 100644 --- a/Image.Convert/App.config +++ b/Image.Convert/App.config @@ -1,6 +1,6 @@ - + diff --git a/Image.Convert/Image.Convert.csproj b/Image.Convert/Image.Convert.csproj index 644fc445..92417e3d 100644 --- a/Image.Convert/Image.Convert.csproj +++ b/Image.Convert/Image.Convert.csproj @@ -9,7 +9,7 @@ Properties Image.Convert Image.Convert - v4.6.1 + v4.7.2 512 @@ -69,11 +69,4 @@ - \ No newline at end of file diff --git a/Legacy/Legacy.csproj b/Legacy/Legacy.csproj index ffa5f99e..9fab04be 100644 --- a/Legacy/Legacy.csproj +++ b/Legacy/Legacy.csproj @@ -9,7 +9,7 @@ Properties GameRes.Legacy ArcLegacy - v4.6.1 + v4.7.2 512 @@ -44,9 +44,6 @@ true - - ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll - @@ -310,7 +307,6 @@ - @@ -361,11 +357,4 @@ perl "$(SolutionDir)inc-revision.pl" "$(ProjectPath)" $(ConfigurationName) exit 0 - \ No newline at end of file diff --git a/Legacy/app.config b/Legacy/app.config index 741af0df..3476ffe1 100644 --- a/Legacy/app.config +++ b/Legacy/app.config @@ -1,15 +1,7 @@ - + - - - - - - - - - \ No newline at end of file + diff --git a/Legacy/packages.config b/Legacy/packages.config deleted file mode 100644 index 8803282e..00000000 --- a/Legacy/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/SchemeTool/App.config b/SchemeTool/App.config index 18d3b8dd..69f4c9bb 100644 --- a/SchemeTool/App.config +++ b/SchemeTool/App.config @@ -1,22 +1,10 @@ - + - + - - - - - - - - - - - - - \ No newline at end of file + diff --git a/SchemeTool/SchemeTool.csproj b/SchemeTool/SchemeTool.csproj index 11b6fa29..35581087 100644 --- a/SchemeTool/SchemeTool.csproj +++ b/SchemeTool/SchemeTool.csproj @@ -8,10 +8,11 @@ Exe SchemeTool SchemeTool - v4.6.1 + v4.7.2 512 true true + AnyCPU @@ -34,20 +35,8 @@ - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - @@ -61,7 +50,6 @@ - diff --git a/SchemeTool/packages.config b/SchemeTool/packages.config deleted file mode 100644 index 5324bbbe..00000000 --- a/SchemeTool/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file