From a1a83285f8159b3875812daa2f6ba9fc5b29ac0b Mon Sep 17 00:00:00 2001 From: Chev <11602755+chev2@users.noreply.github.com> Date: Mon, 18 Jan 2021 23:33:46 -0800 Subject: [PATCH] Migrate from .NET Framework 4.8 to .NET 5 Also compress Resources/Icons image files, and remove unused entry in App.xaml --- botw-toolset/App.xaml => App.xaml | 4 - botw-toolset/App.xaml.cs => App.xaml.cs | 0 AssemblyInfo.cs | 12 ++ BOTWToolset.csproj | 30 +++ BOTWToolset.sln | 12 +- .../Control => Control}/TSCBAreaExpander.xaml | 0 .../TSCBAreaExpander.xaml.cs | 0 .../Control => Control}/TabRSTB.xaml | 0 .../Control => Control}/TabRSTB.xaml.cs | 0 .../Control => Control}/TabSARC.xaml | 0 .../Control => Control}/TabSARC.xaml.cs | 0 .../Control => Control}/TabTSCB.xaml | 0 .../Control => Control}/TabTSCB.xaml.cs | 0 .../Control => Control}/TabYaz0.xaml | 0 .../Control => Control}/TabYaz0.xaml.cs | 0 botw-toolset/Dashboard.xaml => Dashboard.xaml | 20 +- .../Dashboard.xaml.cs => Dashboard.xaml.cs | 0 .../Debugging => Debugging}/BOTWConsole.cs | 0 .../InvalidMagicException.cs | 0 {botw-toolset/IO => IO}/BinaryReaderBig.cs | 0 {botw-toolset/IO => IO}/BinaryWriterBig.cs | 0 {botw-toolset/IO => IO}/EXTM/Grass.cs | 0 {botw-toolset/IO => IO}/EXTM/Water.cs | 0 {botw-toolset/IO => IO}/GridColors.cs | 0 {botw-toolset/IO => IO}/HGHT.cs | 0 {botw-toolset/IO => IO}/MATE.cs | 0 {botw-toolset/IO => IO}/SARC/SARC.cs | 0 {botw-toolset/IO => IO}/SARC/SFAT.cs | 0 {botw-toolset/IO => IO}/SARC/SFATNode.cs | 0 {botw-toolset/IO => IO}/SARC/SFNT.cs | 0 {botw-toolset/IO => IO}/TSCB/AreaInfo.cs | 0 {botw-toolset/IO => IO}/TSCB/GridConverter.cs | 0 {botw-toolset/IO => IO}/TSCB/MaterialInfo.cs | 0 {botw-toolset/IO => IO}/TSCB/TSCB.cs | 0 {botw-toolset/IO => IO}/Yaz0/Yaz0.cs | 0 botw-toolset/MathExt.cs => MathExt.cs | 0 Resources/Icons/document.png | Bin 0 -> 782 bytes Resources/Icons/letter-z.png | Bin 0 -> 2112 bytes Resources/Icons/mountain.png | Bin 0 -> 2477 bytes Resources/Icons/package.png | Bin 0 -> 2350 bytes Resources/Icons/speaker.png | Bin 0 -> 3855 bytes Resources/Icons/text-file-2.png | Bin 0 -> 1781 bytes Resources/Icons/text-file.png | Bin 0 -> 1241 bytes Resources/Icons/triforce.png | Bin 0 -> 4997 bytes botw-toolset/appicon.ico => appicon.ico | Bin botw-toolset/App.config | 6 - botw-toolset/BOTWToolset.csproj | 197 ------------------ botw-toolset/Properties/AssemblyInfo.cs | 53 ----- botw-toolset/Properties/Resources.Designer.cs | 63 ------ botw-toolset/Properties/Resources.resx | 117 ----------- botw-toolset/Properties/Settings.Designer.cs | 26 --- botw-toolset/Properties/Settings.settings | 7 - botw-toolset/Resources/Icons/document.png | Bin 1428 -> 0 bytes botw-toolset/Resources/Icons/letter-z.png | Bin 3222 -> 0 bytes botw-toolset/Resources/Icons/mountain.png | Bin 5091 -> 0 bytes botw-toolset/Resources/Icons/package.png | Bin 5047 -> 0 bytes botw-toolset/Resources/Icons/speaker.png | Bin 6858 -> 0 bytes botw-toolset/Resources/Icons/text-file-2.png | Bin 2703 -> 0 bytes botw-toolset/Resources/Icons/text-file.png | Bin 1923 -> 0 bytes botw-toolset/Resources/Icons/triforce.png | Bin 11304 -> 0 bytes botw-toolset/packages.config | 5 - 61 files changed, 58 insertions(+), 494 deletions(-) rename botw-toolset/App.xaml => App.xaml (98%) rename botw-toolset/App.xaml.cs => App.xaml.cs (100%) create mode 100644 AssemblyInfo.cs create mode 100644 BOTWToolset.csproj rename {botw-toolset/Control => Control}/TSCBAreaExpander.xaml (100%) rename {botw-toolset/Control => Control}/TSCBAreaExpander.xaml.cs (100%) rename {botw-toolset/Control => Control}/TabRSTB.xaml (100%) rename {botw-toolset/Control => Control}/TabRSTB.xaml.cs (100%) rename {botw-toolset/Control => Control}/TabSARC.xaml (100%) rename {botw-toolset/Control => Control}/TabSARC.xaml.cs (100%) rename {botw-toolset/Control => Control}/TabTSCB.xaml (100%) rename {botw-toolset/Control => Control}/TabTSCB.xaml.cs (100%) rename {botw-toolset/Control => Control}/TabYaz0.xaml (100%) rename {botw-toolset/Control => Control}/TabYaz0.xaml.cs (100%) rename botw-toolset/Dashboard.xaml => Dashboard.xaml (83%) rename botw-toolset/Dashboard.xaml.cs => Dashboard.xaml.cs (100%) rename {botw-toolset/Debugging => Debugging}/BOTWConsole.cs (100%) rename {botw-toolset/Exceptions => Exceptions}/InvalidMagicException.cs (100%) rename {botw-toolset/IO => IO}/BinaryReaderBig.cs (100%) rename {botw-toolset/IO => IO}/BinaryWriterBig.cs (100%) rename {botw-toolset/IO => IO}/EXTM/Grass.cs (100%) rename {botw-toolset/IO => IO}/EXTM/Water.cs (100%) rename {botw-toolset/IO => IO}/GridColors.cs (100%) rename {botw-toolset/IO => IO}/HGHT.cs (100%) rename {botw-toolset/IO => IO}/MATE.cs (100%) rename {botw-toolset/IO => IO}/SARC/SARC.cs (100%) rename {botw-toolset/IO => IO}/SARC/SFAT.cs (100%) rename {botw-toolset/IO => IO}/SARC/SFATNode.cs (100%) rename {botw-toolset/IO => IO}/SARC/SFNT.cs (100%) rename {botw-toolset/IO => IO}/TSCB/AreaInfo.cs (100%) rename {botw-toolset/IO => IO}/TSCB/GridConverter.cs (100%) rename {botw-toolset/IO => IO}/TSCB/MaterialInfo.cs (100%) rename {botw-toolset/IO => IO}/TSCB/TSCB.cs (100%) rename {botw-toolset/IO => IO}/Yaz0/Yaz0.cs (100%) rename botw-toolset/MathExt.cs => MathExt.cs (100%) create mode 100644 Resources/Icons/document.png create mode 100644 Resources/Icons/letter-z.png create mode 100644 Resources/Icons/mountain.png create mode 100644 Resources/Icons/package.png create mode 100644 Resources/Icons/speaker.png create mode 100644 Resources/Icons/text-file-2.png create mode 100644 Resources/Icons/text-file.png create mode 100644 Resources/Icons/triforce.png rename botw-toolset/appicon.ico => appicon.ico (100%) delete mode 100644 botw-toolset/App.config delete mode 100644 botw-toolset/BOTWToolset.csproj delete mode 100644 botw-toolset/Properties/AssemblyInfo.cs delete mode 100644 botw-toolset/Properties/Resources.Designer.cs delete mode 100644 botw-toolset/Properties/Resources.resx delete mode 100644 botw-toolset/Properties/Settings.Designer.cs delete mode 100644 botw-toolset/Properties/Settings.settings delete mode 100644 botw-toolset/Resources/Icons/document.png delete mode 100644 botw-toolset/Resources/Icons/letter-z.png delete mode 100644 botw-toolset/Resources/Icons/mountain.png delete mode 100644 botw-toolset/Resources/Icons/package.png delete mode 100644 botw-toolset/Resources/Icons/speaker.png delete mode 100644 botw-toolset/Resources/Icons/text-file-2.png delete mode 100644 botw-toolset/Resources/Icons/text-file.png delete mode 100644 botw-toolset/Resources/Icons/triforce.png delete mode 100644 botw-toolset/packages.config diff --git a/botw-toolset/App.xaml b/App.xaml similarity index 98% rename from botw-toolset/App.xaml rename to App.xaml index 954784f..5a8b770 100644 --- a/botw-toolset/App.xaml +++ b/App.xaml @@ -4,10 +4,6 @@ xmlns:local="clr-namespace:BOTWToolset" StartupUri="Dashboard.xaml"> - - diff --git a/botw-toolset/App.xaml.cs b/App.xaml.cs similarity index 100% rename from botw-toolset/App.xaml.cs rename to App.xaml.cs diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs new file mode 100644 index 0000000..6661fa0 --- /dev/null +++ b/AssemblyInfo.cs @@ -0,0 +1,12 @@ +using System.Reflection; +using System.Runtime.InteropServices; +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/BOTWToolset.csproj b/BOTWToolset.csproj new file mode 100644 index 0000000..22b9d85 --- /dev/null +++ b/BOTWToolset.csproj @@ -0,0 +1,30 @@ + + + + WinExe + net5.0-windows + true + appicon.ico + 1.0.0.0 + 1.0.0.0 + Chev + + + + + + + + + + + + + + + + + + + + diff --git a/BOTWToolset.sln b/BOTWToolset.sln index c97e485..bc5d907 100644 --- a/BOTWToolset.sln +++ b/BOTWToolset.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30804.86 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BOTWToolset", "botw-toolset\BOTWToolset.csproj", "{9FE4680A-CD27-4835-844D-50543BEFF2D9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BOTWToolset", "BOTWToolset.csproj", "{99C01800-580D-4A02-88A7-CE3B8DCB9A16}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9FE4680A-CD27-4835-844D-50543BEFF2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FE4680A-CD27-4835-844D-50543BEFF2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FE4680A-CD27-4835-844D-50543BEFF2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FE4680A-CD27-4835-844D-50543BEFF2D9}.Release|Any CPU.Build.0 = Release|Any CPU + {99C01800-580D-4A02-88A7-CE3B8DCB9A16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99C01800-580D-4A02-88A7-CE3B8DCB9A16}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99C01800-580D-4A02-88A7-CE3B8DCB9A16}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99C01800-580D-4A02-88A7-CE3B8DCB9A16}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6F11E363-7B2E-44BA-94A6-ABEF9C9C1837} + SolutionGuid = {2342C2FA-D8B4-4711-9BF6-4A7B673363F8} EndGlobalSection EndGlobal diff --git a/botw-toolset/Control/TSCBAreaExpander.xaml b/Control/TSCBAreaExpander.xaml similarity index 100% rename from botw-toolset/Control/TSCBAreaExpander.xaml rename to Control/TSCBAreaExpander.xaml diff --git a/botw-toolset/Control/TSCBAreaExpander.xaml.cs b/Control/TSCBAreaExpander.xaml.cs similarity index 100% rename from botw-toolset/Control/TSCBAreaExpander.xaml.cs rename to Control/TSCBAreaExpander.xaml.cs diff --git a/botw-toolset/Control/TabRSTB.xaml b/Control/TabRSTB.xaml similarity index 100% rename from botw-toolset/Control/TabRSTB.xaml rename to Control/TabRSTB.xaml diff --git a/botw-toolset/Control/TabRSTB.xaml.cs b/Control/TabRSTB.xaml.cs similarity index 100% rename from botw-toolset/Control/TabRSTB.xaml.cs rename to Control/TabRSTB.xaml.cs diff --git a/botw-toolset/Control/TabSARC.xaml b/Control/TabSARC.xaml similarity index 100% rename from botw-toolset/Control/TabSARC.xaml rename to Control/TabSARC.xaml diff --git a/botw-toolset/Control/TabSARC.xaml.cs b/Control/TabSARC.xaml.cs similarity index 100% rename from botw-toolset/Control/TabSARC.xaml.cs rename to Control/TabSARC.xaml.cs diff --git a/botw-toolset/Control/TabTSCB.xaml b/Control/TabTSCB.xaml similarity index 100% rename from botw-toolset/Control/TabTSCB.xaml rename to Control/TabTSCB.xaml diff --git a/botw-toolset/Control/TabTSCB.xaml.cs b/Control/TabTSCB.xaml.cs similarity index 100% rename from botw-toolset/Control/TabTSCB.xaml.cs rename to Control/TabTSCB.xaml.cs diff --git a/botw-toolset/Control/TabYaz0.xaml b/Control/TabYaz0.xaml similarity index 100% rename from botw-toolset/Control/TabYaz0.xaml rename to Control/TabYaz0.xaml diff --git a/botw-toolset/Control/TabYaz0.xaml.cs b/Control/TabYaz0.xaml.cs similarity index 100% rename from botw-toolset/Control/TabYaz0.xaml.cs rename to Control/TabYaz0.xaml.cs diff --git a/botw-toolset/Dashboard.xaml b/Dashboard.xaml similarity index 83% rename from botw-toolset/Dashboard.xaml rename to Dashboard.xaml index 1805fdd..36d1040 100644 --- a/botw-toolset/Dashboard.xaml +++ b/Dashboard.xaml @@ -5,38 +5,38 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:BOTWToolset.Control" mc:Ignorable="d" - Title="Breath of the Wild Toolset" Height="720" Width="1280" Icon="Resources/Icons/triforce.png" MinWidth="645" MinHeight="645"> + Title="Breath of the Wild Toolset" Height="720" Width="1280" MinWidth="645" MinHeight="645" Icon="/Resources/Icons/triforce.png"> - +