From b936b090267581d1ded87efd6c8b7e6c2a8738b2 Mon Sep 17 00:00:00 2001 From: "waffle.lord" Date: Sat, 25 Dec 2021 20:24:00 -0500 Subject: [PATCH] finished port, replace old project files --- .gitattributes | 1 + .../Patcher => }/PatchClient/.gitignore | 0 .../{_port/Patcher => }/PatchClient/App.axaml | 0 .../Patcher => }/PatchClient/App.axaml.cs | 0 Patcher/PatchClient/App.xaml | 156 -------- Patcher/PatchClient/App.xaml.cs | 17 - Patcher/PatchClient/AssemblyInfo.cs | 10 - .../PatchClient/Assets/Styles.axaml | 0 .../PatchClient/Assets/avalonia-logo.ico | Bin .../PatchClient/CustomControls/TitleBar.axaml | 3 +- .../CustomControls/TitleBar.axaml.cs | 0 .../Extensions/ControlExtensions.cs | 49 --- Patcher/PatchClient/MainWindow.xaml | 63 --- Patcher/PatchClient/MainWindow.xaml.cs | 90 ----- .../PatchClient/Models/LineItemProgress.cs | 0 .../PatchClient/Models/ViewNavigator.cs | 0 Patcher/PatchClient/PatchClient.csproj | 24 +- .../Patcher => }/PatchClient/Program.cs | 0 .../Properties/launchSettings.json | 3 +- .../Patcher => }/PatchClient/ViewLocator.cs | 0 .../ViewModels/MainWindowViewModel.cs | 0 .../ViewModels/MessageViewModel.cs | 0 .../ViewModels/PatcherViewModel.cs | 4 + .../PatchClient/ViewModels/ViewModelBase.cs | 0 .../PatchClient/Views/MainWindow.axaml | 0 .../PatchClient/Views/MainWindow.axaml.cs | 0 .../PatchClient/Views/MessageView.axaml | 0 .../PatchClient/Views/MessageView.axaml.cs | 0 .../PatchClient/Views/PatcherView.axaml | 0 .../PatchClient/Views/PatcherView.axaml.cs | 0 .../Patcher => }/PatchGenerator/.gitignore | 0 .../Patcher => }/PatchGenerator/App.axaml | 3 +- .../Patcher => }/PatchGenerator/App.axaml.cs | 19 +- Patcher/PatchGenerator/App.xaml | 10 - Patcher/PatchGenerator/App.xaml.cs | 40 -- Patcher/PatchGenerator/AssemblyInfo.cs | 10 - .../PatchGenerator/Assets/Styles.axaml | 9 +- .../PatchGenerator/Assets/avalonia-logo.ico | Bin .../AttachedProperties/RandomBoolAttProp.cs | 0 .../CustomControls/FolderSelector.axaml | 0 .../CustomControls/FolderSelector.axaml.cs | 0 .../CustomControls/TitleBar.axaml | 3 +- .../CustomControls/TitleBar.axaml.cs | 0 .../Extensions/ControlExtensions.cs | 48 --- Patcher/PatchGenerator/GenStartupArgs.cs | 67 ---- .../Helpers/PatchItemDefinitions.cs | 0 Patcher/PatchGenerator/MainWindow.xaml | 94 ----- Patcher/PatchGenerator/MainWindow.xaml.cs | 253 ------------ .../PatchGenerator/Models/GenStartupArgs.cs | 0 .../PatchGenerator/Models/PatchGenInfo.cs | 0 .../PatchGenerator/Models/PatchItem.cs | 0 .../PatchGenerator/Models/ViewNavigator.cs | 0 .../PatchGenerator - Backup.csproj | 0 Patcher/PatchGenerator/PatchGenerator.csproj | 23 +- .../Patcher => }/PatchGenerator/Program.cs | 0 .../Properties/launchSettings.json | 9 + .../References/Aki.ByteBanger.dll | Bin 10240 -> 0 bytes .../ComponentAce.Compression.Libs.zlib.dll | Bin 55296 -> 0 bytes .../PatchGenerator/ViewLocator.cs | 0 .../ViewModels/MainWindowViewModel.cs | 19 +- .../ViewModels/OptionsViewModel.cs | 8 +- .../ViewModels/PatchGenerationViewModel.cs | 39 +- .../ViewModels/ViewModelBase.cs | 0 .../PatchGenerator/Views/MainWindow.axaml | 0 .../PatchGenerator/Views/MainWindow.axaml.cs | 0 .../PatchGenerator/Views/OptionsView.axaml | 0 .../PatchGenerator/Views/OptionsView.axaml.cs | 0 .../Views/PatchGenerationView.axaml | 0 .../Views/PatchGenerationView.axaml.cs | 0 Patcher/Patcher.sln | 34 +- Patcher/PatcherUtils/LazyOperations.cs | 9 +- Patcher/PatcherUtils/LineItem.cs | 5 +- Patcher/PatcherUtils/PatchHelper.cs | 150 ++++++-- Patcher/PatcherUtils/PatcherUtils.csproj | 4 +- .../PatcherUtils/Resources/PatchClient.exe | Bin 18126459 -> 133 bytes .../Patcher/PatchClient/PatchClient.csproj | 35 -- .../Properties/launchSettings.json | 7 - .../Patcher/PatchClient/Resources/xdelta3.exe | Bin 624463 -> 0 bytes .../PatchGenerator/PatchGenerator.csproj | 45 --- .../PatchGenerator/References/Aki.Common.dll | Bin 20480 -> 0 bytes .../Patcher/PatchGenerator/Resources/7za.exe | Bin 739840 -> 0 bytes .../PatchGenerator/Resources/PatchClient.exe | 3 - .../PatchGenerator/Resources/xdelta3.exe | Bin 624463 -> 0 bytes Patcher/_port/Patcher/Patcher.sln | 37 -- .../Patcher/PatcherUtils/LazyOperations.cs | 116 ------ .../_port/Patcher/PatcherUtils/LineItem.cs | 14 - .../_port/Patcher/PatcherUtils/PatchHelper.cs | 360 ------------------ .../Patcher/PatcherUtils/PatcherUtils.csproj | 25 -- .../PatcherUtils/ProgressChangedHandler.cs | 13 - .../Patcher/PatcherUtils/RandomExtensions.cs | 13 - .../Patcher/PatcherUtils/Resources/7za.exe | Bin 739840 -> 0 bytes .../PatcherUtils/Resources/PatchClient.exe | Bin 5885687 -> 0 bytes .../PatcherUtils/Resources/xdelta3.exe | Bin 624463 -> 0 bytes README.md | 10 +- 94 files changed, 286 insertions(+), 1668 deletions(-) rename Patcher/{_port/Patcher => }/PatchClient/.gitignore (100%) rename Patcher/{_port/Patcher => }/PatchClient/App.axaml (100%) rename Patcher/{_port/Patcher => }/PatchClient/App.axaml.cs (100%) delete mode 100644 Patcher/PatchClient/App.xaml delete mode 100644 Patcher/PatchClient/App.xaml.cs delete mode 100644 Patcher/PatchClient/AssemblyInfo.cs rename Patcher/{_port/Patcher => }/PatchClient/Assets/Styles.axaml (100%) rename Patcher/{_port/Patcher => }/PatchClient/Assets/avalonia-logo.ico (100%) rename Patcher/{_port/Patcher => }/PatchClient/CustomControls/TitleBar.axaml (95%) rename Patcher/{_port/Patcher => }/PatchClient/CustomControls/TitleBar.axaml.cs (100%) delete mode 100644 Patcher/PatchClient/Extensions/ControlExtensions.cs delete mode 100644 Patcher/PatchClient/MainWindow.xaml delete mode 100644 Patcher/PatchClient/MainWindow.xaml.cs rename Patcher/{_port/Patcher => }/PatchClient/Models/LineItemProgress.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/Models/ViewNavigator.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/Program.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/ViewLocator.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/ViewModels/MainWindowViewModel.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/ViewModels/MessageViewModel.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/ViewModels/PatcherViewModel.cs (88%) rename Patcher/{_port/Patcher => }/PatchClient/ViewModels/ViewModelBase.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/Views/MainWindow.axaml (100%) rename Patcher/{_port/Patcher => }/PatchClient/Views/MainWindow.axaml.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/Views/MessageView.axaml (100%) rename Patcher/{_port/Patcher => }/PatchClient/Views/MessageView.axaml.cs (100%) rename Patcher/{_port/Patcher => }/PatchClient/Views/PatcherView.axaml (100%) rename Patcher/{_port/Patcher => }/PatchClient/Views/PatcherView.axaml.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/.gitignore (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/App.axaml (95%) rename Patcher/{_port/Patcher => }/PatchGenerator/App.axaml.cs (60%) delete mode 100644 Patcher/PatchGenerator/App.xaml delete mode 100644 Patcher/PatchGenerator/App.xaml.cs delete mode 100644 Patcher/PatchGenerator/AssemblyInfo.cs rename Patcher/{_port/Patcher => }/PatchGenerator/Assets/Styles.axaml (94%) rename Patcher/{_port/Patcher => }/PatchGenerator/Assets/avalonia-logo.ico (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/AttachedProperties/RandomBoolAttProp.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/CustomControls/FolderSelector.axaml (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/CustomControls/FolderSelector.axaml.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/CustomControls/TitleBar.axaml (95%) rename Patcher/{_port/Patcher => }/PatchGenerator/CustomControls/TitleBar.axaml.cs (100%) delete mode 100644 Patcher/PatchGenerator/Extensions/ControlExtensions.cs delete mode 100644 Patcher/PatchGenerator/GenStartupArgs.cs rename Patcher/{_port/Patcher => }/PatchGenerator/Helpers/PatchItemDefinitions.cs (100%) delete mode 100644 Patcher/PatchGenerator/MainWindow.xaml delete mode 100644 Patcher/PatchGenerator/MainWindow.xaml.cs rename Patcher/{_port/Patcher => }/PatchGenerator/Models/GenStartupArgs.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Models/PatchGenInfo.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Models/PatchItem.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Models/ViewNavigator.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/PatchGenerator - Backup.csproj (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Program.cs (100%) create mode 100644 Patcher/PatchGenerator/Properties/launchSettings.json delete mode 100644 Patcher/PatchGenerator/References/Aki.ByteBanger.dll delete mode 100644 Patcher/PatchGenerator/References/ComponentAce.Compression.Libs.zlib.dll rename Patcher/{_port/Patcher => }/PatchGenerator/ViewLocator.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/ViewModels/MainWindowViewModel.cs (57%) rename Patcher/{_port/Patcher => }/PatchGenerator/ViewModels/OptionsViewModel.cs (74%) rename Patcher/{_port/Patcher => }/PatchGenerator/ViewModels/PatchGenerationViewModel.cs (65%) rename Patcher/{_port/Patcher => }/PatchGenerator/ViewModels/ViewModelBase.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Views/MainWindow.axaml (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Views/MainWindow.axaml.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Views/OptionsView.axaml (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Views/OptionsView.axaml.cs (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Views/PatchGenerationView.axaml (100%) rename Patcher/{_port/Patcher => }/PatchGenerator/Views/PatchGenerationView.axaml.cs (100%) delete mode 100644 Patcher/_port/Patcher/PatchClient/PatchClient.csproj delete mode 100644 Patcher/_port/Patcher/PatchClient/Properties/launchSettings.json delete mode 100644 Patcher/_port/Patcher/PatchClient/Resources/xdelta3.exe delete mode 100644 Patcher/_port/Patcher/PatchGenerator/PatchGenerator.csproj delete mode 100644 Patcher/_port/Patcher/PatchGenerator/References/Aki.Common.dll delete mode 100644 Patcher/_port/Patcher/PatchGenerator/Resources/7za.exe delete mode 100644 Patcher/_port/Patcher/PatchGenerator/Resources/PatchClient.exe delete mode 100644 Patcher/_port/Patcher/PatchGenerator/Resources/xdelta3.exe delete mode 100644 Patcher/_port/Patcher/Patcher.sln delete mode 100644 Patcher/_port/Patcher/PatcherUtils/LazyOperations.cs delete mode 100644 Patcher/_port/Patcher/PatcherUtils/LineItem.cs delete mode 100644 Patcher/_port/Patcher/PatcherUtils/PatchHelper.cs delete mode 100644 Patcher/_port/Patcher/PatcherUtils/PatcherUtils.csproj delete mode 100644 Patcher/_port/Patcher/PatcherUtils/ProgressChangedHandler.cs delete mode 100644 Patcher/_port/Patcher/PatcherUtils/RandomExtensions.cs delete mode 100644 Patcher/_port/Patcher/PatcherUtils/Resources/7za.exe delete mode 100644 Patcher/_port/Patcher/PatcherUtils/Resources/PatchClient.exe delete mode 100644 Patcher/_port/Patcher/PatcherUtils/Resources/xdelta3.exe diff --git a/.gitattributes b/.gitattributes index 93c4578..7e1b6a4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ /Patcher/_port/Patcher/PatchGenerator/Resources/PatchClient.exe filter=lfs diff=lfs merge=lfs -text +/Patcher/PatcherUtils/Resources/PatchClient.exe filter=lfs diff=lfs merge=lfs -text diff --git a/Patcher/_port/Patcher/PatchClient/.gitignore b/Patcher/PatchClient/.gitignore similarity index 100% rename from Patcher/_port/Patcher/PatchClient/.gitignore rename to Patcher/PatchClient/.gitignore diff --git a/Patcher/_port/Patcher/PatchClient/App.axaml b/Patcher/PatchClient/App.axaml similarity index 100% rename from Patcher/_port/Patcher/PatchClient/App.axaml rename to Patcher/PatchClient/App.axaml diff --git a/Patcher/_port/Patcher/PatchClient/App.axaml.cs b/Patcher/PatchClient/App.axaml.cs similarity index 100% rename from Patcher/_port/Patcher/PatchClient/App.axaml.cs rename to Patcher/PatchClient/App.axaml.cs diff --git a/Patcher/PatchClient/App.xaml b/Patcher/PatchClient/App.xaml deleted file mode 100644 index 180f09e..0000000 --- a/Patcher/PatchClient/App.xaml +++ /dev/null @@ -1,156 +0,0 @@ - - - - #121212 - #FFC107 - #FFFFFF - #282828 - #323947 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Patcher/PatchClient/App.xaml.cs b/Patcher/PatchClient/App.xaml.cs deleted file mode 100644 index 2a36935..0000000 --- a/Patcher/PatchClient/App.xaml.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; - -namespace PatchClient -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } -} diff --git a/Patcher/PatchClient/AssemblyInfo.cs b/Patcher/PatchClient/AssemblyInfo.cs deleted file mode 100644 index 8b5504e..0000000 --- a/Patcher/PatchClient/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -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/Patcher/_port/Patcher/PatchClient/Assets/Styles.axaml b/Patcher/PatchClient/Assets/Styles.axaml similarity index 100% rename from Patcher/_port/Patcher/PatchClient/Assets/Styles.axaml rename to Patcher/PatchClient/Assets/Styles.axaml diff --git a/Patcher/_port/Patcher/PatchClient/Assets/avalonia-logo.ico b/Patcher/PatchClient/Assets/avalonia-logo.ico similarity index 100% rename from Patcher/_port/Patcher/PatchClient/Assets/avalonia-logo.ico rename to Patcher/PatchClient/Assets/avalonia-logo.ico diff --git a/Patcher/_port/Patcher/PatchClient/CustomControls/TitleBar.axaml b/Patcher/PatchClient/CustomControls/TitleBar.axaml similarity index 95% rename from Patcher/_port/Patcher/PatchClient/CustomControls/TitleBar.axaml rename to Patcher/PatchClient/CustomControls/TitleBar.axaml index a432935..eb9d4eb 100644 --- a/Patcher/_port/Patcher/PatchClient/CustomControls/TitleBar.axaml +++ b/Patcher/PatchClient/CustomControls/TitleBar.axaml @@ -18,7 +18,7 @@ Background="Transparent" VerticalContentAlignment="Center" /> -