From 643a8999c89e992a01a3f6dd8c38efb534a14dc2 Mon Sep 17 00:00:00 2001 From: Dominic Beger Date: Sun, 2 Jan 2022 20:38:21 +0100 Subject: [PATCH] Upgrade projects to newer versions and improve the structure. Fixes #94 --- .../nUpdate.UI.WPF/NuGetUpgradeLog.html | 162 ++++++ .../nUpdate.UI.WPF/nUpdate.UI.WPF.csproj | 25 +- .../1fccbbc3/nUpdate.UI.WPF/packages.config | 4 + .../NuGetUpgradeLog.html | 162 ++++++ .../nUpdate.UI.WindowsForms.csproj | 155 +++++ .../nUpdate.UI.WindowsForms/packages.config | 4 + README.md | 72 +-- .../App.config | 7 +- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Settings.Designer.cs | 4 +- ...te.Administration.TransferInterface.csproj | 6 +- .../{Core => }/AesManager.cs | 2 +- nUpdate.Administration/App.config | 13 +- .../{Core => }/CodeDomHelper.cs | 2 +- .../ConnectionManager.cs | 4 +- .../Extension/AssociationManager.cs | 2 +- .../Extension/FileAssociationInfo.cs | 2 +- .../Extension/ProgramAssociationInfo.cs | 2 +- .../Application => }/Extension/ProgramIcon.cs | 2 +- .../Application => }/Extension/ProgramVerb.cs | 2 +- .../Extension/RegistryException.cs | 2 +- .../Extension/RegistryWrapper.cs | 2 +- .../Extension/ShellNotification.cs | 4 +- .../{Core => }/Extensions.cs | 4 +- .../Ftp/Service/FtpTransferService.cs | 5 +- .../Ftp/Service/TransferServiceProvider.cs | 4 +- .../{Core => }/FtpManager.cs | 4 +- .../{Core => }/History/Log.cs | 3 +- .../{Core => }/History/LogEntry.cs | 2 +- .../{Core => }/IAsyncSupportable.cs | 2 +- .../{Core => }/IResettable.cs | 2 +- .../{Core => }/JsonHelper.cs | 2 +- .../{Core => }/ListingItem.cs | 2 +- .../Localization/LocalizationProperties.cs | 2 +- .../{Core => }/Navigator.cs | 2 +- .../FileDeleteOperationPanel.Designer.cs | 2 +- .../Panels/FileDeleteOperationPanel.cs | 4 +- .../Panels/FileDeleteOperationPanel.resx | 0 .../FileRenameOperationPanel.Designer.cs | 2 +- .../Panels/FileRenameOperationPanel.cs | 4 +- .../Panels/FileRenameOperationPanel.resx | 0 .../Operations/Panels/IOperationPanel.cs | 4 +- .../ProcessStartOperationPanel.Designer.cs | 2 +- .../Panels/ProcessStartOperationPanel.cs | 4 +- .../Panels/ProcessStartOperationPanel.resx | 0 .../ProcessStopOperationPanel.Designer.cs | 2 +- .../Panels/ProcessStopOperationPanel.cs | 4 +- .../Panels/ProcessStopOperationPanel.resx | 0 ...istryDeleteValueOperationPanel.Designer.cs | 2 +- .../RegistryDeleteValueOperationPanel.cs | 4 +- .../RegistryDeleteValueOperationPanel.resx | 0 ...RegistrySetValueOperationPanel.Designer.cs | 4 +- .../Panels/RegistrySetValueOperationPanel.cs | 4 +- .../RegistrySetValueOperationPanel.resx | 0 ...strySubKeyCreateOperationPanel.Designer.cs | 2 +- .../RegistrySubKeyCreateOperationPanel.cs | 4 +- .../RegistrySubKeyCreateOperationPanel.resx | 0 ...strySubKeyDeleteOperationPanel.Designer.cs | 2 +- .../RegistrySubKeyDeleteOperationPanel.cs | 4 +- .../RegistrySubKeyDeleteOperationPanel.resx | 0 .../ScriptExecuteOperationPanel.Designer.cs | 2 +- .../Panels/ScriptExecuteOperationPanel.cs | 4 +- .../Panels/ScriptExecuteOperationPanel.resx | 0 .../ServiceStartOperationPanel.Designer.cs | 2 +- .../Panels/ServiceStartOperationPanel.cs | 4 +- .../Panels/ServiceStartOperationPanel.resx | 0 .../ServiceStopOperationPanel.Designer.cs | 2 +- .../Panels/ServiceStopOperationPanel.cs | 4 +- .../Panels/ServiceStopOperationPanel.resx | 0 nUpdate.Administration/Program.cs | 2 +- .../{Core => }/ProjectConfiguration.cs | 3 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../{Core => }/ServiceProviderHelper.cs | 2 +- .../{Core => }/StatisticsServer.cs | 2 +- .../UI/Controls/BottomPanel.cs | 75 +++ .../UI/Controls/ButtonTextBox.cs | 2 +- .../UI/Controls/CommandLink.cs | 2 +- .../UI/Controls/CueTextBox.cs | 2 +- .../UI/Controls/ExplorerListView.cs | 2 +- .../ExplorerNavigationButton/AeroTemplate.cs | 220 ------- .../ArrowDirection.cs | 21 - .../ExplorerNavigationButton/ButtonState.cs | 16 - .../ExplorerNavigationButton/ButtonTheme.cs | 31 - .../ExplorerNavigationButton.cs | 237 -------- .../ExplorerNavigationButton/MetroTemplate.cs | 96 ---- .../ExplorerNavigationButton/Template.cs | 61 -- .../UI/Controls/ExplorerTreeView.cs | 2 +- nUpdate.Administration/UI/Controls/Line.cs | 26 + .../UI/Dialogs/BaseDialog.cs | 1 - .../UI/Dialogs/CredentialsDialog.Designer.cs | 2 +- .../UI/Dialogs/CredentialsDialog.cs | 1 - .../Dialogs/DirectorySearchDialog.Designer.cs | 47 +- .../UI/Dialogs/DirectorySearchDialog.cs | 72 +-- .../UI/Dialogs/DirectorySearchDialog.resx | 80 +-- .../UI/Dialogs/FeedbackDialog.Designer.cs | 1 - .../UI/Dialogs/FeedbackDialog.cs | 2 - .../FtpAssemblyInputDialog.Designer.cs | 2 +- .../UI/Dialogs/FtpAssemblyInputDialog.cs | 1 - .../UI/Dialogs/HistoryDialog.cs | 3 +- .../UI/Dialogs/InfoDialog.Designer.cs | 14 +- .../UI/Dialogs/JsonEditorDialog.Designer.cs | 2 +- .../UI/Dialogs/JsonEditorDialog.cs | 3 +- .../UI/Dialogs/MainDialog.Designer.cs | 2 +- .../UI/Dialogs/MainDialog.cs | 7 +- .../UI/Dialogs/NewProjectDialog.Designer.cs | 1 - .../UI/Dialogs/NewProjectDialog.cs | 3 - .../UI/Dialogs/PackageAddDialog.Designer.cs | 20 +- .../UI/Dialogs/PackageAddDialog.cs | 14 +- .../UI/Dialogs/PackageEditDialog.Designer.cs | 20 +- .../UI/Dialogs/PackageEditDialog.cs | 17 +- .../PackagesToAffectDialog.Designer.cs | 2 +- .../UI/Dialogs/PreferencesDialog.Designer.cs | 2 +- .../UI/Dialogs/PreferencesDialog.cs | 5 +- .../UI/Dialogs/ProjectDialog.Designer.cs | 23 +- .../UI/Dialogs/ProjectDialog.cs | 8 +- .../UI/Dialogs/ProjectEditDialog.Designer.cs | 2 +- .../UI/Dialogs/ProjectEditDialog.cs | 3 - .../Dialogs/ProjectImportDialog.Designer.cs | 2 +- .../UI/Dialogs/ProjectImportDialog.cs | 3 - .../Dialogs/ProjectRemovalDialog.Designer.cs | 6 +- .../UI/Dialogs/ProjectRemovalDialog.cs | 2 - .../StatisticsServerAddDialog.Designer.cs | 1 - .../UI/Dialogs/StatisticsServerDialog.cs | 2 - .../StatisticsServerEditDialog.Designer.cs | 2 +- .../UI/Popups/PopupDialog.Designer.cs | 2 +- .../{Core/Application => }/UpdatePackage.cs | 2 +- .../{Core/Application => }/UpdateProject.cs | 5 +- .../{Core => }/ValidationManager.cs | 2 +- .../{Core => }/Win32/IconReader.cs | 2 +- .../{Core => }/Win32/Margins.cs | 2 +- .../{Core => }/Win32/NativeMethods.cs | 5 +- .../{Core => }/Win32/PaintStruct.cs | 2 +- .../nUpdate.Administration.csproj | 214 +++---- nUpdate.Administration/packages.config | 12 +- nUpdate.Internal/Properties/AssemblyInfo.cs | 49 -- nUpdate.Internal/Resources/Ionic.Zip.dll | Bin 445440 -> 0 bytes .../Resources/Newtonsoft.Json.dll | Bin 554408 -> 0 bytes nUpdate.Internal/Resources/en.xml | 38 -- .../Resources/nUpdate UpdateInstaller.exe | Bin 116224 -> 0 bytes .../Resources/nUpdate UpdateInstaller.pdb | Bin 128512 -> 0 bytes ...te.UpdateInstaller.Client.GuiInterface.dll | Bin 6144 -> 0 bytes .../Resources/nUpdate.UpdateInstaller.pdb | Bin 130560 -> 0 bytes nUpdate.Internal/app.config | 3 - nUpdate.Internal/nUpdate.Internal.csproj | 182 ------ .../nUpdate.Internal.csproj.DotSettings | 2 - nUpdate.Internal/nUpdate.csproj.DotSettings | 2 - nUpdate.Internal/packages.config | 4 - nUpdate.ProvideTAP/Properties/AssemblyInfo.cs | 40 -- .../UI/Dialogs/NewUpdateDialog.Designer.cs | 227 -------- .../Updating/UpdateConfiguration.cs | 80 --- nUpdate.ProvideTAP/Updating/UpdateManager.cs | 287 ---------- nUpdate.ProvideTAP/app.config | 16 - nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj | 139 ----- .../nUpdate.ProvideTAP.csproj.DotSettings | 2 - nUpdate.ProvideTAP/packages.config | 7 - nUpdate.Shared/Updating/UpdaterUI.cs | 61 -- nUpdate.Shared/nUpdate.Shared.projitems | 26 - nUpdate.Shared/nUpdate.Shared.shproj | 13 - nUpdate.Test/ConditionsAllTest.cs | 1 - nUpdate.Test/ConditionsAtLeastOneTest.cs | 5 +- nUpdate.Test/ConnectionCheckerTest.cs | 21 - nUpdate.Test/Properties/AssemblyInfo.cs | 4 +- nUpdate.Test/RsaSignatureTest.cs | 1 - nUpdate.Test/UriConnectorTest.cs | 1 - nUpdate.Test/UseDynamicUpdateUriTest.cs | 23 + nUpdate.Test/app.config | 7 +- nUpdate.Test/nUpdate.Test.csproj | 65 +-- nUpdate.Test/packages.config | 8 +- .../App.config | 7 +- .../Extensions.cs | 2 +- nUpdate.UI.WPF/IconHelper.cs | 60 ++ .../Properties/Annotations.cs | 2 +- .../Properties/AssemblyInfo.cs | 7 +- .../Properties/Resources.Designer.cs | 6 +- .../Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 4 +- .../Properties/Settings.settings | 0 .../ServiceInterfaces/IDialogWindowService.cs | 4 +- .../ServiceInterfaces/IMessageboxService.cs | 2 +- .../ServiceInterfaces/ServiceContainer.cs | 2 +- .../Services/DialogWindowService.cs | 8 +- .../Services/MessageBoxService.cs | 4 +- .../Services/ServiceInjector.cs | 4 +- .../Core => nUpdate.UI.WPF}/SizeHelper.cs | 4 +- .../Trade-Updater-Logo-v3.ico | Bin .../UI/UserControls/uclChangelogView.xaml | 4 +- .../UI/UserControls/uclChangelogView.xaml.cs | 2 +- .../UI/UserControls/uclDownloadUpdate.xaml | 4 +- .../UI/UserControls/uclDownloadUpdate.xaml.cs | 2 +- .../UI/UserControls/uclUpdateSearch.xaml | 5 +- .../UI/UserControls/uclUpdateSearch.xaml.cs | 2 +- .../UI/Windows/DialogWindow.xaml | 7 +- .../UI/Windows/DialogWindow.xaml.cs | 7 +- .../UpdaterUI.cs | 40 +- .../ViewModel/ChangelogViewModel.cs | 16 +- .../ViewModel/DownloadUpdateViewModel.cs | 9 +- .../ViewModel/Interfaces/IDialogViewModel.cs | 7 +- .../ViewModel/RelayCommand.cs | 2 +- .../ViewModel/UpdateSearchViewModel.cs | 9 +- .../ViewModel/UpdateUiBaseViewModel.cs | 2 +- .../ViewModel/ViewModelBase.cs | 4 +- nUpdate.UI.WPF/Win32/NativeMethods.cs | 20 + nUpdate.UI.WPF/nUpdate.UI.WPF.csproj | 39 ++ nUpdate.UI.WPF/upgrade-assistant.clef | 538 ++++++++++++++++++ nUpdate.UI.WindowsForms/App.config | 6 + .../Controls/BottomPanel.cs | 2 +- .../Controls/Line.cs | 2 +- .../Dialogs/BaseDialog.cs | 2 +- .../Dialogs/BaseDialog.resx | 0 .../Dialogs/FileLoadDialog.resx | 0 .../Dialogs/NewUpdateDialog.Designer.cs | 4 +- .../Dialogs/NewUpdateDialog.cs | 11 +- .../Dialogs/NewUpdateDialog.resx | 0 .../Dialogs/NoUpdateFoundDialog.Designer.cs | 4 +- .../Dialogs/NoUpdateFoundDialog.cs | 5 +- .../Dialogs/NoUpdateFoundDialog.resx | 0 .../Dialogs/UpdateDownloadDialog.Designer.cs | 4 +- .../Dialogs/UpdateDownloadDialog.cs | 8 +- .../Dialogs/UpdateDownloadDialog.resx | 0 .../Dialogs/UpdateSearchDialog.Designer.cs | 4 +- .../Dialogs/UpdateSearchDialog.cs | 7 +- .../Dialogs/UpdateSearchDialog.resx | 0 .../IconHelper.cs | 4 +- .../Popups/Popup.cs | 2 +- .../Popups/PopupButtons.cs | 2 +- .../Popups/PopupDialog.cs | 2 +- .../Popups/PopupDialog.designer.cs | 4 +- .../Popups/PopupDialog.resx | 0 .../Properties/AssemblyInfo.cs | 20 +- .../Properties/Resources.Designer.cs | 6 +- .../Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 4 +- .../Properties/Settings.settings | 3 +- nUpdate.UI.WindowsForms/SizeHelper.cs | 34 ++ .../UpdaterUI.cs | 37 +- .../Win32/NativeMethods.cs | 2 +- .../nUpdate.UI.WindowsForms.csproj | 45 ++ .../upgrade-assistant.clef | 506 ++++++++++++++++ .../IProgressReporter.cd | 0 .../IProgressReporter.cs | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../ServiceProviderAttribute.cs | 2 +- .../nUpdate.UpdateInstaller.UIBase.csproj | 8 +- nUpdate.UpdateInstaller/App.config | 7 +- .../{Core => }/CodeDomHelper.cs | 2 +- .../{Core => }/FileHelper.cs | 2 +- .../{Core => }/IconHelper.cs | 13 +- .../{Core => }/InstallerServiceProvider.cs | 7 +- .../Operations/Operation.cs | 24 - nUpdate.UpdateInstaller/PathDetector.cs | 30 + nUpdate.UpdateInstaller/Program.cs | 5 +- .../{Core => }/ProgressReporterService.cs | 4 +- .../ProgressReporterServiceEventLog.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Settings.Designer.cs | 4 +- .../{Core => }/RegistryManager.cs | 2 +- .../{Core => }/ServiceManager.cs | 2 +- .../{Core => }/ServiceProviderHelper.cs | 4 +- .../UI/Controls/BottomPanel.cs | 75 +++ .../UI/Dialogs/MainForm.cs | 3 +- nUpdate.UpdateInstaller/UI/Popups/Popup.cs | 31 +- .../UI/Popups/PopupDialog.Designer.cs | 12 +- nUpdate.UpdateInstaller/UpdateVersion.cs | 5 +- nUpdate.UpdateInstaller/Updater.cs | 33 +- .../{Core => }/Win32/NativeMethods.cs | 2 +- .../nUpdate.UpdateInstaller.csproj | 80 +-- nUpdate.UpdateInstaller/packages.config | 4 +- nUpdate.UserInterfaceTest/App.config | 19 - .../MainDialog.Designer.cs | 79 --- nUpdate.UserInterfaceTest/MainDialog.cs | 34 -- nUpdate.UserInterfaceTest/MainDialog.resx | 120 ---- nUpdate.UserInterfaceTest/Program.cs | 22 - .../Properties/AssemblyInfo.cs | 40 -- .../nUpdate.UserInterfaceTest.csproj | 135 ----- nUpdate.UserInterfaceTest/packages.config | 7 - nUpdate.WPFUpdateInstaller/App.config | 7 +- .../InstallerServiceProvider.cs | 2 +- nUpdate.WPFUpdateInstaller/MainWindow.xaml.cs | 30 +- nUpdate.WPFUpdateInstaller/Program.cs | 3 +- .../ProgressReporterService.cs | 2 +- .../Properties/Resources.Designer.cs | 58 +- .../Properties/Settings.Designer.cs | 30 +- .../Win32/NativeMethods.cs | 25 + .../nUpdate.WPFUpdateInstaller.csproj | 14 +- nUpdate.WPFUserInterface.Test/App.xaml | 12 - nUpdate.WPFUserInterface.Test/App.xaml.cs | 20 - nUpdate.WPFUserInterface.Test/MainWindow.xaml | 16 - .../MainWindow.xaml.cs | 80 --- .../Properties/AssemblyInfo.cs | 58 -- .../Properties/Resources.Designer.cs | 71 --- .../Properties/Settings.Designer.cs | 30 - .../ServiceInjector.cs | 12 - .../Services/DialogWindowService.cs | 26 - .../Services/MessageBoxService.cs | 14 - .../Services/ServiceInjector.cs | 16 - .../nUpdate.WPFUserInterface.Test.csproj | 125 ---- nUpdate.WPFUserInterface/App.config | 7 - nUpdate.WPFUserInterface/App.xaml | 8 - nUpdate.WPFUserInterface/App.xaml.cs | 14 - nUpdate.WPFUserInterface/Extensions.cs | 32 -- .../Properties/Resources.resx | 117 ---- .../Properties/Settings.settings | 8 - .../Trade-Updater-Logo-v3.ico | Bin 31064 -> 0 bytes .../UpdateConfiguration.cs | 80 --- nUpdate.WPFUserInterface/UpdateManager.cs | 275 --------- nUpdate.WithoutTAP/UI/Dialogs/BaseDialog.cs | 18 - nUpdate.WithoutTAP/UI/Dialogs/BaseDialog.resx | 120 ---- .../UI/Dialogs/DialogResultWrapper.cs | 12 - .../UI/Dialogs/FileLoadDialog.resx | 120 ---- .../UI/Dialogs/NewUpdateDialog.cs | 134 ----- .../UI/Dialogs/NewUpdateDialog.resx | 120 ---- .../Dialogs/NoUpdateFoundDialog.Designer.cs | 110 ---- .../UI/Dialogs/NoUpdateFoundDialog.cs | 45 -- .../UI/Dialogs/NoUpdateFoundDialog.resx | 120 ---- .../Dialogs/UpdateDownloadDialog.Designer.cs | 124 ---- .../UI/Dialogs/UpdateDownloadDialog.cs | 127 ----- .../UI/Dialogs/UpdateDownloadDialog.resx | 120 ---- .../UI/Dialogs/UpdateSearchDialog.Designer.cs | 112 ---- .../UI/Dialogs/UpdateSearchDialog.cs | 89 --- .../UI/Dialogs/UpdateSearchDialog.resx | 120 ---- .../UpdateEventArgs/FailedEventArgs.cs | 27 - .../UpdateSearchFinishedEventArgs.cs | 28 - .../Updating/UpdateConfiguration.cs | 92 --- nUpdate.WithoutTAP/Updating/UpdateManager.cs | 413 -------------- nUpdate.WithoutTAP/Updating/UpdaterUI.cs | 140 ----- nUpdate.WithoutTAP/app.config | 16 - nUpdate.WithoutTAP/nUpdate.WithoutTAP.csproj | 119 ---- .../nUpdate.WithoutTAP.csproj.DotSettings | 2 - nUpdate.WithoutTAP/packages.config | 4 - nUpdate.sln | 110 +--- nUpdate.sln.DotSettings.user | 5 + .../Core => nUpdate}/Architecture.cs | 2 +- nUpdate/AssemblyInfo.cs | 7 + .../Core => nUpdate}/DevelopmentalStage.cs | 2 +- .../Exceptions/PackageDeleteException.cs | 0 .../Exceptions/SizeCalculationException.cs | 0 .../Exceptions/StatisticsException.cs | 0 .../Core => nUpdate}/Extensions.cs | 2 +- .../HostApplicationOptions.cs | 2 +- .../Core => nUpdate}/HttpHeader.cs | 2 +- .../Core => nUpdate}/IDeepCopy.cs | 2 +- .../Localization/LocalizationHelper.cs | 4 +- .../Localization/LocalizationProperties.cs | 2 +- .../Core => nUpdate}/Localization/de-AT.json | 0 .../Core => nUpdate}/Localization/de-CH.json | 0 .../Core => nUpdate}/Localization/de-DE.json | 0 .../Core => nUpdate}/Localization/en.json | 0 .../Core => nUpdate}/Localization/it-IT.json | 0 .../Core => nUpdate}/Localization/zh-CN.json | 0 .../Core => nUpdate}/Operations/Operation.cs | 5 +- .../Operations/OperationArea.cs | 2 +- .../Operations/OperationMethod.cs | 2 +- .../Properties/Resources.Designer.cs | 18 +- .../Properties/Resources.resx | 10 +- .../Resources/DotNetZip.dll | Bin 458752 -> 472064 bytes nUpdate/Resources/Newtonsoft.Json.dll | Bin 0 -> 701992 bytes .../nUpdate.UpdateInstaller.UIBase.dll | Bin 0 -> 6144 bytes .../Resources/nUpdate.UpdateInstaller.exe | Bin 116736 -> 117760 bytes nUpdate/Resources/nUpdate.UpdateInstaller.pdb | Bin 0 -> 142848 bytes .../Core => nUpdate}/RolloutCondition.cs | 2 +- .../Core => nUpdate}/RolloutConditionMode.cs | 2 +- .../Core => nUpdate}/RsaManager.cs | 2 +- .../Core => nUpdate}/Serializer.cs | 2 +- .../Core => nUpdate}/SystemInformation.cs | 2 +- .../UpdateDownloadProgressChangedEventArgs.cs | 0 .../Updating/UpdateArgument.cs | 0 .../UpdateArgumentExecutionOptions.cs | 0 .../Updating/UpdateConfiguration.cs | 68 ++- .../Updating/UpdateManager.cs | 337 ++++++++++- .../Updating/UpdateResult.cs | 1 - .../Updating/UpdateVersion.cs | 1 - .../Core => nUpdate}/UriConnector.cs | 2 +- .../Core => nUpdate}/WebClientWrapper.cs | 2 +- .../Core => nUpdate}/WebRequestWrapper.cs | 3 +- nUpdate/nUpdate.csproj | 78 +++ .../nUpdateVersionAttribute.cs | 3 +- 379 files changed, 3269 insertions(+), 6837 deletions(-) create mode 100644 MigrationBackup/1fccbbc3/nUpdate.UI.WPF/NuGetUpgradeLog.html rename nUpdate.WPFUserInterface/nUpdate.WPFUserInterface.csproj => MigrationBackup/1fccbbc3/nUpdate.UI.WPF/nUpdate.UI.WPF.csproj (87%) create mode 100644 MigrationBackup/1fccbbc3/nUpdate.UI.WPF/packages.config create mode 100644 MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/NuGetUpgradeLog.html create mode 100644 MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/nUpdate.UI.WindowsForms.csproj create mode 100644 MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/packages.config rename nUpdate.Administration/{Core => }/AesManager.cs (99%) rename nUpdate.Administration/{Core => }/CodeDomHelper.cs (97%) rename {nUpdate.Internal/Core => nUpdate.Administration}/ConnectionManager.cs (81%) rename nUpdate.Administration/{Core/Application => }/Extension/AssociationManager.cs (97%) rename nUpdate.Administration/{Core/Application => }/Extension/FileAssociationInfo.cs (99%) rename nUpdate.Administration/{Core/Application => }/Extension/ProgramAssociationInfo.cs (99%) rename nUpdate.Administration/{Core/Application => }/Extension/ProgramIcon.cs (98%) rename nUpdate.Administration/{Core/Application => }/Extension/ProgramVerb.cs (94%) rename nUpdate.Administration/{Core/Application => }/Extension/RegistryException.cs (96%) rename nUpdate.Administration/{Core/Application => }/Extension/RegistryWrapper.cs (98%) rename nUpdate.Administration/{Core/Application => }/Extension/ShellNotification.cs (99%) rename nUpdate.Administration/{Core => }/Extensions.cs (98%) rename nUpdate.Administration/{Core => }/Ftp/Service/FtpTransferService.cs (98%) rename nUpdate.Administration/{Core => }/Ftp/Service/TransferServiceProvider.cs (90%) rename nUpdate.Administration/{Core => }/FtpManager.cs (99%) rename nUpdate.Administration/{Core => }/History/Log.cs (96%) rename nUpdate.Administration/{Core => }/History/LogEntry.cs (79%) rename nUpdate.Administration/{Core => }/IAsyncSupportable.cs (88%) rename nUpdate.Administration/{Core => }/IResettable.cs (87%) rename nUpdate.Administration/{Core => }/JsonHelper.cs (98%) rename nUpdate.Administration/{Core => }/ListingItem.cs (96%) rename nUpdate.Administration/{Core => }/Localization/LocalizationProperties.cs (99%) rename nUpdate.Administration/{Core => }/Navigator.cs (97%) rename nUpdate.Administration/{Core => }/Operations/Panels/FileDeleteOperationPanel.Designer.cs (99%) rename nUpdate.Administration/{Core => }/Operations/Panels/FileDeleteOperationPanel.cs (96%) rename nUpdate.Administration/{Core => }/Operations/Panels/FileDeleteOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/FileRenameOperationPanel.Designer.cs (99%) rename nUpdate.Administration/{Core => }/Operations/Panels/FileRenameOperationPanel.cs (95%) rename nUpdate.Administration/{Core => }/Operations/Panels/FileRenameOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/IOperationPanel.cs (81%) rename nUpdate.Administration/{Core => }/Operations/Panels/ProcessStartOperationPanel.Designer.cs (99%) rename nUpdate.Administration/{Core => }/Operations/Panels/ProcessStartOperationPanel.cs (94%) rename nUpdate.Administration/{Core => }/Operations/Panels/ProcessStartOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/ProcessStopOperationPanel.Designer.cs (98%) rename nUpdate.Administration/{Core => }/Operations/Panels/ProcessStopOperationPanel.cs (91%) rename nUpdate.Administration/{Core => }/Operations/Panels/ProcessStopOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistryDeleteValueOperationPanel.Designer.cs (99%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistryDeleteValueOperationPanel.cs (95%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistryDeleteValueOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySetValueOperationPanel.Designer.cs (99%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySetValueOperationPanel.cs (97%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySetValueOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySubKeyCreateOperationPanel.Designer.cs (99%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySubKeyCreateOperationPanel.cs (95%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySubKeyCreateOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySubKeyDeleteOperationPanel.Designer.cs (99%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySubKeyDeleteOperationPanel.cs (95%) rename nUpdate.Administration/{Core => }/Operations/Panels/RegistrySubKeyDeleteOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/ScriptExecuteOperationPanel.Designer.cs (99%) rename nUpdate.Administration/{Core => }/Operations/Panels/ScriptExecuteOperationPanel.cs (98%) rename nUpdate.Administration/{Core => }/Operations/Panels/ScriptExecuteOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/ServiceStartOperationPanel.Designer.cs (98%) rename nUpdate.Administration/{Core => }/Operations/Panels/ServiceStartOperationPanel.cs (94%) rename nUpdate.Administration/{Core => }/Operations/Panels/ServiceStartOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/Operations/Panels/ServiceStopOperationPanel.Designer.cs (98%) rename nUpdate.Administration/{Core => }/Operations/Panels/ServiceStopOperationPanel.cs (87%) rename nUpdate.Administration/{Core => }/Operations/Panels/ServiceStopOperationPanel.resx (100%) rename nUpdate.Administration/{Core => }/ProjectConfiguration.cs (94%) rename nUpdate.Administration/{Core => }/ServiceProviderHelper.cs (95%) rename nUpdate.Administration/{Core => }/StatisticsServer.cs (95%) create mode 100644 nUpdate.Administration/UI/Controls/BottomPanel.cs delete mode 100644 nUpdate.Administration/UI/Controls/ExplorerNavigationButton/AeroTemplate.cs delete mode 100644 nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ArrowDirection.cs delete mode 100644 nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ButtonState.cs delete mode 100644 nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ButtonTheme.cs delete mode 100644 nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ExplorerNavigationButton.cs delete mode 100644 nUpdate.Administration/UI/Controls/ExplorerNavigationButton/MetroTemplate.cs delete mode 100644 nUpdate.Administration/UI/Controls/ExplorerNavigationButton/Template.cs create mode 100644 nUpdate.Administration/UI/Controls/Line.cs rename nUpdate.Administration/{Core/Application => }/UpdatePackage.cs (94%) rename nUpdate.Administration/{Core/Application => }/UpdateProject.cs (97%) rename nUpdate.Administration/{Core => }/ValidationManager.cs (95%) rename nUpdate.Administration/{Core => }/Win32/IconReader.cs (97%) rename nUpdate.Administration/{Core => }/Win32/Margins.cs (87%) rename nUpdate.Administration/{Core => }/Win32/NativeMethods.cs (96%) rename nUpdate.Administration/{Core => }/Win32/PaintStruct.cs (95%) delete mode 100644 nUpdate.Internal/Properties/AssemblyInfo.cs delete mode 100644 nUpdate.Internal/Resources/Ionic.Zip.dll delete mode 100644 nUpdate.Internal/Resources/Newtonsoft.Json.dll delete mode 100644 nUpdate.Internal/Resources/en.xml delete mode 100644 nUpdate.Internal/Resources/nUpdate UpdateInstaller.exe delete mode 100644 nUpdate.Internal/Resources/nUpdate UpdateInstaller.pdb delete mode 100644 nUpdate.Internal/Resources/nUpdate.UpdateInstaller.Client.GuiInterface.dll delete mode 100644 nUpdate.Internal/Resources/nUpdate.UpdateInstaller.pdb delete mode 100644 nUpdate.Internal/app.config delete mode 100644 nUpdate.Internal/nUpdate.Internal.csproj delete mode 100644 nUpdate.Internal/nUpdate.Internal.csproj.DotSettings delete mode 100644 nUpdate.Internal/nUpdate.csproj.DotSettings delete mode 100644 nUpdate.Internal/packages.config delete mode 100644 nUpdate.ProvideTAP/Properties/AssemblyInfo.cs delete mode 100644 nUpdate.ProvideTAP/UI/Dialogs/NewUpdateDialog.Designer.cs delete mode 100644 nUpdate.ProvideTAP/Updating/UpdateConfiguration.cs delete mode 100644 nUpdate.ProvideTAP/Updating/UpdateManager.cs delete mode 100644 nUpdate.ProvideTAP/app.config delete mode 100644 nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj delete mode 100644 nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj.DotSettings delete mode 100644 nUpdate.ProvideTAP/packages.config delete mode 100644 nUpdate.Shared/Updating/UpdaterUI.cs delete mode 100644 nUpdate.Shared/nUpdate.Shared.projitems delete mode 100644 nUpdate.Shared/nUpdate.Shared.shproj delete mode 100644 nUpdate.Test/ConnectionCheckerTest.cs rename {nUpdate.WPFUserInterface.Test => nUpdate.UI.WPF}/App.config (60%) rename {nUpdate.ProvideTAP => nUpdate.UI.WPF}/Extensions.cs (97%) create mode 100644 nUpdate.UI.WPF/IconHelper.cs rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/Properties/Annotations.cs (99%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/Properties/AssemblyInfo.cs (95%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/Properties/Resources.Designer.cs (92%) rename {nUpdate.UserInterfaceTest => nUpdate.UI.WPF}/Properties/Resources.resx (100%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/Properties/Settings.Designer.cs (94%) rename {nUpdate.WPFUserInterface.Test => nUpdate.UI.WPF}/Properties/Settings.settings (100%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ServiceInterfaces/IDialogWindowService.cs (72%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ServiceInterfaces/IMessageboxService.cs (93%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ServiceInterfaces/ServiceContainer.cs (95%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/Services/DialogWindowService.cs (83%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/Services/MessageBoxService.cs (86%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/Services/ServiceInjector.cs (85%) rename {nUpdate.Internal/Core => nUpdate.UI.WPF}/SizeHelper.cs (93%) rename {nUpdate.WPFUserInterface.Test => nUpdate.UI.WPF}/Trade-Updater-Logo-v3.ico (100%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UI/UserControls/uclChangelogView.xaml (96%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UI/UserControls/uclChangelogView.xaml.cs (87%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UI/UserControls/uclDownloadUpdate.xaml (91%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UI/UserControls/uclDownloadUpdate.xaml.cs (88%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UI/UserControls/uclUpdateSearch.xaml (86%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UI/UserControls/uclUpdateSearch.xaml.cs (87%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UI/Windows/DialogWindow.xaml (79%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UI/Windows/DialogWindow.xaml.cs (89%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/UpdaterUI.cs (78%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ViewModel/ChangelogViewModel.cs (92%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ViewModel/DownloadUpdateViewModel.cs (94%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ViewModel/Interfaces/IDialogViewModel.cs (87%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ViewModel/RelayCommand.cs (95%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ViewModel/UpdateSearchViewModel.cs (91%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ViewModel/UpdateUiBaseViewModel.cs (95%) rename {nUpdate.WPFUserInterface => nUpdate.UI.WPF}/ViewModel/ViewModelBase.cs (94%) create mode 100644 nUpdate.UI.WPF/Win32/NativeMethods.cs create mode 100644 nUpdate.UI.WPF/nUpdate.UI.WPF.csproj create mode 100644 nUpdate.UI.WPF/upgrade-assistant.clef create mode 100644 nUpdate.UI.WindowsForms/App.config rename {nUpdate.Internal/UI => nUpdate.UI.WindowsForms}/Controls/BottomPanel.cs (98%) rename {nUpdate.Internal/UI => nUpdate.UI.WindowsForms}/Controls/Line.cs (93%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/BaseDialog.cs (85%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/BaseDialog.resx (100%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/FileLoadDialog.resx (100%) rename {nUpdate.WithoutTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/NewUpdateDialog.Designer.cs (99%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/NewUpdateDialog.cs (95%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/NewUpdateDialog.resx (100%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/NoUpdateFoundDialog.Designer.cs (98%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/NoUpdateFoundDialog.cs (91%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/NoUpdateFoundDialog.resx (100%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/UpdateDownloadDialog.Designer.cs (98%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/UpdateDownloadDialog.cs (95%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/UpdateDownloadDialog.resx (100%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/UpdateSearchDialog.Designer.cs (98%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/UpdateSearchDialog.cs (93%) rename {nUpdate.ProvideTAP/UI => nUpdate.UI.WindowsForms}/Dialogs/UpdateSearchDialog.resx (100%) rename {nUpdate.Internal/Core => nUpdate.UI.WindowsForms}/IconHelper.cs (96%) rename {nUpdate.Internal/UI => nUpdate.UI.WindowsForms}/Popups/Popup.cs (98%) rename {nUpdate.Internal/UI => nUpdate.UI.WindowsForms}/Popups/PopupButtons.cs (78%) rename {nUpdate.Internal/UI => nUpdate.UI.WindowsForms}/Popups/PopupDialog.cs (98%) rename {nUpdate.Internal/UI => nUpdate.UI.WindowsForms}/Popups/PopupDialog.designer.cs (99%) rename {nUpdate.Internal/UI => nUpdate.UI.WindowsForms}/Popups/PopupDialog.resx (100%) rename {nUpdate.WithoutTAP => nUpdate.UI.WindowsForms}/Properties/AssemblyInfo.cs (68%) rename {nUpdate.UserInterfaceTest => nUpdate.UI.WindowsForms}/Properties/Resources.Designer.cs (92%) rename {nUpdate.WPFUserInterface.Test => nUpdate.UI.WindowsForms}/Properties/Resources.resx (100%) rename {nUpdate.UserInterfaceTest => nUpdate.UI.WindowsForms}/Properties/Settings.Designer.cs (93%) rename {nUpdate.UserInterfaceTest => nUpdate.UI.WindowsForms}/Properties/Settings.settings (93%) create mode 100644 nUpdate.UI.WindowsForms/SizeHelper.cs rename {nUpdate.ProvideTAP/Updating => nUpdate.UI.WindowsForms}/UpdaterUI.cs (74%) rename {nUpdate.Internal/Core => nUpdate.UI.WindowsForms}/Win32/NativeMethods.cs (95%) create mode 100644 nUpdate.UI.WindowsForms/nUpdate.UI.WindowsForms.csproj create mode 100644 nUpdate.UI.WindowsForms/upgrade-assistant.clef rename {nUpdate.Client.GuiInterface => nUpdate.UpdateInstaller.UIBase}/IProgressReporter.cd (100%) rename {nUpdate.Client.GuiInterface => nUpdate.UpdateInstaller.UIBase}/IProgressReporter.cs (96%) rename {nUpdate.Client.GuiInterface => nUpdate.UpdateInstaller.UIBase}/Properties/AssemblyInfo.cs (95%) rename {nUpdate.Client.GuiInterface => nUpdate.UpdateInstaller.UIBase}/ServiceProviderAttribute.cs (95%) rename nUpdate.Client.GuiInterface/nUpdate.UpdateInstaller.Client.GuiInterface.csproj => nUpdate.UpdateInstaller.UIBase/nUpdate.UpdateInstaller.UIBase.csproj (88%) rename nUpdate.UpdateInstaller/{Core => }/CodeDomHelper.cs (97%) rename nUpdate.UpdateInstaller/{Core => }/FileHelper.cs (93%) rename nUpdate.UpdateInstaller/{Core => }/IconHelper.cs (79%) rename nUpdate.UpdateInstaller/{Core => }/InstallerServiceProvider.cs (87%) create mode 100644 nUpdate.UpdateInstaller/PathDetector.cs rename nUpdate.UpdateInstaller/{Core => }/ProgressReporterService.cs (92%) rename nUpdate.UpdateInstaller/{Core => }/ProgressReporterServiceEventLog.cs (91%) rename nUpdate.UpdateInstaller/{Core => }/RegistryManager.cs (99%) rename nUpdate.UpdateInstaller/{Core => }/ServiceManager.cs (98%) rename nUpdate.UpdateInstaller/{Core => }/ServiceProviderHelper.cs (89%) create mode 100644 nUpdate.UpdateInstaller/UI/Controls/BottomPanel.cs rename nUpdate.UpdateInstaller/{Core => }/Win32/NativeMethods.cs (90%) delete mode 100644 nUpdate.UserInterfaceTest/App.config delete mode 100644 nUpdate.UserInterfaceTest/MainDialog.Designer.cs delete mode 100644 nUpdate.UserInterfaceTest/MainDialog.cs delete mode 100644 nUpdate.UserInterfaceTest/MainDialog.resx delete mode 100644 nUpdate.UserInterfaceTest/Program.cs delete mode 100644 nUpdate.UserInterfaceTest/Properties/AssemblyInfo.cs delete mode 100644 nUpdate.UserInterfaceTest/nUpdate.UserInterfaceTest.csproj delete mode 100644 nUpdate.UserInterfaceTest/packages.config create mode 100644 nUpdate.WPFUpdateInstaller/Win32/NativeMethods.cs delete mode 100644 nUpdate.WPFUserInterface.Test/App.xaml delete mode 100644 nUpdate.WPFUserInterface.Test/App.xaml.cs delete mode 100644 nUpdate.WPFUserInterface.Test/MainWindow.xaml delete mode 100644 nUpdate.WPFUserInterface.Test/MainWindow.xaml.cs delete mode 100644 nUpdate.WPFUserInterface.Test/Properties/AssemblyInfo.cs delete mode 100644 nUpdate.WPFUserInterface.Test/Properties/Resources.Designer.cs delete mode 100644 nUpdate.WPFUserInterface.Test/Properties/Settings.Designer.cs delete mode 100644 nUpdate.WPFUserInterface.Test/ServiceInjector.cs delete mode 100644 nUpdate.WPFUserInterface.Test/Services/DialogWindowService.cs delete mode 100644 nUpdate.WPFUserInterface.Test/Services/MessageBoxService.cs delete mode 100644 nUpdate.WPFUserInterface.Test/Services/ServiceInjector.cs delete mode 100644 nUpdate.WPFUserInterface.Test/nUpdate.WPFUserInterface.Test.csproj delete mode 100644 nUpdate.WPFUserInterface/App.config delete mode 100644 nUpdate.WPFUserInterface/App.xaml delete mode 100644 nUpdate.WPFUserInterface/App.xaml.cs delete mode 100644 nUpdate.WPFUserInterface/Extensions.cs delete mode 100644 nUpdate.WPFUserInterface/Properties/Resources.resx delete mode 100644 nUpdate.WPFUserInterface/Properties/Settings.settings delete mode 100644 nUpdate.WPFUserInterface/Trade-Updater-Logo-v3.ico delete mode 100644 nUpdate.WPFUserInterface/UpdateConfiguration.cs delete mode 100644 nUpdate.WPFUserInterface/UpdateManager.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/BaseDialog.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/BaseDialog.resx delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/DialogResultWrapper.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/FileLoadDialog.resx delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/NewUpdateDialog.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/NewUpdateDialog.resx delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/NoUpdateFoundDialog.Designer.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/NoUpdateFoundDialog.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/NoUpdateFoundDialog.resx delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/UpdateDownloadDialog.Designer.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/UpdateDownloadDialog.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/UpdateDownloadDialog.resx delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/UpdateSearchDialog.Designer.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/UpdateSearchDialog.cs delete mode 100644 nUpdate.WithoutTAP/UI/Dialogs/UpdateSearchDialog.resx delete mode 100644 nUpdate.WithoutTAP/UpdateEventArgs/FailedEventArgs.cs delete mode 100644 nUpdate.WithoutTAP/UpdateEventArgs/UpdateSearchFinishedEventArgs.cs delete mode 100644 nUpdate.WithoutTAP/Updating/UpdateConfiguration.cs delete mode 100644 nUpdate.WithoutTAP/Updating/UpdateManager.cs delete mode 100644 nUpdate.WithoutTAP/Updating/UpdaterUI.cs delete mode 100644 nUpdate.WithoutTAP/app.config delete mode 100644 nUpdate.WithoutTAP/nUpdate.WithoutTAP.csproj delete mode 100644 nUpdate.WithoutTAP/nUpdate.WithoutTAP.csproj.DotSettings delete mode 100644 nUpdate.WithoutTAP/packages.config rename {nUpdate.Internal/Core => nUpdate}/Architecture.cs (83%) create mode 100644 nUpdate/AssemblyInfo.cs rename {nUpdate.Internal/Core => nUpdate}/DevelopmentalStage.cs (86%) rename {nUpdate.Shared => nUpdate}/Exceptions/PackageDeleteException.cs (100%) rename {nUpdate.Shared => nUpdate}/Exceptions/SizeCalculationException.cs (100%) rename {nUpdate.Shared => nUpdate}/Exceptions/StatisticsException.cs (100%) rename {nUpdate.Internal/Core => nUpdate}/Extensions.cs (93%) rename {nUpdate.Shared/Core => nUpdate}/HostApplicationOptions.cs (86%) rename {nUpdate.Internal/Core => nUpdate}/HttpHeader.cs (95%) rename {nUpdate.Internal/Core => nUpdate}/IDeepCopy.cs (91%) rename {nUpdate.Internal/Core => nUpdate}/Localization/LocalizationHelper.cs (95%) rename {nUpdate.Internal/Core => nUpdate}/Localization/LocalizationProperties.cs (99%) rename {nUpdate.Internal/Core => nUpdate}/Localization/de-AT.json (100%) rename {nUpdate.Internal/Core => nUpdate}/Localization/de-CH.json (100%) rename {nUpdate.Internal/Core => nUpdate}/Localization/de-DE.json (100%) rename {nUpdate.Internal/Core => nUpdate}/Localization/en.json (100%) rename {nUpdate.Internal/Core => nUpdate}/Localization/it-IT.json (100%) rename {nUpdate.Internal/Core => nUpdate}/Localization/zh-CN.json (100%) rename {nUpdate.Internal/Core => nUpdate}/Operations/Operation.cs (98%) rename {nUpdate.Internal/Core => nUpdate}/Operations/OperationArea.cs (93%) rename {nUpdate.Internal/Core => nUpdate}/Operations/OperationMethod.cs (90%) rename {nUpdate.Internal => nUpdate}/Properties/Resources.Designer.cs (88%) rename {nUpdate.Internal => nUpdate}/Properties/Resources.resx (93%) rename {nUpdate.Internal => nUpdate}/Resources/DotNetZip.dll (62%) create mode 100644 nUpdate/Resources/Newtonsoft.Json.dll create mode 100644 nUpdate/Resources/nUpdate.UpdateInstaller.UIBase.dll rename {nUpdate.Internal => nUpdate}/Resources/nUpdate.UpdateInstaller.exe (53%) create mode 100644 nUpdate/Resources/nUpdate.UpdateInstaller.pdb rename {nUpdate.Internal/Core => nUpdate}/RolloutCondition.cs (94%) rename {nUpdate.Internal/Core => nUpdate}/RolloutConditionMode.cs (84%) rename {nUpdate.Internal/Core => nUpdate}/RsaManager.cs (99%) rename {nUpdate.Internal/Core => nUpdate}/Serializer.cs (98%) rename {nUpdate.Internal/Core => nUpdate}/SystemInformation.cs (98%) rename {nUpdate.Shared => nUpdate}/UpdateEventArgs/UpdateDownloadProgressChangedEventArgs.cs (100%) rename {nUpdate.Shared => nUpdate}/Updating/UpdateArgument.cs (100%) rename {nUpdate.Shared => nUpdate}/Updating/UpdateArgumentExecutionOptions.cs (100%) rename {nUpdate.Shared => nUpdate}/Updating/UpdateConfiguration.cs (61%) rename {nUpdate.Shared => nUpdate}/Updating/UpdateManager.cs (57%) rename {nUpdate.Shared => nUpdate}/Updating/UpdateResult.cs (99%) rename {nUpdate.Shared => nUpdate}/Updating/UpdateVersion.cs (99%) rename {nUpdate.Internal/Core => nUpdate}/UriConnector.cs (93%) rename {nUpdate.Internal/Core => nUpdate}/WebClientWrapper.cs (97%) rename {nUpdate.Internal/Core => nUpdate}/WebRequestWrapper.cs (96%) create mode 100644 nUpdate/nUpdate.csproj rename {nUpdate.Shared/Core => nUpdate}/nUpdateVersionAttribute.cs (96%) diff --git a/MigrationBackup/1fccbbc3/nUpdate.UI.WPF/NuGetUpgradeLog.html b/MigrationBackup/1fccbbc3/nUpdate.UI.WPF/NuGetUpgradeLog.html new file mode 100644 index 00000000..8382615b --- /dev/null +++ b/MigrationBackup/1fccbbc3/nUpdate.UI.WPF/NuGetUpgradeLog.html @@ -0,0 +1,162 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - nUpdate.UI.WPF

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + C:\Users\Dominic\source\repos\nUpdate\MigrationBackup\1fccbbc3\nUpdate.UI.WPF
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
Newtonsoft.Json + v13.0.1

Transitive dependencies:

Package IdVersion
+ No transitive dependencies found. +

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/nUpdate.WPFUserInterface/nUpdate.WPFUserInterface.csproj b/MigrationBackup/1fccbbc3/nUpdate.UI.WPF/nUpdate.UI.WPF.csproj similarity index 87% rename from nUpdate.WPFUserInterface/nUpdate.WPFUserInterface.csproj rename to MigrationBackup/1fccbbc3/nUpdate.UI.WPF/nUpdate.UI.WPF.csproj index 650fe3d3..0710aa09 100644 --- a/nUpdate.WPFUserInterface/nUpdate.WPFUserInterface.csproj +++ b/MigrationBackup/1fccbbc3/nUpdate.UI.WPF/nUpdate.UI.WPF.csproj @@ -6,13 +6,14 @@ AnyCPU {EF0AA5C9-FFEF-440D-975A-4E78C3BBBA17} Library - nUpdate - nUpdate.WPFUserInterface - v4.6 + nUpdate.UI.WPF + nUpdate.UI.WPF + v4.6.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + AnyCPU @@ -40,6 +41,9 @@ Trade-Updater-Logo-v3.ico + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + @@ -58,10 +62,13 @@ + + MSBuild:Compile Designer + @@ -77,8 +84,6 @@ DialogWindow.xaml - - @@ -131,6 +136,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator Settings.Designer.cs @@ -140,18 +146,17 @@ - + {5E63208A-8F06-4B99-A41D-F469BE4CFD00} nUpdate.UpdateInstaller.Client.GuiInterface - - {efb71d69-ebf9-4f60-b776-de443730a3dd} - nUpdate.Internal + + {1f5cbe95-f969-45bb-a385-2fd1a3a5ac32} + nUpdate - \ No newline at end of file diff --git a/MigrationBackup/1fccbbc3/nUpdate.UI.WPF/packages.config b/MigrationBackup/1fccbbc3/nUpdate.UI.WPF/packages.config new file mode 100644 index 00000000..ce3dc383 --- /dev/null +++ b/MigrationBackup/1fccbbc3/nUpdate.UI.WPF/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/NuGetUpgradeLog.html b/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/NuGetUpgradeLog.html new file mode 100644 index 00000000..ccc96472 --- /dev/null +++ b/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/NuGetUpgradeLog.html @@ -0,0 +1,162 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - nUpdate.UI.WindowsForms

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + C:\Users\Dominic\source\repos\nUpdate\MigrationBackup\6aaa9608\nUpdate.UI.WindowsForms
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
Newtonsoft.Json + v13.0.1

Transitive dependencies:

Package IdVersion
+ No transitive dependencies found. +

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/nUpdate.UI.WindowsForms.csproj b/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/nUpdate.UI.WindowsForms.csproj new file mode 100644 index 00000000..16be5988 --- /dev/null +++ b/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/nUpdate.UI.WindowsForms.csproj @@ -0,0 +1,155 @@ + + + + + Debug + AnyCPU + {F7557661-1C6B-4FD3-B668-72129E4EE089} + Library + nUpdate.UI.WindowsForms + nUpdate.UI.WindowsForms + v4.6.1 + 512 + true + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + + + ..\..\..\..\.nuget\packages\system.runtime\4.3.0\ref\netstandard1.5\System.Runtime.dll + + + ..\..\..\..\.nuget\packages\system.runtime.interopservices\4.3.0\ref\netcoreapp1.1\System.Runtime.InteropServices.dll + + + + + + + + + + + + + + + Component + + + Form + + + Form + + + NewUpdateDialog.cs + + + Form + + + NoUpdateFoundDialog.cs + + + Form + + + UpdateDownloadDialog.cs + + + Form + + + UpdateSearchDialog.cs + + + + + + Form + + + PopupDialog.cs + + + + + + + BaseDialog.cs + + + + NewUpdateDialog.cs + + + NoUpdateFoundDialog.cs + + + UpdateDownloadDialog.cs + + + UpdateSearchDialog.cs + + + PopupDialog.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + + {6bb31893-efce-406f-9d18-80959a956f99} + nUpdate + + + + \ No newline at end of file diff --git a/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/packages.config b/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/packages.config new file mode 100644 index 00000000..ce3dc383 --- /dev/null +++ b/MigrationBackup/6aaa9608/nUpdate.UI.WindowsForms/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/README.md b/README.md index f684fce6..52ac8a80 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,11 @@ # nUpdate - .NET Update Solution -[![Release](https://img.shields.io/badge/release-v3.5.0-blue.svg)](https://github.com/dbforge/nUpdate/releases) -[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.ProvideTAP-v3.5.0-red.svg)](https://www.nuget.org/packages/nUpdate.ProvideTAP/) -[![NuGet](https://img.shields.io/badge/nuget%20nUpdate.WithoutTAP-v3.5.0-red.svg)](https://www.nuget.org/packages/nUpdate.WithoutTAP/) +[![Release](https://img.shields.io/badge/release-v4.0-blue.svg)](https://github.com/dbforge/nUpdate/releases) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/ProgTrade/nUpdate/master/LICENSE) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=dominic%2ebeger%40hotmail%2ede&lc=DE&item_name=nUpdate&no_note=0¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHostedGuest) -nUpdate is a modern update system for .NET applications. +nUpdate is a powerful update system for .NET applications. Providing high security and an easy-to-use user interface, it is the perfect solution for your software. ![](https://www.nupdate.net/img/new-updates.png) @@ -27,30 +25,25 @@ Providing high security and an easy-to-use user interface, it is the perfect sol - Supports very large update packages - ... -## Installation - -You can get the necessary libraries and applications from the current [releases](https://github.com/ProgTrade/nUpdate/releases). The nUpdate library itself can also be installed in your application using the NuGet package manager. - -### Using NuGet +## Specs and requirements -#### nUpdate.ProvideTAP +The pure `nUpdate` library is based on .NET standard 2.0. +This means your project needs to fulfill one of these requirements: -If you want to use nUpdate with the Taskbased Asynchronous Pattern including `async` and `await`, then install this package: +- .NET Framework >= 4.6.1 +- .NET Core >= 2.0 +- UWP >= 10.0.16299 -``` -PM> Install-Package nUpdate.ProvideTAP -Version 3.5.0 -``` +All other libraries in the solution use the .NET Framework 4.6.1. -##### Trouble installing nUpdate.ProvideTAP? - -It may be that Visual Studio shows you a warning like `The primary reference "nUpdate.ProvideTAP, Version=..., Culture=neutral, PublicKeyToken=..., processorArchitecture=MSIL" could not be resolved because it has an indirect dependency on the .NET Framework assembly "System.Runtime, Version=..., Culture=neutral, PublicKeyToken=..." which has a higher version "..." than the version "..." in the current target framework.` and won't let you compile the project. You can fix this by going to the NuGet Package Manager and updating the Microsoft.Bcl.\* packages to the newest version. +## Installation -#### nUpdate.WithoutTAP +You can get the necessary libraries and applications from the current [releases](https://github.com/dbforge/nUpdate/releases). The nUpdate library itself can also be installed in your application using the NuGet package manager. -Otherwise, if you want to use the Eventbased Asynchronous Pattern, make sure to install this package: +### Using NuGet ``` -PM> Install-Package nUpdate.WithoutTAP -Version 3.5.0 +PM> Install-Package nUpdate -Version 4.0.0 ``` ## Usage example @@ -75,7 +68,19 @@ When none of them is specified, an exception will be thrown. ### Using the integrated user interface (Windows Forms or WPF) -The projects `nUpdate.ProvideTAP` and `nUpdate.WithoutTAP` contain Windows Forms only. To use a WPF user interface, you need to reference `nUpdate.WPFUserInterface` (not yet available in NuGet). The codes for the usage are completely equal (except for having the WPF UI in nUpdate.UpdateInstaller as well, you'll have to provide the integrated `nUpdate.WPFUpdateInstaller`-DLL location using the `CustomUiAssemblyPath`-property). +The package `nUpdate.UI.WindowsForms` provides a built-in user interface for Windows Forms application. Install it via NuGet: + +``` +PM> Install-Package nUpdate.UI.WindowsForms -Version 4.0.0 +``` + +To use the built-in WPF user interface, you need to install `nUpdate.UI.WPF`: + +``` +PM> Install-Package nUpdate.UI.WPF -Version 4.0.0 +``` + +Both projects give you an `UpdaterUI` class that you can use as follows: ``` c# // Generated via nUpdate Administration > Open project > Overview > Copy source @@ -104,7 +109,7 @@ if (manager.SearchForUpdates()) ### Using no user interface (asynchronously) -For asynchronous usage, each method (except `InstallPackage` and `ValidatePackages` which are synchronous in any case till now) has a corresponding asynchronous one defined inside the `UpdateManager`. Depending on your reference, `nUpdate.ProvideTAP` uses the task-based asynchronous pattern with `async`, `await` and `Task` whereas `nUpdate.WithoutTAP` uses the event-based asynchronous pattern (obsolete). You may have a look at each `UpdaterUI` implementation to see how it is used. +For asynchronous usage, each method (except `InstallPackage` and `ValidatePackages` which are synchronous in any case till now) has a corresponding asynchronous one defined inside the `UpdateManager`. ### Specifying an `UpdateVersion` @@ -123,29 +128,6 @@ ReleaseCandidate: `rc` In version 4 any type of pre-release descriptor, as well as build metadata, will be available. It will fulfill the complete semantic versioning specification and have an abstract version system. -## Web -* [nUpdate] - The official website of nUpdate. - -## Roadmap - -- .NET Standard and .NET Core port -- WPF port -- Differential updates -- Faster updating -- Fix remaining bugs -- Improvements -- Multilanguage everywhere -- Lots of new languages -- Code Signing Certificate -- PowerShell support -- Better integration in company networks -- ... - -Have a look at the [develop]-branch for the newest changes. - -[develop]:https://www.github.com/ProgTrade/nUpdate/tree/develop -[nUpdate]:http://www.nupdate.net/ - ## Supported by diff --git a/nUpdate.Administration.TransferInterface/App.config b/nUpdate.Administration.TransferInterface/App.config index 0ac2de8f..fd3b4100 100644 --- a/nUpdate.Administration.TransferInterface/App.config +++ b/nUpdate.Administration.TransferInterface/App.config @@ -1,7 +1,6 @@ - - + - + - \ No newline at end of file + diff --git a/nUpdate.Administration.TransferInterface/Properties/Resources.Designer.cs b/nUpdate.Administration.TransferInterface/Properties/Resources.Designer.cs index 91b0b174..f6efba9c 100644 --- a/nUpdate.Administration.TransferInterface/Properties/Resources.Designer.cs +++ b/nUpdate.Administration.TransferInterface/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.18444 +// Laufzeitversion:4.0.30319.42000 // // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. @@ -19,7 +19,7 @@ namespace nUpdate.Administration.TransferInterface.Properties { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [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()] internal class Resources { diff --git a/nUpdate.Administration.TransferInterface/Properties/Settings.Designer.cs b/nUpdate.Administration.TransferInterface/Properties/Settings.Designer.cs index 9ca7a373..96d8bfd6 100644 --- a/nUpdate.Administration.TransferInterface/Properties/Settings.Designer.cs +++ b/nUpdate.Administration.TransferInterface/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.18444 +// Laufzeitversion:4.0.30319.42000 // // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. @@ -12,7 +12,7 @@ namespace nUpdate.Administration.TransferInterface.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")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/nUpdate.Administration.TransferInterface/nUpdate.Administration.TransferInterface.csproj b/nUpdate.Administration.TransferInterface/nUpdate.Administration.TransferInterface.csproj index 97f455f3..15168635 100644 --- a/nUpdate.Administration.TransferInterface/nUpdate.Administration.TransferInterface.csproj +++ b/nUpdate.Administration.TransferInterface/nUpdate.Administration.TransferInterface.csproj @@ -9,7 +9,7 @@ Properties nUpdate.Administration.TransferInterface nUpdate.Administration.TransferInterface - v4.0 + v4.6.1 512 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -31,6 +32,7 @@ TRACE prompt 4 + false @@ -43,8 +45,6 @@ - - diff --git a/nUpdate.Administration/Core/AesManager.cs b/nUpdate.Administration/AesManager.cs similarity index 99% rename from nUpdate.Administration/Core/AesManager.cs rename to nUpdate.Administration/AesManager.cs index 9c1bb02f..21409142 100644 --- a/nUpdate.Administration/Core/AesManager.cs +++ b/nUpdate.Administration/AesManager.cs @@ -6,7 +6,7 @@ using System.Security; using System.Security.Cryptography; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public class AesManager { diff --git a/nUpdate.Administration/App.config b/nUpdate.Administration/App.config index 0a43f629..5a4e9fcd 100644 --- a/nUpdate.Administration/App.config +++ b/nUpdate.Administration/App.config @@ -1,5 +1,4 @@  - @@ -11,7 +10,7 @@
- + @@ -53,19 +52,19 @@ - + - + - + + - - \ No newline at end of file + diff --git a/nUpdate.Administration/Core/CodeDomHelper.cs b/nUpdate.Administration/CodeDomHelper.cs similarity index 97% rename from nUpdate.Administration/Core/CodeDomHelper.cs rename to nUpdate.Administration/CodeDomHelper.cs index 91f0bc5d..0fda4b13 100644 --- a/nUpdate.Administration/Core/CodeDomHelper.cs +++ b/nUpdate.Administration/CodeDomHelper.cs @@ -7,7 +7,7 @@ using System.Linq; using Microsoft.CSharp; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public class CodeDomHelper { diff --git a/nUpdate.Internal/Core/ConnectionManager.cs b/nUpdate.Administration/ConnectionManager.cs similarity index 81% rename from nUpdate.Internal/Core/ConnectionManager.cs rename to nUpdate.Administration/ConnectionManager.cs index b7295e10..92af941f 100644 --- a/nUpdate.Internal/Core/ConnectionManager.cs +++ b/nUpdate.Administration/ConnectionManager.cs @@ -1,9 +1,9 @@ // ConnectionManager.cs, 10.06.2019 // Copyright (C) Dominic Beger 17.06.2019 -using nUpdate.Internal.Core.Win32; +using nUpdate.Administration.Win32; -namespace nUpdate.Internal.Core +namespace nUpdate.Administration { public class ConnectionManager { diff --git a/nUpdate.Administration/Core/Application/Extension/AssociationManager.cs b/nUpdate.Administration/Extension/AssociationManager.cs similarity index 97% rename from nUpdate.Administration/Core/Application/Extension/AssociationManager.cs rename to nUpdate.Administration/Extension/AssociationManager.cs index 54d6793d..5af23144 100644 --- a/nUpdate.Administration/Core/Application/Extension/AssociationManager.cs +++ b/nUpdate.Administration/Extension/AssociationManager.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace nUpdate.Administration.Core.Application.Extension +namespace nUpdate.Administration.Extension { /// /// Provides more streamlined interface for associating a single or multiple extensions with a single program. diff --git a/nUpdate.Administration/Core/Application/Extension/FileAssociationInfo.cs b/nUpdate.Administration/Extension/FileAssociationInfo.cs similarity index 99% rename from nUpdate.Administration/Core/Application/Extension/FileAssociationInfo.cs rename to nUpdate.Administration/Extension/FileAssociationInfo.cs index 446ee84e..3b9549ad 100644 --- a/nUpdate.Administration/Core/Application/Extension/FileAssociationInfo.cs +++ b/nUpdate.Administration/Extension/FileAssociationInfo.cs @@ -6,7 +6,7 @@ using System.Xml.Serialization; using Microsoft.Win32; -namespace nUpdate.Administration.Core.Application.Extension +namespace nUpdate.Administration.Extension { #region Public Enums diff --git a/nUpdate.Administration/Core/Application/Extension/ProgramAssociationInfo.cs b/nUpdate.Administration/Extension/ProgramAssociationInfo.cs similarity index 99% rename from nUpdate.Administration/Core/Application/Extension/ProgramAssociationInfo.cs rename to nUpdate.Administration/Extension/ProgramAssociationInfo.cs index 92982b57..26f11058 100644 --- a/nUpdate.Administration/Core/Application/Extension/ProgramAssociationInfo.cs +++ b/nUpdate.Administration/Extension/ProgramAssociationInfo.cs @@ -6,7 +6,7 @@ using System.Linq; using Microsoft.Win32; -namespace nUpdate.Administration.Core.Application.Extension +namespace nUpdate.Administration.Extension { /// /// Specifies values that control some aspects of the Shell's handling of the file types linked to a ProgID. diff --git a/nUpdate.Administration/Core/Application/Extension/ProgramIcon.cs b/nUpdate.Administration/Extension/ProgramIcon.cs similarity index 98% rename from nUpdate.Administration/Core/Application/Extension/ProgramIcon.cs rename to nUpdate.Administration/Extension/ProgramIcon.cs index 64add893..525f6404 100644 --- a/nUpdate.Administration/Core/Application/Extension/ProgramIcon.cs +++ b/nUpdate.Administration/Extension/ProgramIcon.cs @@ -3,7 +3,7 @@ using System; -namespace nUpdate.Administration.Core.Application.Extension +namespace nUpdate.Administration.Extension { public class ProgramIcon { diff --git a/nUpdate.Administration/Core/Application/Extension/ProgramVerb.cs b/nUpdate.Administration/Extension/ProgramVerb.cs similarity index 94% rename from nUpdate.Administration/Core/Application/Extension/ProgramVerb.cs rename to nUpdate.Administration/Extension/ProgramVerb.cs index a44fb471..b4a52378 100644 --- a/nUpdate.Administration/Core/Application/Extension/ProgramVerb.cs +++ b/nUpdate.Administration/Extension/ProgramVerb.cs @@ -1,7 +1,7 @@ // ProgramVerb.cs, 10.06.2019 // Copyright (C) Dominic Beger 17.06.2019 -namespace nUpdate.Administration.Core.Application.Extension +namespace nUpdate.Administration.Extension { /// /// Provides representation of verb that is used to determine mode file is being opened in. Contained within ProgID. diff --git a/nUpdate.Administration/Core/Application/Extension/RegistryException.cs b/nUpdate.Administration/Extension/RegistryException.cs similarity index 96% rename from nUpdate.Administration/Core/Application/Extension/RegistryException.cs rename to nUpdate.Administration/Extension/RegistryException.cs index dd634c45..64dbe0cf 100644 --- a/nUpdate.Administration/Core/Application/Extension/RegistryException.cs +++ b/nUpdate.Administration/Extension/RegistryException.cs @@ -3,7 +3,7 @@ using System; -namespace nUpdate.Administration.Core.Application.Extension +namespace nUpdate.Administration.Extension { /// /// This exception is thrown when there is an error when reading, writing or modifying file assocation info. diff --git a/nUpdate.Administration/Core/Application/Extension/RegistryWrapper.cs b/nUpdate.Administration/Extension/RegistryWrapper.cs similarity index 98% rename from nUpdate.Administration/Core/Application/Extension/RegistryWrapper.cs rename to nUpdate.Administration/Extension/RegistryWrapper.cs index 0335cdc1..6bdd9974 100644 --- a/nUpdate.Administration/Core/Application/Extension/RegistryWrapper.cs +++ b/nUpdate.Administration/Extension/RegistryWrapper.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Win32; -namespace nUpdate.Administration.Core.Application.Extension +namespace nUpdate.Administration.Extension { /// /// Provides a streamlined interface for reading and writing to the registry. diff --git a/nUpdate.Administration/Core/Application/Extension/ShellNotification.cs b/nUpdate.Administration/Extension/ShellNotification.cs similarity index 99% rename from nUpdate.Administration/Core/Application/Extension/ShellNotification.cs rename to nUpdate.Administration/Extension/ShellNotification.cs index 735c7d44..a34aff46 100644 --- a/nUpdate.Administration/Core/Application/Extension/ShellNotification.cs +++ b/nUpdate.Administration/Extension/ShellNotification.cs @@ -2,9 +2,9 @@ // Copyright (C) Dominic Beger 17.06.2019 using System; -using nUpdate.Administration.Core.Win32; +using nUpdate.Administration.Win32; -namespace nUpdate.Administration.Core.Application.Extension +namespace nUpdate.Administration.Extension { public class ShellNotification { diff --git a/nUpdate.Administration/Core/Extensions.cs b/nUpdate.Administration/Extensions.cs similarity index 98% rename from nUpdate.Administration/Core/Extensions.cs rename to nUpdate.Administration/Extensions.cs index 34dcb40d..6dfd4e3a 100644 --- a/nUpdate.Administration/Core/Extensions.cs +++ b/nUpdate.Administration/Extensions.cs @@ -7,13 +7,13 @@ using System.Runtime.InteropServices; using System.Security; using System.Windows.Forms; -using nUpdate.Administration.Core.Win32; using nUpdate.Administration.TransferInterface; using nUpdate.Administration.UI.Controls; +using nUpdate.Administration.Win32; using Starksoft.Aspen.Ftps; using TransferProgressEventArgs = nUpdate.Administration.TransferInterface.TransferProgressEventArgs; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public static class Extensions { diff --git a/nUpdate.Administration/Core/Ftp/Service/FtpTransferService.cs b/nUpdate.Administration/Ftp/Service/FtpTransferService.cs similarity index 98% rename from nUpdate.Administration/Core/Ftp/Service/FtpTransferService.cs rename to nUpdate.Administration/Ftp/Service/FtpTransferService.cs index 8d39ee18..c46e194c 100644 --- a/nUpdate.Administration/Core/Ftp/Service/FtpTransferService.cs +++ b/nUpdate.Administration/Ftp/Service/FtpTransferService.cs @@ -13,7 +13,7 @@ using Starksoft.Aspen.Proxy; using TransferProgressEventArgs = nUpdate.Administration.TransferInterface.TransferProgressEventArgs; -namespace nUpdate.Administration.Core.Ftp.Service +namespace nUpdate.Administration.Ftp.Service { public class FtpTransferService : ITransferProvider { @@ -264,7 +264,8 @@ private FtpsClient GetNewFtpsClient() DataTransferMode = UsePassiveMode ? TransferMode.Passive : TransferMode.Active, FileTransferType = TransferType.Binary, NetworkProtocol = NetworkVersion, - Proxy = Proxy != null ? new HttpProxyClient(Proxy.Address.ToString()) : null + Proxy = Proxy != null ? new HttpProxyClient(Proxy.Address.ToString()) : null, + AlwaysAcceptServerCertificate = true, }; } diff --git a/nUpdate.Administration/Core/Ftp/Service/TransferServiceProvider.cs b/nUpdate.Administration/Ftp/Service/TransferServiceProvider.cs similarity index 90% rename from nUpdate.Administration/Core/Ftp/Service/TransferServiceProvider.cs rename to nUpdate.Administration/Ftp/Service/TransferServiceProvider.cs index 4d04f7c1..39eb151f 100644 --- a/nUpdate.Administration/Core/Ftp/Service/TransferServiceProvider.cs +++ b/nUpdate.Administration/Ftp/Service/TransferServiceProvider.cs @@ -3,12 +3,12 @@ using System; using System.Collections.Generic; -using nUpdate.Administration.Core.Ftp.Service; +using nUpdate.Administration.Ftp.Service; using nUpdate.Administration.TransferInterface; [assembly: ServiceProvider(typeof(TransferServiceProvider))] -namespace nUpdate.Administration.Core.Ftp.Service +namespace nUpdate.Administration.Ftp.Service { public class TransferServiceProvider : IServiceProvider { diff --git a/nUpdate.Administration/Core/FtpManager.cs b/nUpdate.Administration/FtpManager.cs similarity index 99% rename from nUpdate.Administration/Core/FtpManager.cs rename to nUpdate.Administration/FtpManager.cs index edec1d81..9058d6af 100644 --- a/nUpdate.Administration/Core/FtpManager.cs +++ b/nUpdate.Administration/FtpManager.cs @@ -6,12 +6,12 @@ using System.Net; using System.Reflection; using System.Security; -using nUpdate.Administration.Core.Ftp.Service; +using nUpdate.Administration.Ftp.Service; using nUpdate.Administration.TransferInterface; using Starksoft.Aspen.Ftps; using TransferProgressEventArgs = nUpdate.Administration.TransferInterface.TransferProgressEventArgs; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public class FtpManager { diff --git a/nUpdate.Administration/Core/History/Log.cs b/nUpdate.Administration/History/Log.cs similarity index 96% rename from nUpdate.Administration/Core/History/Log.cs rename to nUpdate.Administration/History/Log.cs index ef205d3d..51142a34 100644 --- a/nUpdate.Administration/Core/History/Log.cs +++ b/nUpdate.Administration/History/Log.cs @@ -5,10 +5,9 @@ using System.Collections.Generic; using System.Drawing; using System.Globalization; -using nUpdate.Administration.Core.Application; using nUpdate.Administration.UI.Popups; -namespace nUpdate.Administration.Core.History +namespace nUpdate.Administration.History { public class Log { diff --git a/nUpdate.Administration/Core/History/LogEntry.cs b/nUpdate.Administration/History/LogEntry.cs similarity index 79% rename from nUpdate.Administration/Core/History/LogEntry.cs rename to nUpdate.Administration/History/LogEntry.cs index a74f6a91..5d063576 100644 --- a/nUpdate.Administration/Core/History/LogEntry.cs +++ b/nUpdate.Administration/History/LogEntry.cs @@ -1,7 +1,7 @@ // LogEntry.cs, 10.06.2019 // Copyright (C) Dominic Beger 17.06.2019 -namespace nUpdate.Administration.Core.History +namespace nUpdate.Administration.History { public enum LogEntry { diff --git a/nUpdate.Administration/Core/IAsyncSupportable.cs b/nUpdate.Administration/IAsyncSupportable.cs similarity index 88% rename from nUpdate.Administration/Core/IAsyncSupportable.cs rename to nUpdate.Administration/IAsyncSupportable.cs index 73338889..201da4f2 100644 --- a/nUpdate.Administration/Core/IAsyncSupportable.cs +++ b/nUpdate.Administration/IAsyncSupportable.cs @@ -1,7 +1,7 @@ // IAsyncSupportable.cs, 10.06.2019 // Copyright (C) Dominic Beger 17.06.2019 -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { /// /// Offers methods that are necessary for asynchronous operations. diff --git a/nUpdate.Administration/Core/IResettable.cs b/nUpdate.Administration/IResettable.cs similarity index 87% rename from nUpdate.Administration/Core/IResettable.cs rename to nUpdate.Administration/IResettable.cs index eeeded6c..eb764703 100644 --- a/nUpdate.Administration/Core/IResettable.cs +++ b/nUpdate.Administration/IResettable.cs @@ -1,7 +1,7 @@ // IResettable.cs, 10.06.2019 // Copyright (C) Dominic Beger 17.06.2019 -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { /// /// Offers methods for resetting data when asynchronous operations failed. diff --git a/nUpdate.Administration/Core/JsonHelper.cs b/nUpdate.Administration/JsonHelper.cs similarity index 98% rename from nUpdate.Administration/Core/JsonHelper.cs rename to nUpdate.Administration/JsonHelper.cs index 2a4c1d55..f0e8bf50 100644 --- a/nUpdate.Administration/Core/JsonHelper.cs +++ b/nUpdate.Administration/JsonHelper.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public class JsonHelper { diff --git a/nUpdate.Administration/Core/ListingItem.cs b/nUpdate.Administration/ListingItem.cs similarity index 96% rename from nUpdate.Administration/Core/ListingItem.cs rename to nUpdate.Administration/ListingItem.cs index e98abfce..20a605d2 100644 --- a/nUpdate.Administration/Core/ListingItem.cs +++ b/nUpdate.Administration/ListingItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public class ListingItem { diff --git a/nUpdate.Administration/Core/Localization/LocalizationProperties.cs b/nUpdate.Administration/Localization/LocalizationProperties.cs similarity index 99% rename from nUpdate.Administration/Core/Localization/LocalizationProperties.cs rename to nUpdate.Administration/Localization/LocalizationProperties.cs index 870c5f37..9c7081bf 100644 --- a/nUpdate.Administration/Core/Localization/LocalizationProperties.cs +++ b/nUpdate.Administration/Localization/LocalizationProperties.cs @@ -3,7 +3,7 @@ using System; -namespace nUpdate.Administration.Core.Localization +namespace nUpdate.Administration.Localization { public class LocalizationProperties { diff --git a/nUpdate.Administration/Core/Navigator.cs b/nUpdate.Administration/Navigator.cs similarity index 97% rename from nUpdate.Administration/Core/Navigator.cs rename to nUpdate.Administration/Navigator.cs index 859d274d..379dd6bf 100644 --- a/nUpdate.Administration/Core/Navigator.cs +++ b/nUpdate.Administration/Navigator.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public class Navigator { diff --git a/nUpdate.Administration/Core/Operations/Panels/FileDeleteOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/FileDeleteOperationPanel.Designer.cs similarity index 99% rename from nUpdate.Administration/Core/Operations/Panels/FileDeleteOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/FileDeleteOperationPanel.Designer.cs index 54886459..ce00fd4a 100644 --- a/nUpdate.Administration/Core/Operations/Panels/FileDeleteOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/FileDeleteOperationPanel.Designer.cs @@ -1,6 +1,6 @@ using nUpdate.Administration.UI.Controls; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class FileDeleteOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/FileDeleteOperationPanel.cs b/nUpdate.Administration/Operations/Panels/FileDeleteOperationPanel.cs similarity index 96% rename from nUpdate.Administration/Core/Operations/Panels/FileDeleteOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/FileDeleteOperationPanel.cs index 9d69b5dc..f001394e 100644 --- a/nUpdate.Administration/Core/Operations/Panels/FileDeleteOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/FileDeleteOperationPanel.cs @@ -7,9 +7,9 @@ using System.Linq; using System.Windows.Forms; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class FileDeleteOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/FileDeleteOperationPanel.resx b/nUpdate.Administration/Operations/Panels/FileDeleteOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/FileDeleteOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/FileDeleteOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/FileRenameOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/FileRenameOperationPanel.Designer.cs similarity index 99% rename from nUpdate.Administration/Core/Operations/Panels/FileRenameOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/FileRenameOperationPanel.Designer.cs index 231f41b4..d7e2c4a6 100644 --- a/nUpdate.Administration/Core/Operations/Panels/FileRenameOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/FileRenameOperationPanel.Designer.cs @@ -1,6 +1,6 @@ using nUpdate.Administration.UI.Controls; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class FileRenameOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/FileRenameOperationPanel.cs b/nUpdate.Administration/Operations/Panels/FileRenameOperationPanel.cs similarity index 95% rename from nUpdate.Administration/Core/Operations/Panels/FileRenameOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/FileRenameOperationPanel.cs index b75e0e4f..361487b0 100644 --- a/nUpdate.Administration/Core/Operations/Panels/FileRenameOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/FileRenameOperationPanel.cs @@ -7,9 +7,9 @@ using System.Windows.Forms; using nUpdate.Administration.UI.Controls; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class FileRenameOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/FileRenameOperationPanel.resx b/nUpdate.Administration/Operations/Panels/FileRenameOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/FileRenameOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/FileRenameOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/IOperationPanel.cs b/nUpdate.Administration/Operations/Panels/IOperationPanel.cs similarity index 81% rename from nUpdate.Administration/Core/Operations/Panels/IOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/IOperationPanel.cs index 9795077b..ec7f2396 100644 --- a/nUpdate.Administration/Core/Operations/Panels/IOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/IOperationPanel.cs @@ -1,9 +1,9 @@ // IOperationPanel.cs, 10.06.2019 // Copyright (C) Dominic Beger 17.06.2019 -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public interface IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ProcessStartOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/ProcessStartOperationPanel.Designer.cs similarity index 99% rename from nUpdate.Administration/Core/Operations/Panels/ProcessStartOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/ProcessStartOperationPanel.Designer.cs index b65ba33a..9ffec1fd 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ProcessStartOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/ProcessStartOperationPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class ProcessStartOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ProcessStartOperationPanel.cs b/nUpdate.Administration/Operations/Panels/ProcessStartOperationPanel.cs similarity index 94% rename from nUpdate.Administration/Core/Operations/Panels/ProcessStartOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/ProcessStartOperationPanel.cs index fd3c421b..40ec0d77 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ProcessStartOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/ProcessStartOperationPanel.cs @@ -5,9 +5,9 @@ using System.Drawing; using System.Windows.Forms; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class ProcessStartOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ProcessStartOperationPanel.resx b/nUpdate.Administration/Operations/Panels/ProcessStartOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/ProcessStartOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/ProcessStartOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/ProcessStopOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/ProcessStopOperationPanel.Designer.cs similarity index 98% rename from nUpdate.Administration/Core/Operations/Panels/ProcessStopOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/ProcessStopOperationPanel.Designer.cs index 04b76185..d0eea3e4 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ProcessStopOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/ProcessStopOperationPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class ProcessStopOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ProcessStopOperationPanel.cs b/nUpdate.Administration/Operations/Panels/ProcessStopOperationPanel.cs similarity index 91% rename from nUpdate.Administration/Core/Operations/Panels/ProcessStopOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/ProcessStopOperationPanel.cs index 978c2af5..a91c357c 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ProcessStopOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/ProcessStopOperationPanel.cs @@ -5,9 +5,9 @@ using System.Drawing; using System.Windows.Forms; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class ProcessStopOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ProcessStopOperationPanel.resx b/nUpdate.Administration/Operations/Panels/ProcessStopOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/ProcessStopOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/ProcessStopOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistryDeleteValueOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/RegistryDeleteValueOperationPanel.Designer.cs similarity index 99% rename from nUpdate.Administration/Core/Operations/Panels/RegistryDeleteValueOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/RegistryDeleteValueOperationPanel.Designer.cs index 6f92926a..191c296e 100644 --- a/nUpdate.Administration/Core/Operations/Panels/RegistryDeleteValueOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/RegistryDeleteValueOperationPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class RegistryDeleteValueOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistryDeleteValueOperationPanel.cs b/nUpdate.Administration/Operations/Panels/RegistryDeleteValueOperationPanel.cs similarity index 95% rename from nUpdate.Administration/Core/Operations/Panels/RegistryDeleteValueOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/RegistryDeleteValueOperationPanel.cs index 8c9d3331..4baa5152 100644 --- a/nUpdate.Administration/Core/Operations/Panels/RegistryDeleteValueOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/RegistryDeleteValueOperationPanel.cs @@ -5,9 +5,9 @@ using System.ComponentModel; using System.Linq; using System.Windows.Forms; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class RegistryDeleteValueOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistryDeleteValueOperationPanel.resx b/nUpdate.Administration/Operations/Panels/RegistryDeleteValueOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/RegistryDeleteValueOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/RegistryDeleteValueOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySetValueOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/RegistrySetValueOperationPanel.Designer.cs similarity index 99% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySetValueOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/RegistrySetValueOperationPanel.Designer.cs index c058b913..6c409293 100644 --- a/nUpdate.Administration/Core/Operations/Panels/RegistrySetValueOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/RegistrySetValueOperationPanel.Designer.cs @@ -1,6 +1,6 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class RegistrySetValueOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySetValueOperationPanel.cs b/nUpdate.Administration/Operations/Panels/RegistrySetValueOperationPanel.cs similarity index 97% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySetValueOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/RegistrySetValueOperationPanel.cs index 76aa8080..ad614900 100644 --- a/nUpdate.Administration/Core/Operations/Panels/RegistrySetValueOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/RegistrySetValueOperationPanel.cs @@ -6,9 +6,9 @@ using System.Linq; using System.Windows.Forms; using Microsoft.Win32; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class RegistrySetValueOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySetValueOperationPanel.resx b/nUpdate.Administration/Operations/Panels/RegistrySetValueOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySetValueOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/RegistrySetValueOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyCreateOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/RegistrySubKeyCreateOperationPanel.Designer.cs similarity index 99% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyCreateOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/RegistrySubKeyCreateOperationPanel.Designer.cs index 786a56f3..575b6d3b 100644 --- a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyCreateOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/RegistrySubKeyCreateOperationPanel.Designer.cs @@ -1,6 +1,6 @@ using nUpdate.Administration.UI.Controls; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class RegistrySubKeyCreateOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyCreateOperationPanel.cs b/nUpdate.Administration/Operations/Panels/RegistrySubKeyCreateOperationPanel.cs similarity index 95% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyCreateOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/RegistrySubKeyCreateOperationPanel.cs index b8b95833..becf520d 100644 --- a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyCreateOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/RegistrySubKeyCreateOperationPanel.cs @@ -5,9 +5,9 @@ using System.ComponentModel; using System.Linq; using System.Windows.Forms; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class RegistrySubKeyCreateOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyCreateOperationPanel.resx b/nUpdate.Administration/Operations/Panels/RegistrySubKeyCreateOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyCreateOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/RegistrySubKeyCreateOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyDeleteOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/RegistrySubKeyDeleteOperationPanel.Designer.cs similarity index 99% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyDeleteOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/RegistrySubKeyDeleteOperationPanel.Designer.cs index f3b5013d..f23fe281 100644 --- a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyDeleteOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/RegistrySubKeyDeleteOperationPanel.Designer.cs @@ -1,6 +1,6 @@ using nUpdate.Administration.UI.Controls; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class RegistrySubKeyDeleteOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyDeleteOperationPanel.cs b/nUpdate.Administration/Operations/Panels/RegistrySubKeyDeleteOperationPanel.cs similarity index 95% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyDeleteOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/RegistrySubKeyDeleteOperationPanel.cs index 8d0730b4..f68c674c 100644 --- a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyDeleteOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/RegistrySubKeyDeleteOperationPanel.cs @@ -5,9 +5,9 @@ using System.ComponentModel; using System.Linq; using System.Windows.Forms; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class RegistrySubKeyDeleteOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyDeleteOperationPanel.resx b/nUpdate.Administration/Operations/Panels/RegistrySubKeyDeleteOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/RegistrySubKeyDeleteOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/RegistrySubKeyDeleteOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/ScriptExecuteOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/ScriptExecuteOperationPanel.Designer.cs similarity index 99% rename from nUpdate.Administration/Core/Operations/Panels/ScriptExecuteOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/ScriptExecuteOperationPanel.Designer.cs index 6fbb9ff7..7c886d7b 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ScriptExecuteOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/ScriptExecuteOperationPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class ScriptExecuteOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ScriptExecuteOperationPanel.cs b/nUpdate.Administration/Operations/Panels/ScriptExecuteOperationPanel.cs similarity index 98% rename from nUpdate.Administration/Core/Operations/Panels/ScriptExecuteOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/ScriptExecuteOperationPanel.cs index b858552e..2c691a9c 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ScriptExecuteOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/ScriptExecuteOperationPanel.cs @@ -11,9 +11,9 @@ using System.Windows.Forms; using FastColoredTextBoxNS; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class ScriptExecuteOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ScriptExecuteOperationPanel.resx b/nUpdate.Administration/Operations/Panels/ScriptExecuteOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/ScriptExecuteOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/ScriptExecuteOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/ServiceStartOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/ServiceStartOperationPanel.Designer.cs similarity index 98% rename from nUpdate.Administration/Core/Operations/Panels/ServiceStartOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/ServiceStartOperationPanel.Designer.cs index 150cdab9..7a60fbc7 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ServiceStartOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/ServiceStartOperationPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class ServiceStartOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ServiceStartOperationPanel.cs b/nUpdate.Administration/Operations/Panels/ServiceStartOperationPanel.cs similarity index 94% rename from nUpdate.Administration/Core/Operations/Panels/ServiceStartOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/ServiceStartOperationPanel.cs index 9cf6098a..804c6830 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ServiceStartOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/ServiceStartOperationPanel.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class ServiceStartOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ServiceStartOperationPanel.resx b/nUpdate.Administration/Operations/Panels/ServiceStartOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/ServiceStartOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/ServiceStartOperationPanel.resx diff --git a/nUpdate.Administration/Core/Operations/Panels/ServiceStopOperationPanel.Designer.cs b/nUpdate.Administration/Operations/Panels/ServiceStopOperationPanel.Designer.cs similarity index 98% rename from nUpdate.Administration/Core/Operations/Panels/ServiceStopOperationPanel.Designer.cs rename to nUpdate.Administration/Operations/Panels/ServiceStopOperationPanel.Designer.cs index d51c88db..6f0c31a9 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ServiceStopOperationPanel.Designer.cs +++ b/nUpdate.Administration/Operations/Panels/ServiceStopOperationPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { partial class ServiceStopOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ServiceStopOperationPanel.cs b/nUpdate.Administration/Operations/Panels/ServiceStopOperationPanel.cs similarity index 87% rename from nUpdate.Administration/Core/Operations/Panels/ServiceStopOperationPanel.cs rename to nUpdate.Administration/Operations/Panels/ServiceStopOperationPanel.cs index 9efbdf8e..d13cb62c 100644 --- a/nUpdate.Administration/Core/Operations/Panels/ServiceStopOperationPanel.cs +++ b/nUpdate.Administration/Operations/Panels/ServiceStopOperationPanel.cs @@ -2,9 +2,9 @@ // Copyright (C) Dominic Beger 17.06.2019 using System.Windows.Forms; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; -namespace nUpdate.Administration.Core.Operations.Panels +namespace nUpdate.Administration.Operations.Panels { public partial class ServiceStopOperationPanel : UserControl, IOperationPanel { diff --git a/nUpdate.Administration/Core/Operations/Panels/ServiceStopOperationPanel.resx b/nUpdate.Administration/Operations/Panels/ServiceStopOperationPanel.resx similarity index 100% rename from nUpdate.Administration/Core/Operations/Panels/ServiceStopOperationPanel.resx rename to nUpdate.Administration/Operations/Panels/ServiceStopOperationPanel.resx diff --git a/nUpdate.Administration/Program.cs b/nUpdate.Administration/Program.cs index 47d9cba9..33212765 100644 --- a/nUpdate.Administration/Program.cs +++ b/nUpdate.Administration/Program.cs @@ -58,7 +58,7 @@ public static class Program /// /// The version string shown in all dialog titles. /// - public static string VersionString => "nUpdate Administration v3.5.0"; + public static string VersionString => "nUpdate Administration v4.0.0"; private static void Exit(object sender, EventArgs e) { diff --git a/nUpdate.Administration/Core/ProjectConfiguration.cs b/nUpdate.Administration/ProjectConfiguration.cs similarity index 94% rename from nUpdate.Administration/Core/ProjectConfiguration.cs rename to nUpdate.Administration/ProjectConfiguration.cs index b2e273aa..d715a419 100644 --- a/nUpdate.Administration/Core/ProjectConfiguration.cs +++ b/nUpdate.Administration/ProjectConfiguration.cs @@ -5,9 +5,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using nUpdate.Internal.Core; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { [Serializable] public class ProjectConfiguration diff --git a/nUpdate.Administration/Properties/AssemblyInfo.cs b/nUpdate.Administration/Properties/AssemblyInfo.cs index 55ee0e80..0c4f9fb0 100644 --- a/nUpdate.Administration/Properties/AssemblyInfo.cs +++ b/nUpdate.Administration/Properties/AssemblyInfo.cs @@ -39,6 +39,6 @@ // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.5.0.0")] -[assembly: AssemblyFileVersion("3.5.0.0")] +[assembly: AssemblyVersion("4.0.*")] +[assembly: AssemblyFileVersion("4.0.0.0")] [assembly: NeutralResourcesLanguage("")] \ No newline at end of file diff --git a/nUpdate.Administration/Properties/Resources.Designer.cs b/nUpdate.Administration/Properties/Resources.Designer.cs index fc0f7ae1..aaf78d03 100644 --- a/nUpdate.Administration/Properties/Resources.Designer.cs +++ b/nUpdate.Administration/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace nUpdate.Administration.Properties { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.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()] internal class Resources { diff --git a/nUpdate.Administration/Properties/Settings.Designer.cs b/nUpdate.Administration/Properties/Settings.Designer.cs index 06768c79..cccc1021 100644 --- a/nUpdate.Administration/Properties/Settings.Designer.cs +++ b/nUpdate.Administration/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace nUpdate.Administration.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.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/nUpdate.Administration/Core/ServiceProviderHelper.cs b/nUpdate.Administration/ServiceProviderHelper.cs similarity index 95% rename from nUpdate.Administration/Core/ServiceProviderHelper.cs rename to nUpdate.Administration/ServiceProviderHelper.cs index cca9d4a5..b437caee 100644 --- a/nUpdate.Administration/Core/ServiceProviderHelper.cs +++ b/nUpdate.Administration/ServiceProviderHelper.cs @@ -6,7 +6,7 @@ using System.Reflection; using nUpdate.Administration.TransferInterface; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public class ServiceProviderHelper { diff --git a/nUpdate.Administration/Core/StatisticsServer.cs b/nUpdate.Administration/StatisticsServer.cs similarity index 95% rename from nUpdate.Administration/Core/StatisticsServer.cs rename to nUpdate.Administration/StatisticsServer.cs index 286f1de7..c6891db0 100644 --- a/nUpdate.Administration/Core/StatisticsServer.cs +++ b/nUpdate.Administration/StatisticsServer.cs @@ -3,7 +3,7 @@ using System; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { [Serializable] public class StatisticsServer diff --git a/nUpdate.Administration/UI/Controls/BottomPanel.cs b/nUpdate.Administration/UI/Controls/BottomPanel.cs new file mode 100644 index 00000000..a8e6a940 --- /dev/null +++ b/nUpdate.Administration/UI/Controls/BottomPanel.cs @@ -0,0 +1,75 @@ +// BottomPanel.cs, 10.06.2019 +// Copyright (C) Dominic Beger 17.06.2019 + +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; +using System.Windows.Forms.VisualStyles; + +namespace nUpdate.Administration.UI.Controls +{ + /// + /// A "Bottom Panel" drawn by Windows via Visual Styles if available. + /// This Panel can be used for providing additional information or Buttons on the bottom of a Form/Dialog. + /// + /// + /// The panel is drawn with Visual Styles (TaskDialog > SecondaryPanel). If running on XP or another OS, the panel is + /// drawn manually + /// + [DesignerCategory("Code")] + [DisplayName("Bottom Panel")] + [Description( + "A \"Bottom Panel\" that can be used for providing additional information or Buttons on the bottom of a Form/Dialog." + )] + [ToolboxItem(true)] + [ToolboxBitmap(typeof(Panel))] + public class BottomPanel + : Panel + { + /// + /// Initializes a new instance of the class. + /// + public BottomPanel() + { + SetStyle( + ControlStyles.AllPaintingInWmPaint | ControlStyles.OptimizedDoubleBuffer | ControlStyles.ResizeRedraw | + ControlStyles.UserPaint, true); + UpdateStyles(); + } + + /// + /// Raises the event. + /// + /// The instance containing the event data. + protected override void OnPaint(PaintEventArgs e) + { + if (Application.RenderWithVisualStyles && + VisualStyleRenderer.IsElementDefined(VisualStyleElement.CreateElement("TaskDialog", 8, 0))) + PaintWithVisualStyles(e.Graphics); + else + PaintManually(e.Graphics); + + base.OnPaint(e); + } + + /// + /// Paints the button manually. + /// + /// The targeted graphics. + protected virtual void PaintManually(Graphics g) + { + g.Clear(SystemColors.Control); + g.DrawLine(SystemPens.ControlDark, new Point(0, 0), new Point(Width, 0)); + } + + /// + /// Paints the panel with visual styles. + /// + /// The targeted graphics. + protected virtual void PaintWithVisualStyles(Graphics g) + { + //Draw panel + new VisualStyleRenderer("TaskDialog", 8, 0).DrawBackground(g, DisplayRectangle); + } + } +} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Controls/ButtonTextBox.cs b/nUpdate.Administration/UI/Controls/ButtonTextBox.cs index 2acece47..37896a2b 100644 --- a/nUpdate.Administration/UI/Controls/ButtonTextBox.cs +++ b/nUpdate.Administration/UI/Controls/ButtonTextBox.cs @@ -4,7 +4,7 @@ using System; using System.Drawing; using System.Windows.Forms; -using nUpdate.Administration.Core.Win32; +using nUpdate.Administration.Win32; namespace nUpdate.Administration.UI.Controls { diff --git a/nUpdate.Administration/UI/Controls/CommandLink.cs b/nUpdate.Administration/UI/Controls/CommandLink.cs index 9af0ee27..da536f2c 100644 --- a/nUpdate.Administration/UI/Controls/CommandLink.cs +++ b/nUpdate.Administration/UI/Controls/CommandLink.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Windows.Forms; -using nUpdate.Administration.Core.Win32; +using nUpdate.Administration.Win32; namespace nUpdate.Administration.UI.Controls { diff --git a/nUpdate.Administration/UI/Controls/CueTextBox.cs b/nUpdate.Administration/UI/Controls/CueTextBox.cs index 8af9dad2..ceaefc8b 100644 --- a/nUpdate.Administration/UI/Controls/CueTextBox.cs +++ b/nUpdate.Administration/UI/Controls/CueTextBox.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; using System.Windows.Forms; -using nUpdate.Administration.Core.Win32; +using nUpdate.Administration.Win32; namespace nUpdate.Administration.UI.Controls { diff --git a/nUpdate.Administration/UI/Controls/ExplorerListView.cs b/nUpdate.Administration/UI/Controls/ExplorerListView.cs index c47d9409..5288d318 100644 --- a/nUpdate.Administration/UI/Controls/ExplorerListView.cs +++ b/nUpdate.Administration/UI/Controls/ExplorerListView.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; -using nUpdate.Administration.Core.Win32; +using nUpdate.Administration.Win32; namespace nUpdate.Administration.UI.Controls { diff --git a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/AeroTemplate.cs b/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/AeroTemplate.cs deleted file mode 100644 index 69ec661a..00000000 --- a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/AeroTemplate.cs +++ /dev/null @@ -1,220 +0,0 @@ -// AeroTemplate.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System.Drawing; -using System.Drawing.Drawing2D; - -namespace ExplorerNavigationButton -{ - public partial class ExplorerNavigationButton - { - private class AeroTemplate : Template - { - private readonly GraphicsPath _arrowPath; - private readonly RectangleF _backgroundRect; - private readonly Pen _disabledArrowPen; - private readonly SolidBrush _disabledLowerBackgroundBrush; - private readonly PathGradientBrush _disabledLowerBrush; - private readonly SolidBrush _disabledUpperBackgroundBrush; - private readonly PathGradientBrush _disabledUpperBrush; - private readonly SolidBrush _hoverBackgrounBrush; - private readonly PathGradientBrush _hoverLowerBackgroundBrush; - private readonly PathGradientBrush _hoverUpperBackgroundBrush; - private readonly GraphicsPath _lowerBackgroundPath; - private readonly Pen _normalArrowPen; - private readonly SolidBrush _normalBackgrounBrush; - private readonly PathGradientBrush _normalLowerBackgroundBrush; - private readonly PathGradientBrush _normalUpperBackgroundBrush; - private readonly SolidBrush _pressedBackgrounBrush; - private readonly PathGradientBrush _pressedLowerBackgroundBrush; - private readonly PathGradientBrush _pressedUpperBackgroundBrush; - private readonly GraphicsPath _upperBackgroundPath; - - public AeroTemplate() - { - _backgroundRect = new RectangleF(0.5f, 0.5f, 23, 23); - - _normalBackgrounBrush = new SolidBrush(Color.FromArgb(0, 35, 130)); - _hoverBackgrounBrush = new SolidBrush(Color.FromArgb(0, 55, 150)); - _pressedBackgrounBrush = new SolidBrush(Color.FromArgb(0, 10, 50)); - - _upperBackgroundPath = new GraphicsPath(); - _upperBackgroundPath.AddArc(_backgroundRect, 180, 180); - _upperBackgroundPath.CloseFigure(); - - _lowerBackgroundPath = new GraphicsPath(); - _lowerBackgroundPath.AddArc(_backgroundRect, 0, 180); - _lowerBackgroundPath.CloseFigure(); - - var path1 = new GraphicsPath(); - path1.AddEllipse(new RectangleF(_backgroundRect.X - 2, _backgroundRect.Y, _backgroundRect.Width + 4, - _backgroundRect.Height + 10)); - _normalUpperBackgroundBrush = new PathGradientBrush(path1); - var blend1 = new ColorBlend(); - blend1.Colors = new[] - {Color.FromArgb(240, Color.White), Color.FromArgb(50, 110, 180), Color.FromArgb(50, 110, 180)}; - blend1.Positions = new[] {0f, 0.3f, 1f}; - _normalUpperBackgroundBrush.InterpolationColors = blend1; - _hoverUpperBackgroundBrush = new PathGradientBrush(path1); - var blend9 = new ColorBlend(); - blend9.Colors = new[] {Color.White, Color.FromArgb(65, 150, 240), Color.FromArgb(65, 150, 240)}; - blend9.Positions = new[] {0f, 0.3f, 1f}; - _pressedUpperBackgroundBrush = new PathGradientBrush(path1); - _hoverUpperBackgroundBrush.InterpolationColors = blend9; - var blend8 = new ColorBlend(); - blend8.Colors = new[] - {Color.FromArgb(200, Color.White), Color.FromArgb(35, 70, 120), Color.FromArgb(35, 70, 120)}; - blend8.Positions = new[] {0f, 0.4f, 1f}; - _pressedUpperBackgroundBrush.InterpolationColors = blend8; - path1.Dispose(); - - var path2 = new GraphicsPath(); - path2.AddEllipse(new RectangleF(-16, 13, 56, 20)); - _normalLowerBackgroundBrush = new PathGradientBrush(path2); - var blend2 = new ColorBlend(); - blend2.Colors = new[] - {Color.FromArgb(0, 35, 130), Color.FromArgb(60, 195, 235), Color.FromArgb(200, 250, 255)}; - blend2.Positions = new[] {0f, 0.7f, 1f}; - _normalLowerBackgroundBrush.InterpolationColors = blend2; - _hoverLowerBackgroundBrush = new PathGradientBrush(path2); - var blend10 = new ColorBlend(); - blend10.Colors = new[] - {Color.FromArgb(0, 55, 150), Color.FromArgb(60, 195, 235), Color.FromArgb(200, 250, 255)}; - blend10.Positions = new[] {0f, 0.7f, 1f}; - _hoverLowerBackgroundBrush.InterpolationColors = blend10; - _pressedLowerBackgroundBrush = new PathGradientBrush(path2); - var blend7 = new ColorBlend(); - blend7.Colors = new[] - {Color.FromArgb(0, 10, 50), Color.FromArgb(60, 195, 235), Color.FromArgb(200, 250, 255)}; - blend7.Positions = new[] {0f, 0.7f, 1f}; - _pressedLowerBackgroundBrush.InterpolationColors = blend7; - path2.Dispose(); - - _arrowPath = new GraphicsPath(); - var arrowTop = new PointF(7f, 12f); - _arrowPath.AddLine(new PointF(11.5f, 17f), arrowTop); - _arrowPath.AddLine(arrowTop, new PointF(11.5f, 7f)); - _arrowPath.StartFigure(); - _arrowPath.AddLine(arrowTop, new PointF(17, 12f)); - - var arrowBrush = new LinearGradientBrush(_backgroundRect, Color.Transparent, Color.Transparent, - LinearGradientMode.Vertical); - var blend3 = new ColorBlend(); - blend3.Colors = new[] {Color.White, Color.White, Color.FromArgb(130, 130, 130)}; - blend3.Positions = new[] {0, 0.5f, 1}; - arrowBrush.InterpolationColors = blend3; - - _normalArrowPen = new Pen(arrowBrush, 3.5f); - _normalArrowPen.StartCap = LineCap.Round; - _normalArrowPen.EndCap = LineCap.Round; - arrowBrush.Dispose(); - - _disabledUpperBackgroundBrush = new SolidBrush(Color.FromArgb(193, 215, 245)); - _disabledLowerBackgroundBrush = new SolidBrush(Color.FromArgb(160, 195, 225)); - - var disabledArrowBrush = new LinearGradientBrush(_backgroundRect, Color.Transparent, Color.Transparent, - LinearGradientMode.Vertical); - var blend4 = new ColorBlend(); - blend4.Colors = new[] - {Color.FromArgb(215, 230, 250), Color.FromArgb(215, 230, 250), Color.FromArgb(165, 190, 230)}; - blend4.Positions = new[] {0, 0.5f, 1}; - disabledArrowBrush.InterpolationColors = blend4; - - _disabledArrowPen = new Pen(disabledArrowBrush, 3.5f); - _disabledArrowPen.StartCap = LineCap.Round; - _disabledArrowPen.EndCap = LineCap.Round; - disabledArrowBrush.Dispose(); - - var path3 = new GraphicsPath(); - path3.AddEllipse(new RectangleF(_backgroundRect.X - 6, _backgroundRect.Y, _backgroundRect.Width + 12, - _backgroundRect.Height + 12)); - _disabledUpperBrush = new PathGradientBrush(path3); - var blend5 = new ColorBlend(); - blend5.Colors = new[] {Color.FromArgb(200, Color.White), Color.Transparent, Color.Transparent}; - blend5.Positions = new[] {0f, 0.3f, 1f}; - _disabledUpperBrush.InterpolationColors = blend5; - path3.Dispose(); - - var path4 = new GraphicsPath(); - path4.AddEllipse(new RectangleF(_backgroundRect.X - 2, _backgroundRect.Y, _backgroundRect.Width + 4, - _backgroundRect.Height)); - _disabledLowerBrush = new PathGradientBrush(path4); - var blend6 = new ColorBlend(); - blend6.Colors = new[] {Color.FromArgb(150, Color.White), Color.Transparent, Color.Transparent}; - blend6.Positions = new[] {0f, 0.3f, 1f}; - _disabledLowerBrush.InterpolationColors = blend6; - path4.Dispose(); - } - - protected override void Dispose(bool disposing) - { - _upperBackgroundPath.Dispose(); - _lowerBackgroundPath.Dispose(); - _arrowPath.Dispose(); - _normalBackgrounBrush.Dispose(); - _normalUpperBackgroundBrush.Dispose(); - _normalLowerBackgroundBrush.Dispose(); - _normalArrowPen.Dispose(); - - _hoverBackgrounBrush.Dispose(); - _hoverUpperBackgroundBrush.Dispose(); - _hoverLowerBackgroundBrush.Dispose(); - - _pressedBackgrounBrush.Dispose(); - _pressedUpperBackgroundBrush.Dispose(); - _pressedLowerBackgroundBrush.Dispose(); - - _disabledUpperBackgroundBrush.Dispose(); - _disabledLowerBackgroundBrush.Dispose(); - _disabledArrowPen.Dispose(); - _disabledUpperBrush.Dispose(); - _disabledLowerBrush.Dispose(); - } - - protected override void DrawDisabled(Graphics g, ArrowDirection direction) - { - g.FillPath(_disabledUpperBackgroundBrush, _upperBackgroundPath); - g.FillPath(_disabledLowerBackgroundBrush, _lowerBackgroundPath); - g.FillPath(_disabledUpperBrush, _upperBackgroundPath); - g.FillPath(_disabledLowerBrush, _lowerBackgroundPath); - - if (direction == ArrowDirection.Right) - g.MultiplyTransform(new Matrix(-1, 0, 0, 1, 24f, 0)); - g.DrawPath(_disabledArrowPen, _arrowPath); - } - - protected override void DrawHover(Graphics g, ArrowDirection direction) - { - g.FillPath(_hoverBackgrounBrush, _lowerBackgroundPath); - g.FillPath(_hoverUpperBackgroundBrush, _upperBackgroundPath); - g.FillEllipse(_hoverLowerBackgroundBrush, _backgroundRect); - - if (direction == ArrowDirection.Right) - g.MultiplyTransform(new Matrix(-1, 0, 0, 1, 24f, 0)); - g.DrawPath(_normalArrowPen, _arrowPath); - } - - protected override void DrawNormal(Graphics g, ArrowDirection direction) - { - g.FillPath(_normalBackgrounBrush, _lowerBackgroundPath); - g.FillPath(_normalUpperBackgroundBrush, _upperBackgroundPath); - g.FillEllipse(_normalLowerBackgroundBrush, _backgroundRect); - - if (direction == ArrowDirection.Right) - g.MultiplyTransform(new Matrix(-1, 0, 0, 1, 24f, 0)); - g.DrawPath(_normalArrowPen, _arrowPath); - } - - protected override void DrawPressed(Graphics g, ArrowDirection direction) - { - g.FillPath(_pressedBackgrounBrush, _lowerBackgroundPath); - g.FillPath(_pressedUpperBackgroundBrush, _upperBackgroundPath); - g.FillEllipse(_pressedLowerBackgroundBrush, _backgroundRect); - - if (direction == ArrowDirection.Right) - g.MultiplyTransform(new Matrix(-1, 0, 0, 1, 24f, 0)); - g.DrawPath(_normalArrowPen, _arrowPath); - } - } - } -} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ArrowDirection.cs b/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ArrowDirection.cs deleted file mode 100644 index b4aa305b..00000000 --- a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ArrowDirection.cs +++ /dev/null @@ -1,21 +0,0 @@ -// ArrowDirection.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -namespace ExplorerNavigationButton -{ - /// - /// The direction of an arrow. - /// - public enum ArrowDirection - { - /// - /// The arrow points to the left. - /// - Left, - - /// - /// The arrow points to the right. - /// - Right - } -} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ButtonState.cs b/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ButtonState.cs deleted file mode 100644 index 204f6e84..00000000 --- a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ButtonState.cs +++ /dev/null @@ -1,16 +0,0 @@ -// ButtonState.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -namespace ExplorerNavigationButton -{ - public partial class ExplorerNavigationButton - { - private enum ButtonState - { - Normal, - Hover, - Pressed, - Disabled - } - } -} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ButtonTheme.cs b/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ButtonTheme.cs deleted file mode 100644 index a3593817..00000000 --- a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ButtonTheme.cs +++ /dev/null @@ -1,31 +0,0 @@ -// ButtonTheme.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -namespace ExplorerNavigationButton -{ - /// - /// The theme of the ExplorerNavigationButton. - /// - public enum ButtonTheme - { - /// - /// The control chooses its theme automatically. - /// - Auto, - - /// - /// The default theme. - /// - Default, - - /// - /// The aero theme. - /// - Aero, - - /// - /// The metro theme. - /// - Metro - } -} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ExplorerNavigationButton.cs b/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ExplorerNavigationButton.cs deleted file mode 100644 index e82ec70e..00000000 --- a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/ExplorerNavigationButton.cs +++ /dev/null @@ -1,237 +0,0 @@ -// ExplorerNavigationButton.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System; -using System.ComponentModel; -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Windows.Forms; -using System.Windows.Forms.VisualStyles; -using nUpdate.Administration.Properties; - -namespace ExplorerNavigationButton -{ - /// - /// A button with the appearance of the explorer's navigation buttons. - /// - /// The control switches its appearance based on the current operating system to fit the explorer's appearance. - [Description("A button with the appearance of the explorer navigation buttons.")] - public partial class ExplorerNavigationButton : Control - { - private readonly Bitmap[] _arrows; - private ArrowDirection _arrowDirection; - private ButtonState _state; - private Template _template; - private ButtonTheme _theme; - - /// - /// Creates a new ExplorerNavigationButton. - /// - public ExplorerNavigationButton() - { - SetStyle( - ControlStyles.AllPaintingInWmPaint | ControlStyles.OptimizedDoubleBuffer | ControlStyles.ResizeRedraw | - ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true); - UpdateStyles(); - - Size = new Size(24, 24); - - _arrows = new Bitmap[4]; - _arrows[0] = Resources.Left_Normal; - _arrows[1] = Resources.Right_Normal; - _arrows[2] = Resources.Left_Disabled; - _arrows[3] = Resources.Right_Disabled; - - _template = AutoSelectTemplate(); - } - - /// - /// Indicates the direction of the arrow. - /// - [Category("Appearance")] - [Description("Indicates the direction of the arrow.")] - [DefaultValue(ArrowDirection.Left)] - public ArrowDirection ArrowDirection - { - get => _arrowDirection; - set - { - if (value != _arrowDirection) - { - _arrowDirection = value; - Invalidate(); - - OnArrowDirectionChanged(EventArgs.Empty); - } - } - } - - /// - /// Indicates the theme of this button. - /// - [Category("Appearance")] - [Description("Indicates the theme of this button.")] - [DefaultValue(ButtonTheme.Auto)] - public ButtonTheme Theme - { - get => _theme; - set - { - if (value != _theme) - { - _theme = value; - - if (_template != null) - _template.Dispose(); - - _template = SelectTemplate(_theme); - Invalidate(); - OnTemplateChanged(EventArgs.Empty); - } - } - } - - /// - /// Is risen if the arrow direction has changed. - /// - [Category("Appearance")] - [Description("Is risen if the arrow direction has changed.")] - public event EventHandler ArrowDirectionChanged; - - private Template AutoSelectTemplate() - { - if (Application.RenderWithVisualStyles) - { - var metroVersion = new Version(6, 2); - var aeroVersion = new Version(6, 0); - - var version = Environment.OSVersion.Version; - if (version >= metroVersion) - return new MetroTemplate(); - if (version >= aeroVersion) - return new AeroTemplate(); - } - - return null; - } - - protected override void Dispose(bool disposing) - { - foreach (var bmp in _arrows) bmp.Dispose(); - - if (_template != null) - _template.Dispose(); - - base.Dispose(disposing); - } - - private void DrawDefault(Graphics g, ArrowDirection direction, ButtonState state) - { - var arrowIndex = (int) direction; - if (state == ButtonState.Disabled) - arrowIndex += 2; - - var arrowSize = Math.Min(16, Math.Min(Width, Height)); - var arrowRect = new Rectangle((Width - arrowSize) / 2, (Height - arrowSize) / 2, arrowSize, arrowSize); - - ButtonRenderer.DrawButton(g, ClientRectangle, _arrows[arrowIndex], arrowRect, false, - (PushButtonState) (state + 1)); - } - - protected virtual void OnArrowDirectionChanged(EventArgs e) - { - if (ArrowDirectionChanged != null) - ArrowDirectionChanged(this, e); - } - - protected override void OnEnabledChanged(EventArgs e) - { - Invalidate(); - - base.OnEnabledChanged(e); - } - - protected override void OnMouseDown(MouseEventArgs e) - { - _state = ButtonState.Pressed; - Invalidate(); - - base.OnMouseDown(e); - } - - protected override void OnMouseEnter(EventArgs e) - { - _state = ButtonState.Hover; - Invalidate(); - - base.OnMouseEnter(e); - } - - protected override void OnMouseLeave(EventArgs e) - { - _state = ButtonState.Normal; - Invalidate(); - - base.OnMouseLeave(e); - } - - protected override void OnMouseUp(MouseEventArgs e) - { - _state = ButtonState.Hover; - Invalidate(); - - base.OnMouseUp(e); - } - - protected override void OnPaint(PaintEventArgs e) - { - if (_template != null) - { - var g = e.Graphics; - g.SmoothingMode = SmoothingMode.AntiAlias; - g.PixelOffsetMode = PixelOffsetMode.HighQuality; - - var buttonSize = Math.Min(Width, Height); - var sizeFactor = buttonSize / 24.0f; - g.Transform = new Matrix(sizeFactor, 0, 0, sizeFactor, (Width - buttonSize) / 2.0f, - (Height - buttonSize) / 2.0f); - - _template.Draw(g, _arrowDirection, Enabled ? _state : ButtonState.Disabled); - } - else - { - DrawDefault(e.Graphics, _arrowDirection, Enabled ? _state : ButtonState.Disabled); - } - - base.OnPaint(e); - } - - protected virtual void OnTemplateChanged(EventArgs e) - { - if (ThemeChanged != null) - ThemeChanged(this, e); - } - - private Template SelectTemplate(ButtonTheme theme) - { - switch (theme) - { - case ButtonTheme.Default: - return null; - case ButtonTheme.Aero: - return new AeroTemplate(); - case ButtonTheme.Metro: - return new MetroTemplate(); - default: - return AutoSelectTemplate(); - } - } - - /// - /// Is risen if the theme has changed. - /// - [Category("Appearance")] - [Description("Is risen if the theme has changed.")] - public event EventHandler ThemeChanged; - } -} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/MetroTemplate.cs b/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/MetroTemplate.cs deleted file mode 100644 index 7b97870e..00000000 --- a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/MetroTemplate.cs +++ /dev/null @@ -1,96 +0,0 @@ -// MetroTemplate.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System.Drawing; -using System.Drawing.Drawing2D; - -namespace ExplorerNavigationButton -{ - public partial class ExplorerNavigationButton - { - private class MetroTemplate : Template - { - private readonly GraphicsPath _arrowPath; - private readonly RectangleF _circleRect; - private readonly Pen _disabledArrowPen; - private readonly Pen _disabledPen; - private readonly Pen _hoverArrowPen; - private readonly SolidBrush _hoverBrush; - private readonly Pen _normalArrowPen; - private readonly Pen _normalPen; - private readonly SolidBrush _pressedBrush; - - public MetroTemplate() - { - _circleRect = new RectangleF(2.5f, 2.5f, 18f, 18f); - - _normalPen = new Pen(Color.FromArgb(100, 100, 100), 1.5f); - _disabledPen = new Pen(Color.FromArgb(200, 200, 200), 1.5f); - - _normalArrowPen = new Pen(Color.FromArgb(100, 100, 100), 2); - _hoverArrowPen = new Pen(Color.White, 2); - _disabledArrowPen = new Pen(Color.FromArgb(200, 200, 200), 2); - - _arrowPath = new GraphicsPath(FillMode.Alternate); - var arrowTop = new PointF(7.5f, 11.5f); - _arrowPath.AddLine(new PointF(11.5f, 15.5f), arrowTop); - _arrowPath.AddLine(arrowTop, new PointF(11.5f, 7.5f)); - _arrowPath.StartFigure(); - _arrowPath.AddLine(arrowTop, new PointF(16.5f, 11.5f)); - - _hoverBrush = new SolidBrush(Color.FromArgb(50, 152, 254)); - _pressedBrush = new SolidBrush(Color.FromArgb(54, 116, 178)); - } - - protected override void Dispose(bool disposing) - { - _normalPen.Dispose(); - _normalArrowPen.Dispose(); - _arrowPath.Dispose(); - _hoverBrush.Dispose(); - _hoverArrowPen.Dispose(); - _pressedBrush.Dispose(); - _disabledArrowPen.Dispose(); - _disabledPen.Dispose(); - - base.Dispose(disposing); - } - - protected override void DrawDisabled(Graphics g, ArrowDirection direction) - { - g.DrawEllipse(_disabledPen, _circleRect); - if (direction == ArrowDirection.Right) - g.MultiplyTransform(new Matrix(-1, 0, 0, 1, 23, 0)); - g.DrawPath(_disabledArrowPen, _arrowPath); - } - - protected override void DrawHover(Graphics g, ArrowDirection direction) - { - g.FillEllipse(_hoverBrush, - new RectangleF(_circleRect.X - 0.5f, _circleRect.Y - 0.5f, _circleRect.Width + 1, - _circleRect.Height + 1)); - if (direction == ArrowDirection.Right) - g.MultiplyTransform(new Matrix(-1, 0, 0, 1, 23, 0)); - g.DrawPath(_hoverArrowPen, _arrowPath); - } - - protected override void DrawNormal(Graphics g, ArrowDirection direction) - { - g.DrawEllipse(_normalPen, _circleRect); - if (direction == ArrowDirection.Right) - g.MultiplyTransform(new Matrix(-1, 0, 0, 1, 23, 0)); - g.DrawPath(_normalArrowPen, _arrowPath); - } - - protected override void DrawPressed(Graphics g, ArrowDirection direction) - { - g.FillEllipse(_pressedBrush, - new RectangleF(_circleRect.X - 0.5f, _circleRect.Y - 0.5f, _circleRect.Width + 1, - _circleRect.Height + 1)); - if (direction == ArrowDirection.Right) - g.MultiplyTransform(new Matrix(-1, 0, 0, 1, 23, 0)); - g.DrawPath(_hoverArrowPen, _arrowPath); - } - } - } -} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/Template.cs b/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/Template.cs deleted file mode 100644 index 35d3921d..00000000 --- a/nUpdate.Administration/UI/Controls/ExplorerNavigationButton/Template.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Template.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System; -using System.Drawing; - -namespace ExplorerNavigationButton -{ - public partial class ExplorerNavigationButton - { - private abstract class Template : IDisposable - { - private bool _disposed; - - public void Dispose() - { - if (!_disposed) - { - Dispose(true); - GC.SuppressFinalize(this); - - _disposed = true; - } - } - - protected virtual void Dispose(bool disposing) - { - } - - public void Draw(Graphics g, ArrowDirection direction, ButtonState state) - { - switch (state) - { - case ButtonState.Hover: - DrawHover(g, direction); - break; - case ButtonState.Disabled: - DrawDisabled(g, direction); - break; - case ButtonState.Pressed: - DrawPressed(g, direction); - break; - default: - DrawNormal(g, direction); - break; - } - } - - protected abstract void DrawDisabled(Graphics g, ArrowDirection direction); - protected abstract void DrawHover(Graphics g, ArrowDirection direction); - - protected abstract void DrawNormal(Graphics g, ArrowDirection direction); - protected abstract void DrawPressed(Graphics g, ArrowDirection direction); - - ~Template() - { - Dispose(false); - } - } - } -} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Controls/ExplorerTreeView.cs b/nUpdate.Administration/UI/Controls/ExplorerTreeView.cs index af0bf373..5bec14af 100644 --- a/nUpdate.Administration/UI/Controls/ExplorerTreeView.cs +++ b/nUpdate.Administration/UI/Controls/ExplorerTreeView.cs @@ -4,7 +4,7 @@ using System; using System.Drawing; using System.Windows.Forms; -using nUpdate.Administration.Core.Win32; +using nUpdate.Administration.Win32; namespace nUpdate.Administration.UI.Controls { diff --git a/nUpdate.Administration/UI/Controls/Line.cs b/nUpdate.Administration/UI/Controls/Line.cs new file mode 100644 index 00000000..e5b07995 --- /dev/null +++ b/nUpdate.Administration/UI/Controls/Line.cs @@ -0,0 +1,26 @@ +// Line.cs, 10.06.2019 +// Copyright (C) Dominic Beger 17.06.2019 + +using System.Drawing; +using System.Windows.Forms; + +namespace nUpdate.Administration.UI.Controls +{ + public class Line : Control + { + public enum Alignment + { + Horizontal, + Vertical + } + + public Alignment LineAlignment { get; set; } + + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); + e.Graphics.DrawLine(new Pen(new SolidBrush(Color.LightGray)), new Point(5, 5), + LineAlignment == Alignment.Horizontal ? new Point(500, 5) : new Point(5, 500)); + } + } +} \ No newline at end of file diff --git a/nUpdate.Administration/UI/Dialogs/BaseDialog.cs b/nUpdate.Administration/UI/Dialogs/BaseDialog.cs index 23938a28..b8db2c99 100644 --- a/nUpdate.Administration/UI/Dialogs/BaseDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/BaseDialog.cs @@ -3,7 +3,6 @@ using System.Drawing; using System.Windows.Forms; -using nUpdate.Administration.Core.Application; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/CredentialsDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/CredentialsDialog.Designer.cs index 14b1d881..444b82d4 100644 --- a/nUpdate.Administration/UI/Dialogs/CredentialsDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/CredentialsDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/CredentialsDialog.cs b/nUpdate.Administration/UI/Dialogs/CredentialsDialog.cs index 2a00674a..15653dc6 100644 --- a/nUpdate.Administration/UI/Dialogs/CredentialsDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/CredentialsDialog.cs @@ -4,7 +4,6 @@ using System; using System.Drawing; using System.Windows.Forms; -using nUpdate.Administration.Core; using nUpdate.Administration.UI.Popups; namespace nUpdate.Administration.UI.Dialogs diff --git a/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.Designer.cs index c04b37ae..9eb31fb3 100644 --- a/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.Designer.cs @@ -1,5 +1,5 @@ using System.Windows.Forms; -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { @@ -36,9 +36,7 @@ private void InitializeComponent() this.serverImageList = new System.Windows.Forms.ImageList(this.components); this.continueButton = new System.Windows.Forms.Button(); this.cancelButton = new System.Windows.Forms.Button(); - this.controlPanel1 = new BottomPanel(); - this.backButton = new ExplorerNavigationButton.ExplorerNavigationButton(); - this.forwardButton = new ExplorerNavigationButton.ExplorerNavigationButton(); + this.controlPanel1 = new nUpdate.Administration.UI.Controls.BottomPanel(); this.serverDataTreeView = new nUpdate.Administration.UI.Controls.ExplorerTreeView(); this.loadingPanel = new System.Windows.Forms.Panel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); @@ -88,34 +86,11 @@ private void InitializeComponent() this.controlPanel1.BackColor = System.Drawing.SystemColors.Control; this.controlPanel1.Controls.Add(this.cancelButton); this.controlPanel1.Controls.Add(this.continueButton); - this.controlPanel1.Location = new System.Drawing.Point(0, 223); + this.controlPanel1.Location = new System.Drawing.Point(0, 184); this.controlPanel1.Name = "controlPanel1"; this.controlPanel1.Size = new System.Drawing.Size(434, 38); this.controlPanel1.TabIndex = 19; // - // backButton - // - this.backButton.BackColor = System.Drawing.Color.Black; - this.backButton.Enabled = false; - this.backButton.Location = new System.Drawing.Point(3, 6); - this.backButton.Name = "backButton"; - this.backButton.Size = new System.Drawing.Size(24, 24); - this.backButton.TabIndex = 21; - this.backButton.Text = "explorerNavigationButton1"; - this.backButton.Click += new System.EventHandler(this.backButton_Click); - // - // forwardButton - // - this.forwardButton.ArrowDirection = ExplorerNavigationButton.ArrowDirection.Right; - this.forwardButton.BackColor = System.Drawing.Color.Black; - this.forwardButton.Enabled = false; - this.forwardButton.Location = new System.Drawing.Point(33, 6); - this.forwardButton.Name = "forwardButton"; - this.forwardButton.Size = new System.Drawing.Size(24, 24); - this.forwardButton.TabIndex = 22; - this.forwardButton.Text = "explorerNavigationButton2"; - this.forwardButton.Click += new System.EventHandler(this.forwardButton_Click); - // // serverDataTreeView // this.serverDataTreeView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -124,7 +99,7 @@ private void InitializeComponent() this.serverDataTreeView.ImageIndex = 0; this.serverDataTreeView.ImageList = this.serverImageList; this.serverDataTreeView.ItemHeight = 23; - this.serverDataTreeView.Location = new System.Drawing.Point(12, 76); + this.serverDataTreeView.Location = new System.Drawing.Point(12, 37); this.serverDataTreeView.Name = "serverDataTreeView"; this.serverDataTreeView.SelectedImageIndex = 0; this.serverDataTreeView.ShowLines = false; @@ -139,7 +114,7 @@ private void InitializeComponent() this.loadingPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.loadingPanel.Controls.Add(this.pictureBox1); this.loadingPanel.Controls.Add(this.loadingLabel); - this.loadingPanel.Location = new System.Drawing.Point(88, 89); + this.loadingPanel.Location = new System.Drawing.Point(88, 75); this.loadingPanel.Name = "loadingPanel"; this.loadingPanel.Size = new System.Drawing.Size(269, 51); this.loadingPanel.TabIndex = 67; @@ -167,7 +142,6 @@ private void InitializeComponent() // toolStrip1 // this.toolStrip1.AutoSize = false; - this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.directoryLabel, this.directoryTextBox, @@ -175,9 +149,9 @@ private void InitializeComponent() this.addDirectoryButton, this.toolStripSeparator2, this.removeDirectoryButton}); - this.toolStrip1.Location = new System.Drawing.Point(12, 45); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(405, 25); + this.toolStrip1.Size = new System.Drawing.Size(434, 25); this.toolStrip1.TabIndex = 68; this.toolStrip1.Text = "toolStrip1"; // @@ -229,10 +203,8 @@ private void InitializeComponent() this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(434, 261); + this.ClientSize = new System.Drawing.Size(434, 222); this.Controls.Add(this.loadingPanel); - this.Controls.Add(this.forwardButton); - this.Controls.Add(this.backButton); this.Controls.Add(this.controlPanel1); this.Controls.Add(this.serverDataTreeView); this.Controls.Add(this.toolStrip1); @@ -246,7 +218,6 @@ private void InitializeComponent() this.Text = "Set directory - {0} - {1}"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DirectorySearchForm_FormClosing); this.Shown += new System.EventHandler(this.DirectorySearchDialog_Shown); - this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.DirectorySearchDialog_MouseDown); this.controlPanel1.ResumeLayout(false); this.loadingPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); @@ -262,8 +233,6 @@ private void InitializeComponent() private System.Windows.Forms.Button cancelButton; private System.Windows.Forms.Button continueButton; private System.Windows.Forms.ImageList serverImageList; - private ExplorerNavigationButton.ExplorerNavigationButton backButton; - private ExplorerNavigationButton.ExplorerNavigationButton forwardButton; private Controls.ExplorerTreeView serverDataTreeView; private Panel loadingPanel; private PictureBox pictureBox1; diff --git a/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.cs b/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.cs index 73f5c6ef..cc554a6a 100644 --- a/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.cs @@ -8,8 +8,6 @@ using System.Security; using System.Threading.Tasks; using System.Windows.Forms; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Win32; using nUpdate.Administration.TransferInterface; using nUpdate.Administration.UI.Popups; using Starksoft.Aspen.Ftps; @@ -18,14 +16,9 @@ namespace nUpdate.Administration.UI.Dialogs { public partial class DirectorySearchDialog : BaseDialog, IAsyncSupportable { - private const int WM_NCLBUTTONDOWN = 0xA1; - private const int HT_CAPTION = 0x2; private readonly List _handledNodes = new List(); - private readonly Navigator _nav = new Navigator(); private bool _allowCancel; private FtpManager _ftp; - private Margins _margins; - private bool _nodeSelectedByUser = true; public DirectorySearchDialog() { @@ -92,8 +85,7 @@ public void SetUiState(bool enabled) { foreach ( var c in - (from Control c in Controls where c.Visible select c).Where( - c => c.GetType() != typeof(ExplorerNavigationButton.ExplorerNavigationButton))) + (from Control c in Controls where c.Visible select c)) c.Enabled = enabled; if (!enabled) @@ -126,18 +118,6 @@ private void addDirectoryButton_Click(object sender, EventArgs e) node.BeginEdit(); } - private void backButton_Click(object sender, EventArgs e) - { - _nav.GoBack(); - _nodeSelectedByUser = false; - serverDataTreeView.SelectedNode = _nav.Current; - _nodeSelectedByUser = true; - if (!_nav.CanGoBack) - backButton.Enabled = false; - if (_nav.CanGoForward) - forwardButton.Enabled = true; - } - private void continueButton_Click(object sender, EventArgs e) { SelectedDirectory = directoryTextBox.Text; @@ -170,23 +150,9 @@ await Task.Factory.StartNew(() => }); } - private void DirectorySearchDialog_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - return; - - NativeMethods.ReleaseCapture(); - NativeMethods.SendMessage(Handle, WM_NCLBUTTONDOWN, new IntPtr(HT_CAPTION), new IntPtr(0)); - } - private async void DirectorySearchDialog_Shown(object sender, EventArgs e) { Text = string.Format(Text, ProjectName, Program.VersionString); - if (NativeMethods.DwmIsCompositionEnabled()) - { - _margins = new Margins {Top = 38}; - NativeMethods.DwmExtendFrameIntoClientArea(Handle, ref _margins); - } _ftp = new FtpManager(Host, Port, null, Username, @@ -204,18 +170,6 @@ private void DirectorySearchForm_FormClosing(object sender, FormClosingEventArgs e.Cancel = true; } - private void forwardButton_Click(object sender, EventArgs e) - { - _nav.GoForward(); - _nodeSelectedByUser = false; - serverDataTreeView.SelectedNode = _nav.Current; - _nodeSelectedByUser = true; - if (!_nav.CanGoForward) - forwardButton.Enabled = false; - if (_nav.CanGoBack) - backButton.Enabled = true; - } - private async Task LoadListAsync(string path, TreeNode node) { await Task.Factory.StartNew(() => @@ -255,25 +209,6 @@ await Task.Factory.StartNew(() => }); } - protected override void OnPaintBackground(PaintEventArgs e) - { - base.OnPaintBackground(e); - if (!NativeMethods.DwmIsCompositionEnabled()) - return; - - _margins.Top = 38; - e.Graphics.Clear(Color.Black); - - var clientArea = new Rectangle( - _margins.Left, - _margins.Top, - ClientRectangle.Width - _margins.Left - _margins.Right, - ClientRectangle.Height - _margins.Top - _margins.Bottom - ); - Brush b = new SolidBrush(BackColor); - e.Graphics.FillRectangle(b, clientArea); - } - private async Task RemoveDirectory(string path) { await Task.Factory.StartNew(() => @@ -338,11 +273,6 @@ private async void serverDataTreeView_AfterSelect(object sender, TreeViewEventAr return; } - if (_nodeSelectedByUser) - _nav.Add(e.Node); - if (!backButton.Enabled && _nav.CanGoBack) - backButton.Enabled = true; - var directories = new Stack(); var currentNode = e.Node; while (currentNode.Parent != null && currentNode.Parent != serverDataTreeView.Nodes[0]) diff --git a/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.resx b/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.resx index 3a079087..4194c6c0 100644 --- a/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.resx +++ b/nUpdate.Administration/UI/Dialogs/DirectorySearchDialog.resx @@ -124,47 +124,47 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa - CQAAAk1TRnQBSQFMAgEBAgEAAdABAQHQAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABEAMAAQEBAAEgBgABEBIAAwQBBgMKAQ4DEwEaAxsBJgMhATADIwEzAUsBTAFLAY8BWQFcAVkBzAFZ - AVwBWQHMAUsBTAFLAY8DIwEzAyMBMwMdASoDFgEeAwwBEAMEAQYDDQESAx8BLAJPAVEBnAFXAlkBvwFX - AlkBvwFXAlkBvwFXAlkBvwFXAlkBvwFXAlkBvwFXAlkBvwFXAlkBvwFXAlkBvwFXAlkBvwJPAVEBnAMf - ASwDDQESgAADDwEUAyUBNwM8AWcDTgGYA1cBvwNZAcwDWQHMASgB6gEXAf8BKAHqARcB/wNZAcwDWQHM - A1kByQNSAagDQgF0AykBPwMQARUDBwEKAxABFgFVAlYBtAGGAc8B8AH/AYEBywHtAf8BgQHLAe0B/wGB - AcsB7QH/AYEBywHtAf8BgQHLAe0B/wGBAcsB7QH/AYYBzwHwAf8BEQGPAbEB/wGGAc8B8AH/AVUCVgG0 - AzIBUQMHAQqYAANOAZkBWQFcAVkBzAFZAVwBWQHMA04BmSAAAVICUwGoAYQBzgHuAf8BQgHHAegB/wFC + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABW + CQAAAk1TRnQBSQFMAgEBAgEAAeABAQHgAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwABEAMAAQEBAAEgBgABEBIAAwUBBgMLAQ4DEwEaAxsBJgMhATADIwEzAUsBTAFLAY8BWwFdAVsBzAFb + AV0BWwHMAUsBTAFLAY8DIwEzAyMBMwMeASoDFgEeAwwBEAMFAQYDDgESAx8BLAJQAVEBnAFZAloBvwFZ + AloBvwFZAloBvwFZAloBvwFZAloBvwFZAloBvwFZAloBvwFZAloBvwFZAloBvwFZAloBvwJQAVEBnAMf + ASwDDgESgAADDwEUAyUBNwM9AWcDTgGYA1kBvwNbAcwDWwHMASgB6gEXAf8BKAHqARcB/wNbAcwDWwHM + A1sByQNSAagDQgF0AyoBPwMQARUDCAEKAxEBFgFVAlcBtAGGAc8B8AH/AYEBywHtAf8BgQHLAe0B/wGB + AcsB7QH/AYEBywHtAf8BgQHLAe0B/wGBAcsB7QH/AYYBzwHwAf8BEQGPAbEB/wGGAc8B8AH/AVUCVwG0 + AzMBUQMIAQqYAANPAZkBWwFdAVsBzAFbAV0BWwHMA08BmSAAAVICVAGoAYQBzgHuAf8BQgHHAegB/wFC AccB6AH/AUIBxwHoAf8BQgHHAegB/wFCAccB6AH/AUIBxwHoAf8BhAHOAe4B/wEdAZsBvQH/AYQBzgHu - Af8B9AG2AQAB/wFSAlMBqIwAAwgBCwMSARkDEwEaAxMBGgMTARoDSAGGA0gBhgMTARoDEwEaAxMBGgMT - ARoDCgENEAADUQGgAYcB0AHvAf8BRQHKAekB/wFFAcoB6QH/AUUBygHpAf8BRQHKAekB/wFFAcoB6QH/ - AUUBygHpAf8BhwHQAe8B/wElAaMBxQH/AYcB0AHvAf8B/gHJAQcB/wNRAaCMAAMQARUDPQFpA1ABpANQ - AaQDUAGkA1UBtANVAbQDUAGkA1ABpANQAaQDPgFrAxIBGBAAA1ABnQGKAdMB8AH/AYIBzQHrAf8BggHN + Af8B9AG2AQAB/wFSAlQBqIwAAwkBCwMTARkDEwEaAxMBGgMTARoDSQGGA0kBhgMTARoDEwEaAxMBGgMT + ARoDCgENEAADUgGgAYcB0AHvAf8BRQHKAekB/wFFAcoB6QH/AUUBygHpAf8BRQHKAekB/wFFAcoB6QH/ + AUUBygHpAf8BhwHQAe8B/wElAaMBxQH/AYcB0AHvAf8B/gHJAQcB/wNSAaCMAAMQARUDPQFpA1EBpANR + AaQDUQGkA1UBtANVAbQDUQGkA1EBpANRAaQDPgFrAxIBGBAAA1ABnQGKAdMB8AH/AYIBzQHrAf8BggHN AesB/wGCAc0B6wH/AYIBzQHrAf8BggHNAesB/wGCAc0B6wH/AYoB0wHwAf8BKAGmAcgB/wGKAdMB8AH/ - AukB2wH/A1ABnZAAAxoBJQNLAY4DhwH/A4MB/wODAf8DgwH/A4MB/wOHAf8DSwGOAxoBJRQAA1ABmgGO + AukB2wH/A1ABnZAAAxsBJQNMAY4DhwH/A4MB/wODAf8DgwH/A4MB/wOHAf8DTAGOAxsBJRQAA1ABmgGO AdYB8gH/AYcB0AHtAf8BhwHQAe0B/wGHAdAB7QH/AYcB0AHtAf8BhwHQAe0B/wGHAdAB7QH/AY4B1gHy - Af8BLAGqAcwB/wGOAdYB8gH/AvAB5gH/A1ABmpQAA0wBkwM0Af8DMAH/AzAB/wMwAf8BAAHMAQAB/wM0 - Af8DTAGTGAABTgJPAZcBkgHaAfQB/wGLAdQB8AH/AYsB1AHwAf8BiwHUAfAB/wGLAdQB8AH/AYsB1AHw + Af8BLAGqAcwB/wGOAdYB8gH/AvAB5gH/A1ABmpQAA00BkwM0Af8DMAH/AzAB/wMwAf8BAAHMAQAB/wM0 + Af8DTQGTGAABTgJPAZcBkgHaAfQB/wGLAdQB8AH/AYsB1AHwAf8BiwHUAfAB/wGLAdQB8AH/AYsB1AHw Af8BiwHUAfAB/wGSAdoB9AH/AS8BrQHPAf8BkgHaAfQB/wL4AfMB/wFOAk8Bl5QAA1IBqAMbAf8DGwH/ AxsB/wMbAf8DGwH/AxsB/wNSAagYAANOAZQBlwHeAfYB/wGQAdgB8gH/AZAB2AHyAf8BkAHYAfIB/wGQ AdgB8gH/AZAB2AHyAf8BkAHYAfIB/wGXAd4B9gH/AT8BvQHcAf8BPgG9AdwB/wL+Af0B/wNOAZSUAANE AXoDyAH/A70B/wO9Af8DvQH/A9EB/wPIAf8DRAF6GAABTAJNAZEBmwHhAfcB/wGUAdsB9AH/AZQB2wH0 Af8BlAHbAfQB/wGUAdsB9AH/AZQB2wH0Af8BlAHbAfQB/wGUAdsB9AH/AZ4B5AH5Af8BQgHAAd4B/wFM - Ak0BkQMjATOUAANCAXUDzQH/A8IB/wPCAf8DwgH/A5kB/wPNAf8DQgF1GAADSwGOAZ4B5QH5Af8BmAHf + Ak0BkQMjATOUAANCAXUDzQH/A8IB/wPCAf8DwgH/A5kB/wPNAf8DQgF1GAADTAGOAZ4B5QH5Af8BmAHf AfYB/wGYAd8B9gH/AZgB3wH2Af8BmAHfAfYB/wGYAd8B9gH/AZgB3wH2Af8BmAHfAfYB/wGYAd8B9gH/ - AaEB6AH6Af8DSwGOmAADQQFyA9cB/wPSAf8D0gH/A9IB/wPSAf8D1wH/A0EBchgAA0oBiwGjAegB+wH/ + AaEB6AH6Af8DTAGOmAADQQFyA9cB/wPSAf8D0gH/A9IB/wPSAf8D1wH/A0EBchgAA0oBiwGjAegB+wH/ AZ0B4wH5Af8BnQHjAfkB/wGdAeMB+QH/AZ0B4wH5Af8BnQHjAfkB/wGdAeMB+QH/AZ0B4wH5Af8BnQHj - AfkB/wGjAegB+wH/A0oBi5gAA0ABbwO6Af8DvQH/A70B/wO9Af8DvQH/A7oB/wNAAW8YAAFJAkoBiQGm - AesB/AH/AaEB5gH7Af8BoQHmAfsB/wGhAeYB+wH/AaEB5gH7Af8BoQHmAfsB/wGhAeYB+wH/AaEB5gH7 - Af8BoQHmAfsB/wGmAesB/AH/AUkCSgGJmAADPwFtA+IB/wPdAf8D3QH/A90B/wPdAf8D4gH/Az8BbRgA - A0gBhgGpAe4B/QH/AaQB6QH8Af8BpAHpAfwB/wGkAekB/AH/AaQB6QH8Af8BpAHpAfwB/wGkAekB/AH/ - AaQB6QH8Af8BpAHpAfwB/wGpAe4B/QH/A0gBhpgAAz4BagPCAf8DxwH/A8cB/wPHAf8DxwH/A8IB/wM+ - AWoYAANIAYQBrAHxAv8BpwHsAf4B/wGnAewB/gH/AacB7AH+Af8BpwHsAf4B/wGnAewB/gH/AacB7AH+ - Af8BpwHsAf4B/wGnAewB/gH/AawB8QL/A0gBhJgAAz0BaAPqAf8D5QH/A+UB/wPlAf8D5QH/A+oB/wM9 - AWgYAANHAYIBsQH1Av8BrgHyAv8BrgHyAv8BrgHyAv8BrgHyAv8BrgHyAv8BrgHyAv8BrgHyAv8BrgHy - Av8BsQH1Av8DRwGCmAADMQFOAz0BZwM9AWcDPQFnAz0BZwM9AWcDPQFnAzEBThgAAzoBYQFGAkcBgQFG - AkcBgQFGAkcBgQFGAkcBgQFGAkcBgQFGAkcBgQFGAkcBgQFGAkcBgQFGAkcBgQFGAkcBgQM6AWGIAAFC - AU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/EQAB/AE/AcABAQQAAcABAwHAAQEEAAHA - AQMBwAEBBAAB4AEHAcABAQQAAfABDwHAAQEEAAHwAQ8BwAEBBAAB8AEPAcABAQQAAfABDwHAAQMEAAHw - AQ8BwAEDBAAB8AEPAcABAwQAAfABDwHAAQMEAAHwAQ8BwAEDBAAB8AEPAcABAwQAAfABDwHAAQMEAAs= + AfkB/wGjAegB+wH/A0oBi5gAA0ABbwO6Af8DvQH/A70B/wO9Af8DvQH/A7oB/wNAAW8YAANKAYkBpgHr + AfwB/wGhAeYB+wH/AaEB5gH7Af8BoQHmAfsB/wGhAeYB+wH/AaEB5gH7Af8BoQHmAfsB/wGhAeYB+wH/ + AaEB5gH7Af8BpgHrAfwB/wNKAYmYAAM/AW0D4gH/A90B/wPdAf8D3QH/A90B/wPiAf8DPwFtGAADSQGG + AakB7gH9Af8BpAHpAfwB/wGkAekB/AH/AaQB6QH8Af8BpAHpAfwB/wGkAekB/AH/AaQB6QH8Af8BpAHp + AfwB/wGkAekB/AH/AakB7gH9Af8DSQGGmAADPgFqA8IB/wPHAf8DxwH/A8cB/wPHAf8DwgH/Az4BahgA + A0gBhAGsAfEC/wGnAewB/gH/AacB7AH+Af8BpwHsAf4B/wGnAewB/gH/AacB7AH+Af8BpwHsAf4B/wGn + AewB/gH/AacB7AH+Af8BrAHxAv8DSAGEmAADPQFoA+oB/wPlAf8D5QH/A+UB/wPlAf8D6gH/Az0BaBgA + A0cBggGxAfUC/wGuAfIC/wGuAfIC/wGuAfIC/wGuAfIC/wGuAfIC/wGuAfIC/wGuAfIC/wGuAfIC/wGx + AfUC/wNHAYKYAAMxAU4DPQFnAz0BZwM9AWcDPQFnAz0BZwM9AWcDMQFOGAADOgFhAUYCRwGBAUYCRwGB + AUYCRwGBAUYCRwGBAUYCRwGBAUYCRwGBAUYCRwGBAUYCRwGBAUYCRwGBAUYCRwGBAzoBYYgAAUIBTQE+ + BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8RAAH8AT8BwAEBBAABwAEDAcABAQQAAcABAwHA + AQEEAAHgAQcBwAEBBAAB8AEPAcABAQQAAfABDwHAAQEEAAHwAQ8BwAEBBAAB8AEPAcABAwQAAfABDwHA + AQMEAAHwAQ8BwAEDBAAB8AEPAcABAwQAAfABDwHAAQMEAAHwAQ8BwAEDBAAB8AEPAcABAwQACw== @@ -511,15 +511,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH2SURBVDhPjY5dSFNhHIf/RFFEia7YhbdGBMpmdBeUeKE3 - gVAg3ZTlB1JeFoLKyrb8zPIjBTd1wy/UpEVDkT4wBRFNpwZaiIbSl25M13Euc6n7dd5zXneg5cEfPPwv - zvO8HNrdRBmlj5eRcT8wl2fKxkrJhF8OwPdCHdFhLs+UjRZTEdaeI7jSqQpzmMszZcMPqWTH+wzb7nZV - mMNcnikbMlH5tqcDW0stqjCHuTxTNviAKrZcbQh8s6rCHObyTNm7QqoM/LBhY9Gsyh9XC5jLM2VvDFTz - +0sj/PN1exL4bsPCoAHMfX2PzvFU3qsCqttYqIdvtvq/sG+f+/NF8rATDIL5PJWXYIn4eLZHh5tvkyDM - VIThn3uKKftt6a5vbqI3n+p5Ku+ELcqT5c2F3h6L1Q+lYfg+VcLZnS3dJUGAI5ca5LJJYyFrlPOkOXIl - 1ZMNfecZibSXCfBMmEII048w2pEh3Xm3G/a7ZJUfqI10Ji5fwb/om0/DPVYY4qf4F8NtN6Sb+D6I7jvU - LD/w5LiFHh9zao2HvXFfL0BnPiVxvf08XCOGEN7JIvQ3XpWurs+P1hzqkh8gOiqi1d4/IkQvxiK+Jgar - 48YwhKkSOKouSbc2k3rTLtJl3pJGJC4i5cCQNv3Quj7r4HL5NRpQ41YyNbGGiDR/AUeIP3I3OR/SAAAA + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH2SURBVDhPjY5dSFNhHIf/SGGEia7YRbdFCMpmdBeUeFE3 + QZAg3eRHJVJdFoLKarrMj0zLFNzUDU3RkhYNJfrAFEQ0nR+ghWgoZenGdB3nNJe6n+c953UHmh78wcP/ + 4jzPy6GdDZfS9aFSKtwPzOWZssESMmHVAfjeqCM6zOWZsoFHVITl1wgutqnCHObyTFnfQyre8r7CprtF + FeYwl2fKek1UtulpxcZ8kyrMYS7PlPUUUPmGqxmBOasqzGEuz5R9NlJl4LcNa7NmVf65msBcnin7aKCq + vz/q4Z+u2ZPALxtmegxg7of7dIan8t7nU83aTC18k892hX373pUnkoutYBDM56m8JEv019MdOmR+ugBh + ojwM/9RzjNpvS3dlfR2deVTLU3lHbbGeLG8O9PZ4LI2VhOH7Vglne7Z05wUBjhyqk8sGjYWssc5j5pjF + VE829G1xEulvk+AZNoUQxh9joPWGdKfdbtjvkVV+oDrGmbyQgv/RN56Ce9AY4o/4F33NGdJN/hJE+11q + lB+oOGKhJ1FOrTHSm/DzHHTmkxJpLWfh6jeE8I4Uoav+qnR17/x4cYdeyg8QHRbRah8cEo7PxiOx6gSW + hgrDEEaL4Xh6SbrVN6kz/Txd4S1pRBKiL0f0ajMOruizDiyUXaNuNW5dpAbWEJFmG0WwP24GDiWlAAAA AElFTkSuQmCC diff --git a/nUpdate.Administration/UI/Dialogs/FeedbackDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/FeedbackDialog.Designer.cs index f168e962..b0c0d818 100644 --- a/nUpdate.Administration/UI/Dialogs/FeedbackDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/FeedbackDialog.Designer.cs @@ -1,5 +1,4 @@ using nUpdate.Administration.UI.Controls; -using nUpdate.Internal.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/FeedbackDialog.cs b/nUpdate.Administration/UI/Dialogs/FeedbackDialog.cs index 8cd97763..5ad7d28a 100644 --- a/nUpdate.Administration/UI/Dialogs/FeedbackDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/FeedbackDialog.cs @@ -4,9 +4,7 @@ using System; using System.Drawing; using System.Net.Mail; -using nUpdate.Administration.Core; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/FtpAssemblyInputDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/FtpAssemblyInputDialog.Designer.cs index 7058e582..a44166da 100644 --- a/nUpdate.Administration/UI/Dialogs/FtpAssemblyInputDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/FtpAssemblyInputDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/FtpAssemblyInputDialog.cs b/nUpdate.Administration/UI/Dialogs/FtpAssemblyInputDialog.cs index addf13c6..a12eb214 100644 --- a/nUpdate.Administration/UI/Dialogs/FtpAssemblyInputDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/FtpAssemblyInputDialog.cs @@ -5,7 +5,6 @@ using System.Drawing; using System.Reflection; using System.Windows.Forms; -using nUpdate.Administration.Core; using nUpdate.Administration.UI.Popups; namespace nUpdate.Administration.UI.Dialogs diff --git a/nUpdate.Administration/UI/Dialogs/HistoryDialog.cs b/nUpdate.Administration/UI/Dialogs/HistoryDialog.cs index 1f45bea4..636e00c5 100644 --- a/nUpdate.Administration/UI/Dialogs/HistoryDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/HistoryDialog.cs @@ -7,8 +7,7 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using nUpdate.Administration.Core.Application; -using nUpdate.Administration.Core.History; +using nUpdate.Administration.History; using nUpdate.Administration.Properties; using nUpdate.Administration.UI.Controls; using nUpdate.Administration.UI.Popups; diff --git a/nUpdate.Administration/UI/Dialogs/InfoDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/InfoDialog.Designer.cs index 437b4bee..423ddc0f 100644 --- a/nUpdate.Administration/UI/Dialogs/InfoDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/InfoDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { @@ -33,9 +33,9 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InfoDialog)); this.closeButton = new System.Windows.Forms.Button(); this.donatePictureBox = new System.Windows.Forms.PictureBox(); - this.line1 = new nUpdate.Internal.UI.Controls.Line(); + this.line1 = new nUpdate.Administration.UI.Controls.Line(); this.label13 = new System.Windows.Forms.Label(); - this.controlPanel1 = new nUpdate.Internal.UI.Controls.BottomPanel(); + this.controlPanel1 = new nUpdate.Administration.UI.Controls.BottomPanel(); this.websiteLinkLabel = new System.Windows.Forms.LinkLabel(); this.label12 = new System.Windows.Forms.Label(); this.ll_github = new System.Windows.Forms.LinkLabel(); @@ -52,7 +52,7 @@ private void InitializeComponent() this.copyrightLabel = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.headerLabel = new System.Windows.Forms.Label(); - this.line2 = new nUpdate.Internal.UI.Controls.Line(); + this.line2 = new nUpdate.Administration.UI.Controls.Line(); this.label1 = new System.Windows.Forms.Label(); this.dotNetZipLinkLabel = new System.Windows.Forms.LinkLabel(); this.jsonNetLinkLabel = new System.Windows.Forms.LinkLabel(); @@ -92,7 +92,7 @@ private void InitializeComponent() // // line1 // - this.line1.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line1.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line1.Location = new System.Drawing.Point(17, 157); this.line1.Name = "line1"; this.line1.Size = new System.Drawing.Size(401, 14); @@ -107,7 +107,7 @@ private void InitializeComponent() this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(28, 13); this.label13.TabIndex = 20; - this.label13.Text = "v3.5.0"; + this.label13.Text = "v4.0.0"; // // controlPanel1 // @@ -289,7 +289,7 @@ private void InitializeComponent() // // line2 // - this.line2.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line2.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line2.Location = new System.Drawing.Point(21, 273); this.line2.Name = "line2"; this.line2.Size = new System.Drawing.Size(397, 10); diff --git a/nUpdate.Administration/UI/Dialogs/JsonEditorDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/JsonEditorDialog.Designer.cs index 62caa24a..6d077d7c 100644 --- a/nUpdate.Administration/UI/Dialogs/JsonEditorDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/JsonEditorDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/JsonEditorDialog.cs b/nUpdate.Administration/UI/Dialogs/JsonEditorDialog.cs index cf22a268..1dcce6aa 100644 --- a/nUpdate.Administration/UI/Dialogs/JsonEditorDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/JsonEditorDialog.cs @@ -6,9 +6,8 @@ using System.IO; using System.Text; using FastColoredTextBoxNS; -using nUpdate.Administration.Core; -using nUpdate.Administration.UI.Popups; using Newtonsoft.Json.Linq; +using nUpdate.Administration.UI.Popups; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/MainDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/MainDialog.Designer.cs index f226da83..c1820398 100644 --- a/nUpdate.Administration/UI/Dialogs/MainDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/MainDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/MainDialog.cs b/nUpdate.Administration/UI/Dialogs/MainDialog.cs index 8f969e01..a4e75c54 100644 --- a/nUpdate.Administration/UI/Dialogs/MainDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/MainDialog.cs @@ -7,13 +7,10 @@ using System.Security; using System.Security.Cryptography; using System.Windows.Forms; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Application; -using nUpdate.Administration.Core.Application.Extension; -using nUpdate.Administration.Core.Localization; +using nUpdate.Administration.Extension; +using nUpdate.Administration.Localization; using nUpdate.Administration.Properties; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/NewProjectDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/NewProjectDialog.Designer.cs index f52ac658..3849a678 100644 --- a/nUpdate.Administration/UI/Dialogs/NewProjectDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/NewProjectDialog.Designer.cs @@ -1,5 +1,4 @@ using nUpdate.Administration.UI.Controls; -using nUpdate.Internal.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/NewProjectDialog.cs b/nUpdate.Administration/UI/Dialogs/NewProjectDialog.cs index 8344b5f4..a31c506b 100644 --- a/nUpdate.Administration/UI/Dialogs/NewProjectDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/NewProjectDialog.cs @@ -13,11 +13,8 @@ using System.Threading.Tasks; using System.Windows.Forms; using MySql.Data.MySqlClient; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Application; using nUpdate.Administration.Properties; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; using Starksoft.Aspen.Ftps; namespace nUpdate.Administration.UI.Dialogs diff --git a/nUpdate.Administration/UI/Dialogs/PackageAddDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/PackageAddDialog.Designer.cs index 09bae675..1f58d0a9 100644 --- a/nUpdate.Administration/UI/Dialogs/PackageAddDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/PackageAddDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { @@ -93,18 +93,18 @@ private void InitializeComponent() this.loadingLabel = new System.Windows.Forms.Label(); this.createButton = new System.Windows.Forms.Button(); this.cancelButton = new System.Windows.Forms.Button(); - this.controlPanel1 = new nUpdate.Internal.UI.Controls.BottomPanel(); + this.controlPanel1 = new nUpdate.Administration.UI.Controls.BottomPanel(); this.categoryTabControl = new nUpdate.Administration.UI.Controls.TablessTabControl(); this.generalTabPage = new System.Windows.Forms.TabPage(); this.generalPanel = new System.Windows.Forms.Panel(); this.includeIntoStatisticsInfoLabel = new System.Windows.Forms.Label(); this.includeIntoStatisticsCheckBox = new System.Windows.Forms.CheckBox(); - this.line2 = new nUpdate.Internal.UI.Controls.Line(); + this.line2 = new nUpdate.Administration.UI.Controls.Line(); this.developmentBuildNumericUpDown = new System.Windows.Forms.NumericUpDown(); this.necessaryUpdateInfoLabel = new System.Windows.Forms.Label(); this.necessaryUpdateCheckBox = new System.Windows.Forms.CheckBox(); - this.line3 = new nUpdate.Internal.UI.Controls.Line(); - this.line1 = new nUpdate.Internal.UI.Controls.Line(); + this.line3 = new nUpdate.Administration.UI.Controls.Line(); + this.line1 = new nUpdate.Administration.UI.Controls.Line(); this.architectureInfoLabel = new System.Windows.Forms.Label(); this.buildNumericUpDown = new System.Windows.Forms.NumericUpDown(); this.descriptionLabel = new System.Windows.Forms.Label(); @@ -183,7 +183,7 @@ private void InitializeComponent() this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.conditionsTabPage = new System.Windows.Forms.TabPage(); this.conditionHelpLinkLabel = new System.Windows.Forms.LinkLabel(); - this.line4 = new nUpdate.Internal.UI.Controls.Line(); + this.line4 = new nUpdate.Administration.UI.Controls.Line(); this.rolloutConditionModeComboBox = new System.Windows.Forms.ComboBox(); this.rolloutConditionModeLabel = new System.Windows.Forms.Label(); this.conditionsDataGridView = new System.Windows.Forms.DataGridView(); @@ -417,7 +417,7 @@ private void InitializeComponent() // line2 // this.line2.BackColor = System.Drawing.SystemColors.Window; - this.line2.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line2.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line2.Location = new System.Drawing.Point(9, 323); this.line2.Name = "line2"; this.line2.Size = new System.Drawing.Size(437, 10); @@ -457,7 +457,7 @@ private void InitializeComponent() // line3 // this.line3.BackColor = System.Drawing.SystemColors.Window; - this.line3.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line3.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line3.Location = new System.Drawing.Point(10, 231); this.line3.Name = "line3"; this.line3.Size = new System.Drawing.Size(437, 10); @@ -467,7 +467,7 @@ private void InitializeComponent() // line1 // this.line1.BackColor = System.Drawing.SystemColors.Window; - this.line1.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line1.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line1.Location = new System.Drawing.Point(7, 153); this.line1.Name = "line1"; this.line1.Size = new System.Drawing.Size(437, 14); @@ -1300,7 +1300,7 @@ private void InitializeComponent() // line4 // this.line4.BackColor = System.Drawing.SystemColors.Window; - this.line4.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Vertical; + this.line4.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Vertical; this.line4.Location = new System.Drawing.Point(420, 7); this.line4.Name = "line4"; this.line4.Size = new System.Drawing.Size(10, 23); diff --git a/nUpdate.Administration/UI/Dialogs/PackageAddDialog.cs b/nUpdate.Administration/UI/Dialogs/PackageAddDialog.cs index 522c4d88..39f80676 100644 --- a/nUpdate.Administration/UI/Dialogs/PackageAddDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/PackageAddDialog.cs @@ -15,17 +15,13 @@ using System.Windows.Forms; using Ionic.Zip; using MySql.Data.MySqlClient; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Application; -using nUpdate.Administration.Core.History; -using nUpdate.Administration.Core.Operations.Panels; -using nUpdate.Administration.Core.Win32; +using nUpdate.Administration.History; +using nUpdate.Administration.Operations.Panels; using nUpdate.Administration.Properties; using nUpdate.Administration.UI.Controls; using nUpdate.Administration.UI.Popups; -using nUpdate.Core; -using nUpdate.Internal.Core; -using nUpdate.Internal.Core.Operations; +using nUpdate.Administration.Win32; +using nUpdate.Operations; using nUpdate.Updating; using Starksoft.Aspen.Ftps; using TransferProgressEventArgs = nUpdate.Administration.TransferInterface.TransferProgressEventArgs; @@ -963,7 +959,7 @@ private void InitializeDirectoryListing(bool onlyContent) selectedPath = folderDialog.SelectedPath; } - TaskEx.Run(() => ListDirectoryContent(selectedPath, onlyContent)); + Task.Run(() => ListDirectoryContent(selectedPath, onlyContent)); } private async void InitializePackage() diff --git a/nUpdate.Administration/UI/Dialogs/PackageEditDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/PackageEditDialog.Designer.cs index 1793919a..dd2e009c 100644 --- a/nUpdate.Administration/UI/Dialogs/PackageEditDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/PackageEditDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { @@ -92,18 +92,18 @@ private void InitializeComponent() this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.loadingLabel = new System.Windows.Forms.Label(); this.categoryTreeView = new nUpdate.Administration.UI.Controls.ExplorerTreeView(); - this.controlPanel1 = new nUpdate.Internal.UI.Controls.BottomPanel(); + this.controlPanel1 = new nUpdate.Administration.UI.Controls.BottomPanel(); this.categoryTabControl = new nUpdate.Administration.UI.Controls.TablessTabControl(); this.generalTabPage = new System.Windows.Forms.TabPage(); this.generalPanel = new System.Windows.Forms.Panel(); this.includeIntoStatisticsInfoLabel = new System.Windows.Forms.Label(); this.includeIntoStatisticsCheckBox = new System.Windows.Forms.CheckBox(); - this.line2 = new nUpdate.Internal.UI.Controls.Line(); + this.line2 = new nUpdate.Administration.UI.Controls.Line(); this.developmentBuildNumericUpDown = new System.Windows.Forms.NumericUpDown(); this.necessaryUpdateInfoLabel = new System.Windows.Forms.Label(); this.necessaryUpdateCheckBox = new System.Windows.Forms.CheckBox(); - this.line3 = new nUpdate.Internal.UI.Controls.Line(); - this.line1 = new nUpdate.Internal.UI.Controls.Line(); + this.line3 = new nUpdate.Administration.UI.Controls.Line(); + this.line1 = new nUpdate.Administration.UI.Controls.Line(); this.architectureInfoLabel = new System.Windows.Forms.Label(); this.buildNumericUpDown = new System.Windows.Forms.NumericUpDown(); this.descriptionLabel = new System.Windows.Forms.Label(); @@ -162,7 +162,7 @@ private void InitializeComponent() this.Description = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.conditionsTabPage = new System.Windows.Forms.TabPage(); this.conditionHelpLinkLabel = new System.Windows.Forms.LinkLabel(); - this.line4 = new nUpdate.Internal.UI.Controls.Line(); + this.line4 = new nUpdate.Administration.UI.Controls.Line(); this.rolloutConditionModeComboBox = new System.Windows.Forms.ComboBox(); this.rolloutConditionModeLabel = new System.Windows.Forms.Label(); this.conditionsDataGridView = new System.Windows.Forms.DataGridView(); @@ -450,7 +450,7 @@ private void InitializeComponent() // line2 // this.line2.BackColor = System.Drawing.SystemColors.Window; - this.line2.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line2.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line2.Location = new System.Drawing.Point(9, 262); this.line2.Name = "line2"; this.line2.Size = new System.Drawing.Size(437, 10); @@ -489,7 +489,7 @@ private void InitializeComponent() // line3 // this.line3.BackColor = System.Drawing.SystemColors.Window; - this.line3.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line3.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line3.Location = new System.Drawing.Point(10, 170); this.line3.Name = "line3"; this.line3.Size = new System.Drawing.Size(437, 10); @@ -499,7 +499,7 @@ private void InitializeComponent() // line1 // this.line1.BackColor = System.Drawing.SystemColors.Window; - this.line1.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line1.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line1.Location = new System.Drawing.Point(7, 92); this.line1.Name = "line1"; this.line1.Size = new System.Drawing.Size(437, 14); @@ -1119,7 +1119,7 @@ private void InitializeComponent() // line4 // this.line4.BackColor = System.Drawing.SystemColors.Window; - this.line4.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Vertical; + this.line4.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Vertical; this.line4.Location = new System.Drawing.Point(420, 7); this.line4.Name = "line4"; this.line4.Size = new System.Drawing.Size(10, 23); diff --git a/nUpdate.Administration/UI/Dialogs/PackageEditDialog.cs b/nUpdate.Administration/UI/Dialogs/PackageEditDialog.cs index 542aa6ca..dc6b594c 100644 --- a/nUpdate.Administration/UI/Dialogs/PackageEditDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/PackageEditDialog.cs @@ -14,22 +14,17 @@ using System.Windows.Forms; using Microsoft.Win32; using MySql.Data.MySqlClient; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Application; -using nUpdate.Administration.Core.History; -using nUpdate.Administration.Core.Operations.Panels; using nUpdate.Administration.UI.Controls; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; -using nUpdate.Internal.Core.Operations; using nUpdate.Updating; -using Newtonsoft.Json.Linq; using Starksoft.Aspen.Ftps; using OpenFileDialog = System.Windows.Forms.OpenFileDialog; -using nUpdate.Administration.Core.Win32; using Ionic.Zip; -using System.Threading; -using nUpdate.Administration.TransferInterface; +using Newtonsoft.Json.Linq; +using nUpdate.Administration.History; +using nUpdate.Administration.Operations.Panels; +using nUpdate.Administration.Win32; +using nUpdate.Operations; namespace nUpdate.Administration.UI.Dialogs { @@ -1618,7 +1613,7 @@ private void InitializeDirectoryListing(bool onlyContent) selectedPath = folderDialog.SelectedPath; } - TaskEx.Run(() => ListDirectoryContent(selectedPath, onlyContent)); + Task.Run(() => ListDirectoryContent(selectedPath, onlyContent)); } private void ListDirectoryContent(string path, bool onlyContent) diff --git a/nUpdate.Administration/UI/Dialogs/PackagesToAffectDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/PackagesToAffectDialog.Designer.cs index f75124c3..9563edff 100644 --- a/nUpdate.Administration/UI/Dialogs/PackagesToAffectDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/PackagesToAffectDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/PreferencesDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/PreferencesDialog.Designer.cs index 24baa48a..e8310d3e 100644 --- a/nUpdate.Administration/UI/Dialogs/PreferencesDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/PreferencesDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/PreferencesDialog.cs b/nUpdate.Administration/UI/Dialogs/PreferencesDialog.cs index 3eba53b7..26312e16 100644 --- a/nUpdate.Administration/UI/Dialogs/PreferencesDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/PreferencesDialog.cs @@ -8,12 +8,9 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Application; -using nUpdate.Administration.Core.Localization; +using nUpdate.Administration.Localization; using nUpdate.Administration.Properties; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/ProjectDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/ProjectDialog.Designer.cs index 96df90a9..9b49f330 100644 --- a/nUpdate.Administration/UI/Dialogs/ProjectDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/ProjectDialog.Designer.cs @@ -1,5 +1,4 @@ using nUpdate.Administration.UI.Controls; -using nUpdate.Internal.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { @@ -46,7 +45,7 @@ private void InitializeComponent() this.assemblyPathTextBox = new nUpdate.Administration.UI.Controls.ButtonTextBox(); this.label8 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.line5 = new nUpdate.Internal.UI.Controls.Line(); + this.line5 = new nUpdate.Administration.UI.Controls.Line(); this.label3 = new System.Windows.Forms.Label(); this.stepTwoLabel = new System.Windows.Forms.Label(); this.programmingLanguageComboBox = new System.Windows.Forms.ComboBox(); @@ -56,7 +55,7 @@ private void InitializeComponent() this.assumeHeader = new System.Windows.Forms.Label(); this.checkingUrlPictureBox = new System.Windows.Forms.PictureBox(); this.tickPictureBox = new System.Windows.Forms.PictureBox(); - this.line3 = new nUpdate.Internal.UI.Controls.Line(); + this.line3 = new nUpdate.Administration.UI.Controls.Line(); this.newestPackageLabel = new System.Windows.Forms.Label(); this.amountLabel = new System.Windows.Forms.Label(); this.checkUpdateConfigurationLinkLabel = new System.Windows.Forms.LinkLabel(); @@ -71,15 +70,15 @@ private void InitializeComponent() this.projectIdLabel = new System.Windows.Forms.Label(); this.publicKeyTextBox = new System.Windows.Forms.TextBox(); this.publicKeyLabel = new System.Windows.Forms.Label(); - this.line2 = new nUpdate.Internal.UI.Controls.Line(); + this.line2 = new nUpdate.Administration.UI.Controls.Line(); this.projectDataHeader = new System.Windows.Forms.Label(); - this.line1 = new nUpdate.Internal.UI.Controls.Line(); + this.line1 = new nUpdate.Administration.UI.Controls.Line(); this.ftpDirectoryLabel = new System.Windows.Forms.Label(); this.ftpHostLabel = new System.Windows.Forms.Label(); this.overviewHeader = new System.Windows.Forms.Label(); this.newestPackageReleasedLabel = new System.Windows.Forms.Label(); this.releasedPackagesAmountLabel = new System.Windows.Forms.Label(); - this.line4 = new nUpdate.Internal.UI.Controls.Line(); + this.line4 = new nUpdate.Administration.UI.Controls.Line(); this.panel2 = new System.Windows.Forms.Panel(); this.loadFromAssemblyRadioButton = new System.Windows.Forms.RadioButton(); this.enterVersionManuallyRadioButton = new System.Windows.Forms.RadioButton(); @@ -108,7 +107,7 @@ private void InitializeComponent() this.searchTextBox = new nUpdate.Administration.UI.Controls.CueTextBox(); this.statisticsTabPage = new System.Windows.Forms.TabPage(); this.updateStatisticsButton = new System.Windows.Forms.Button(); - this.controlPanel1 = new nUpdate.Internal.UI.Controls.BottomPanel(); + this.controlPanel1 = new nUpdate.Administration.UI.Controls.BottomPanel(); this.lastUpdatedLabel = new System.Windows.Forms.Label(); this.chartPanel = new System.Windows.Forms.Panel(); this.gatheringStatisticsPictureBox = new System.Windows.Forms.PictureBox(); @@ -248,7 +247,7 @@ private void InitializeComponent() // line5 // this.line5.BackColor = System.Drawing.Color.White; - this.line5.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line5.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line5.Location = new System.Drawing.Point(132, 368); this.line5.Name = "line5"; this.line5.Size = new System.Drawing.Size(398, 13); @@ -351,7 +350,7 @@ private void InitializeComponent() // line3 // this.line3.BackColor = System.Drawing.Color.White; - this.line3.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line3.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line3.Location = new System.Drawing.Point(25, 167); this.line3.Name = "line3"; this.line3.Size = new System.Drawing.Size(505, 10); @@ -497,7 +496,7 @@ private void InitializeComponent() // line2 // this.line2.BackColor = System.Drawing.Color.White; - this.line2.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line2.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line2.Location = new System.Drawing.Point(110, 270); this.line2.Name = "line2"; this.line2.Size = new System.Drawing.Size(420, 13); @@ -519,7 +518,7 @@ private void InitializeComponent() // line1 // this.line1.BackColor = System.Drawing.Color.White; - this.line1.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line1.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line1.Location = new System.Drawing.Point(144, 24); this.line1.Name = "line1"; this.line1.Size = new System.Drawing.Size(386, 13); @@ -578,7 +577,7 @@ private void InitializeComponent() // line4 // this.line4.BackColor = System.Drawing.Color.White; - this.line4.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line4.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line4.Location = new System.Drawing.Point(101, 532); this.line4.Name = "line4"; this.line4.Size = new System.Drawing.Size(432, 10); diff --git a/nUpdate.Administration/UI/Dialogs/ProjectDialog.cs b/nUpdate.Administration/UI/Dialogs/ProjectDialog.cs index 67678294..b3496762 100644 --- a/nUpdate.Administration/UI/Dialogs/ProjectDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/ProjectDialog.cs @@ -16,15 +16,11 @@ using System.Windows.Forms; using Ionic.Zip; using MySql.Data.MySqlClient; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Application; -using nUpdate.Administration.Core.History; +using nUpdate.Administration.History; using nUpdate.Administration.Properties; using nUpdate.Administration.TransferInterface; using nUpdate.Administration.UI.Controls; using nUpdate.Administration.UI.Popups; -using nUpdate.Core; -using nUpdate.Internal.Core; using nUpdate.Updating; namespace nUpdate.Administration.UI.Dialogs @@ -1270,7 +1266,7 @@ private async void uploadButton_Click(object sender, EventArgs e) private async Task UploadPackage(UpdateVersion packageVersion) { - await TaskEx.Run(() => + await Task.Run(() => { if (!File.Exists( Project.Packages.First(item => item.Version == packageVersion.ToString()).LocalPackagePath)) diff --git a/nUpdate.Administration/UI/Dialogs/ProjectEditDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/ProjectEditDialog.Designer.cs index 2719f3b2..cf09c541 100644 --- a/nUpdate.Administration/UI/Dialogs/ProjectEditDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/ProjectEditDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/ProjectEditDialog.cs b/nUpdate.Administration/UI/Dialogs/ProjectEditDialog.cs index eb5aeb38..f18cd809 100644 --- a/nUpdate.Administration/UI/Dialogs/ProjectEditDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/ProjectEditDialog.cs @@ -13,11 +13,8 @@ using System.Threading.Tasks; using System.Windows.Forms; using MySql.Data.MySqlClient; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Application; using nUpdate.Administration.Properties; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; using nUpdate.Updating; using Starksoft.Aspen.Ftps; diff --git a/nUpdate.Administration/UI/Dialogs/ProjectImportDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/ProjectImportDialog.Designer.cs index fc5843ce..e59aaf31 100644 --- a/nUpdate.Administration/UI/Dialogs/ProjectImportDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/ProjectImportDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/ProjectImportDialog.cs b/nUpdate.Administration/UI/Dialogs/ProjectImportDialog.cs index 26c2606e..9ca1684a 100644 --- a/nUpdate.Administration/UI/Dialogs/ProjectImportDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/ProjectImportDialog.cs @@ -8,10 +8,7 @@ using System.Linq; using System.Windows.Forms; using Ionic.Zip; -using nUpdate.Administration.Core; -using nUpdate.Administration.Core.Application; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; using nUpdate.Updating; namespace nUpdate.Administration.UI.Dialogs diff --git a/nUpdate.Administration/UI/Dialogs/ProjectRemovalDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/ProjectRemovalDialog.Designer.cs index 971057fe..76d26992 100644 --- a/nUpdate.Administration/UI/Dialogs/ProjectRemovalDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/ProjectRemovalDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { @@ -32,7 +32,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectRemovalDialog)); this.projectsTreeView = new nUpdate.Administration.UI.Controls.ExplorerTreeView(); - this.line1 = new nUpdate.Internal.UI.Controls.Line(); + this.line1 = new nUpdate.Administration.UI.Controls.Line(); this.label2 = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.noProjectsLabel = new System.Windows.Forms.Label(); @@ -53,7 +53,7 @@ private void InitializeComponent() // // line1 // - this.line1.LineAlignment = nUpdate.Internal.UI.Controls.Line.Alignment.Horizontal; + this.line1.LineAlignment = nUpdate.Administration.UI.Controls.Line.Alignment.Horizontal; this.line1.Location = new System.Drawing.Point(-6, 225); this.line1.Name = "line1"; this.line1.Size = new System.Drawing.Size(401, 10); diff --git a/nUpdate.Administration/UI/Dialogs/ProjectRemovalDialog.cs b/nUpdate.Administration/UI/Dialogs/ProjectRemovalDialog.cs index 70a03a8a..adc8e62b 100644 --- a/nUpdate.Administration/UI/Dialogs/ProjectRemovalDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/ProjectRemovalDialog.cs @@ -8,9 +8,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Windows.Forms; -using nUpdate.Administration.Core; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/StatisticsServerAddDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/StatisticsServerAddDialog.Designer.cs index c302d82b..0fab15c9 100644 --- a/nUpdate.Administration/UI/Dialogs/StatisticsServerAddDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/StatisticsServerAddDialog.Designer.cs @@ -1,5 +1,4 @@ using nUpdate.Administration.UI.Controls; -using nUpdate.Internal.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/StatisticsServerDialog.cs b/nUpdate.Administration/UI/Dialogs/StatisticsServerDialog.cs index b10b2b2e..8d19fe87 100644 --- a/nUpdate.Administration/UI/Dialogs/StatisticsServerDialog.cs +++ b/nUpdate.Administration/UI/Dialogs/StatisticsServerDialog.cs @@ -7,10 +7,8 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using nUpdate.Administration.Core; using nUpdate.Administration.UI.Controls; using nUpdate.Administration.UI.Popups; -using nUpdate.Internal.Core; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Dialogs/StatisticsServerEditDialog.Designer.cs b/nUpdate.Administration/UI/Dialogs/StatisticsServerEditDialog.Designer.cs index f2b33d67..4329914b 100644 --- a/nUpdate.Administration/UI/Dialogs/StatisticsServerEditDialog.Designer.cs +++ b/nUpdate.Administration/UI/Dialogs/StatisticsServerEditDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Dialogs { diff --git a/nUpdate.Administration/UI/Popups/PopupDialog.Designer.cs b/nUpdate.Administration/UI/Popups/PopupDialog.Designer.cs index 7c562317..53b18bf0 100644 --- a/nUpdate.Administration/UI/Popups/PopupDialog.Designer.cs +++ b/nUpdate.Administration/UI/Popups/PopupDialog.Designer.cs @@ -1,4 +1,4 @@ -using nUpdate.Internal.UI.Controls; +using nUpdate.Administration.UI.Controls; namespace nUpdate.Administration.UI.Popups { diff --git a/nUpdate.Administration/Core/Application/UpdatePackage.cs b/nUpdate.Administration/UpdatePackage.cs similarity index 94% rename from nUpdate.Administration/Core/Application/UpdatePackage.cs rename to nUpdate.Administration/UpdatePackage.cs index b8d53359..0664310b 100644 --- a/nUpdate.Administration/Core/Application/UpdatePackage.cs +++ b/nUpdate.Administration/UpdatePackage.cs @@ -3,7 +3,7 @@ using System; -namespace nUpdate.Administration.Core.Application +namespace nUpdate.Administration { /// /// Represents a local update package. diff --git a/nUpdate.Administration/Core/Application/UpdateProject.cs b/nUpdate.Administration/UpdateProject.cs similarity index 97% rename from nUpdate.Administration/Core/Application/UpdateProject.cs rename to nUpdate.Administration/UpdateProject.cs index 97782d42..68455434 100644 --- a/nUpdate.Administration/Core/Application/UpdateProject.cs +++ b/nUpdate.Administration/UpdateProject.cs @@ -5,11 +5,10 @@ using System.Collections.Generic; using System.IO; using System.Net; -using nUpdate.Administration.Core.History; -using nUpdate.Internal.Core; +using nUpdate.Administration.History; using Starksoft.Aspen.Ftps; -namespace nUpdate.Administration.Core.Application +namespace nUpdate.Administration { /// /// Represents a local update project. diff --git a/nUpdate.Administration/Core/ValidationManager.cs b/nUpdate.Administration/ValidationManager.cs similarity index 95% rename from nUpdate.Administration/Core/ValidationManager.cs rename to nUpdate.Administration/ValidationManager.cs index a9681980..f245a4bf 100644 --- a/nUpdate.Administration/Core/ValidationManager.cs +++ b/nUpdate.Administration/ValidationManager.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Windows.Forms; -namespace nUpdate.Administration.Core +namespace nUpdate.Administration { public class ValidationManager { diff --git a/nUpdate.Administration/Core/Win32/IconReader.cs b/nUpdate.Administration/Win32/IconReader.cs similarity index 97% rename from nUpdate.Administration/Core/Win32/IconReader.cs rename to nUpdate.Administration/Win32/IconReader.cs index d47df99a..b8dd897f 100644 --- a/nUpdate.Administration/Core/Win32/IconReader.cs +++ b/nUpdate.Administration/Win32/IconReader.cs @@ -5,7 +5,7 @@ using System.Drawing; using System.Runtime.InteropServices; -namespace nUpdate.Administration.Core.Win32 +namespace nUpdate.Administration.Win32 { public static class IconReader { diff --git a/nUpdate.Administration/Core/Win32/Margins.cs b/nUpdate.Administration/Win32/Margins.cs similarity index 87% rename from nUpdate.Administration/Core/Win32/Margins.cs rename to nUpdate.Administration/Win32/Margins.cs index 5830e3eb..c29e3881 100644 --- a/nUpdate.Administration/Core/Win32/Margins.cs +++ b/nUpdate.Administration/Win32/Margins.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; -namespace nUpdate.Administration.Core.Win32 +namespace nUpdate.Administration.Win32 { [StructLayout(LayoutKind.Sequential)] public struct Margins diff --git a/nUpdate.Administration/Core/Win32/NativeMethods.cs b/nUpdate.Administration/Win32/NativeMethods.cs similarity index 96% rename from nUpdate.Administration/Core/Win32/NativeMethods.cs rename to nUpdate.Administration/Win32/NativeMethods.cs index c05ae7d8..b91744d1 100644 --- a/nUpdate.Administration/Core/Win32/NativeMethods.cs +++ b/nUpdate.Administration/Win32/NativeMethods.cs @@ -6,7 +6,7 @@ using System.Text; using nUpdate.Administration.UI.Controls; -namespace nUpdate.Administration.Core.Win32 +namespace nUpdate.Administration.Win32 { internal sealed class NativeMethods { @@ -44,9 +44,6 @@ public enum ShGetFileInfoFlags // Not portable (bool) - [DllImport("dwmapi.dll", PreserveSig = false)] - public static extern bool DwmIsCompositionEnabled(); - [DllImport("user32.dll")] public static extern bool EndPaint(IntPtr hWnd, ref PaintStruct paintStruct); diff --git a/nUpdate.Administration/Core/Win32/PaintStruct.cs b/nUpdate.Administration/Win32/PaintStruct.cs similarity index 95% rename from nUpdate.Administration/Core/Win32/PaintStruct.cs rename to nUpdate.Administration/Win32/PaintStruct.cs index 9e9683bf..60994a9c 100644 --- a/nUpdate.Administration/Core/Win32/PaintStruct.cs +++ b/nUpdate.Administration/Win32/PaintStruct.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.InteropServices; -namespace nUpdate.Administration.Core.Win32 +namespace nUpdate.Administration.Win32 { [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] public struct PaintStruct diff --git a/nUpdate.Administration/nUpdate.Administration.csproj b/nUpdate.Administration/nUpdate.Administration.csproj index 45e219a5..9ac58df8 100644 --- a/nUpdate.Administration/nUpdate.Administration.csproj +++ b/nUpdate.Administration/nUpdate.Administration.csproj @@ -1,5 +1,5 @@  - + true @@ -10,7 +10,7 @@ Properties nUpdate.Administration nUpdate Administration - v4.0 + v4.6.1 512 ..\..\ @@ -53,168 +53,150 @@ Trade-Updater-Logo-v3.ico - - ..\packages\DotNetZip.1.13.3\lib\net40\DotNetZip.dll + + ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll + True ..\packages\FCTB.2.16.24\lib\FastColoredTextBox.dll - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True + + ..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Microsoft.CSharp.dll - ..\packages\MySql.Data.6.9.9\lib\net40\MySql.Data.dll + ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll + True - - ..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\nUpdate.Administration.TransferInterface\bin\Debug\nUpdate.Administration.TransferInterface.dll - - - - ..\packages\starksoft.aspen.1.1.0\lib\net40\starksoft.aspen.dll + + ..\packages\starksoft.aspen.1.1.8\lib\net45\starksoft.aspen.dll + True - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - True - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - True - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll - True - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + UserControl - + ScriptExecuteOperationPanel.cs - - - - - - - - - - - - - + + + + + + + + + + + + + UserControl - + FileDeleteOperationPanel.cs - + UserControl - + FileRenameOperationPanel.cs - - + + UserControl - + ProcessStartOperationPanel.cs - + UserControl - + ProcessStopOperationPanel.cs - + UserControl - + RegistrySubKeyCreateOperationPanel.cs - + UserControl - + RegistrySubKeyDeleteOperationPanel.cs - + UserControl - + RegistryDeleteValueOperationPanel.cs - + UserControl - + RegistrySetValueOperationPanel.cs - + UserControl - + ServiceStartOperationPanel.cs - + UserControl - + ServiceStopOperationPanel.cs - - - + + + + Component - - + + @@ -232,29 +214,15 @@ Component - - Component - - - - Component - - - - Component - - - Component - - - Component - Component Component + + Component + Component @@ -412,37 +380,37 @@ PopupDialog.cs - + FileDeleteOperationPanel.cs - + FileRenameOperationPanel.cs - + ProcessStartOperationPanel.cs - + ProcessStopOperationPanel.cs - + RegistrySubKeyCreateOperationPanel.cs - + RegistrySubKeyDeleteOperationPanel.cs - + RegistryDeleteValueOperationPanel.cs - + RegistrySetValueOperationPanel.cs - + ScriptExecuteOperationPanel.cs - + ServiceStartOperationPanel.cs - + ServiceStopOperationPanel.cs @@ -612,13 +580,9 @@ - - {b60f0aee-f710-44ff-9c64-7bc4fcbd1bf5} - nUpdate.ProvideTAP - - - {EFB71D69-EBF9-4F60-B776-DE443730A3DD} - nUpdate.Internal + + {6bb31893-efce-406f-9d18-80959a956f99} + nUpdate @@ -629,9 +593,7 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - +5~fPnD@1L0`&+oC>#A{@2B+TEsU=Bh@i3 zWy*cY`?on!a?p|c()*^LdM>>t=qLFQ?^~YA57jX)<;m-}l!JxQ(#vf;D38%iYe_fv zsdD9Qpbd83SS4OaFP&Rex$$Usy?lv1*58K>+0#BaD#;@@nJp3{gHR+w47fdE$5qVA7OLdgV>v&sn>c> z!_!CE^?JRAdOg2Ny;hlVQgPTbo-?6dtK4{$U9Z=5)a&_^sMo4z{M2|x=D(evSFcsi z_>?iPYc;eB^DESAy>I%It#n?UN_fjMthS+CHm^>#^k2U|Nz-Md%ue8wy<7b;U< z>lr(EJ}e?`!WkZkDRJ3XnQ{7)e3mjcvqG7eX<=$2?Y&IQB1~Cby{C4YQf2L-3c7mF zbW{C}tZ~TN)qAF!O3yoju8fO2i{*j7=a)ELnXO*qc&glZv_I*5n;GWuI=2iACgTdp zw>YlFq@1k@_r*_liPM{hM`XxXwVLwEpz?e6Ggx9@-4-|a=LEoebc8Nd3^Q+ z{hra`%@fmDWyYaCIY-u?%#?R~%ZuerUBmq)9C)AOC^21 zZ~D|RPm_m({_x1!ko3BNwx@~8j6=Qh_PCelg_#kYi`b=*$=lVNinJa{*i>#j0`2AL z-U_@+M}y-yUaDhUGRVWZlrewsxnig!g+xN?;Z&J%s8i0_>713!$ygwrqcY{Rq{bri zSc?+;IL8B+il6EjH;mi#{pz)WyL#9U#c*GG-}F=C1FAf6m^dzbg7;;qxGbhGc!HGO zq+5#PuQIjYmx{~Yz)8laMjcnbRL8ifxJcL@6UiZ|;n39Bm)=+XR_dddy8~79^}gv- z7hQilVXI_c@0)&V%+N%iRY_m(n|^9MdVkPoyXlRk{uM)G!(jvU!C{^RBn&!URvqI~ z=e*oV98ads$&=~I;l3+M{Ru~9$|+Lsyll(;$MX(%8e>9P!GUKG;vp@EuFR~aQ z#Iq+JAJs7~ZHlMGBJ%cx&~I1gs*Z6<3y+_q#iPR*qr0@B$R3CM?fz7zoL1_Qm!++N zQ`@H}P9^$!-}LEgJbYs3$&qhRc6lFX9*@aWLqqCars^nH^53~95x2_R`Z%1bW8735 zCN}3q=|`j_tSVE^`cyx6GydkWneHIl)aj#9!cm!VQvKWk%D!{LBT*_1Rc0LOm$&K5 z2*5mPUoIOS9=o`-t#g~c4D_^Dx$!8Ep7wVHoK$@eBqNF6 zyp|kI_^PM;e%dtW%b2zbpV3FcS3Tp?t~q~Cbv|AazUmpDkU77JF=ZA1cuDxGXM95D zd|4Y@g-;1h_^M}oB+i$!nX2$9H3?t!jE}_m+pF^_4GCZMj8EBe{tU)-Rs2&b629sg zKQ*4(TAfcRN%*Q~d@Q^F1J(J2GU2P9@l)k*9plC-;g?suaUE7Ye_0n@jV}ej z>x=3cpSIEYvUa)}Un+p}RnPdekIt8M*46k@0i3UT#_yNCEp&_`>#*U=i|hE9vCHJ_ zl=1+NXxpSFw#hDyZb$Xa4sDs+*)thCVLYLIt?HW{#x?1_Z+3;gZ?^S)t)!jz4G$2% z+4lU&{M3*PWIUWIQ~Rx{{$v5|=j_lI>51uSj>?Qf8o8gJ zWyYZ(I_J9B*F=uWj6>n`K0)S#)z9jIu|YZiN6UcTH+|YP*FO~d7_YDQO`kT*<1cON z?5K~a-I8YN+AdbzToLpURC#+vU7< zw0*OqZKZO?p{K9PjaN+4SH2CIU14rp@0dV|vm&fbtebXl%UUpXoeW}Ox(k7KR zDl<;1y|^~^F_EJ(jfal5JRW-A^l2+x|6uH6yuRKyecB0+$71S7%Ko@< zlFF1*q>XS+f8fZNKlm8OQJHaQAG}T95&N;V+f@$8^!Ta1*};R`IS~7voE_CSJG3Jn zho#ilxiTh=d#a?2sLVLDCC-s?Q{cp}P7{vGjFW0lR#P9xbM$~okEhCwml|h7i%tyX z*H7k3e5p)1EvY!|4;;yti5!&~hd6n?m$G`IJvXEe0`u^x+<2*YN%=c5;u$!7pjWC6 zsN8s|c*#6>;Q8TPDUQmFLtE%&db@M%4X}qz@0&htpy$&gvHryOuqrbS?S;23{p4*3 zS1LSu&vc7P8#a#&I5Dbx=#+;|b&R_{37h2IahU^5oTD=3)TR2?y*V6}8Hak}X?6$s zb6o214fmnjeG?Bna6hVJ@lUlk>j>AZP_C1W z|DB^U<+P^So4tV}<$5AVWyT@Re2s;~=TX5=^^M})uj*P@X|EfsPu~@6Okxvv^xT$m z%vOIgwiX{xjOPX72E?~4jrppl{1Wl;vH8_GeAHsT>KUK%;C!)rdKLfDfP45=&-k}26a7MFHXt4XO;MzV!B1@g~xM$xS!04@@Jf`D${f=rpD>g zzMhhdhbFvdRk`xkQztw>rF}hx_m&m+!A<#9J>#d!lgw>8e?rov_^N08RQs|k@F%XH z(EFyJYG3BjzMhh4U-X{oQr3=Lf4C_i-}qeh=z7_PC%Pz_bHnoJd;Kd|8MW?Yz9(J4 zcc$Ebg!f&3J%N9m7XJA09>4dS-{`-@mi){A*1OM)7Eos8+6Tl>`m%5MYV{r5iXqkm z46-7tmiHQZeAQ^w)L1CAbv09{x!iVTUr&j4out-x^Nww@zE~Z%akRKOYHzP^>1k_} zW;tB>zM7*!b8r&Bll7(XjOXl|JG$$d+B*u9@ON&snmmz9zMGz!ztO0%!oMZ>Zot+ ztgG)-ONaCMtoSVJO%SH&(_XtRFAa|H0aABYp}D2LyW1S+$MwRf&FaIUDfp#~;%RK4 zRIc^GUpZDWYam`mcLftRo1sQw>GwScoH9`JY5j&X1+r%*+0UPTW|3HYHd!&r_SR<^$m4} zj;4aO3i)w;YS@=U9POe!PrLw*WA+6+|%e4Dc|=qqI<0F-oo!>eJ3OF+W4PQLkC&h)99I;?{{G&ag}R1 zn5^G;CRd`od4#vY@tvr?v#X`OwUv>qUitpd(d~jzy&C6}_1`r-TEcUGse5>{wH__) zJw0{pEtBa38pA$261u6xIrx+p-{!EXP~X(p*xIA9JY2ic6z#Cc&6;XFWj5MbR5WY$y2a-Rv68`xr-0 zDIETpl%Gl1)6&+_S=S-YjB@4sU84IGp(klSCBGJ5cU$OeDl~S+Rq8N)>!YRCXdT4& zl>Ej+HwysypvMDs6zZB9>+7vj=f}G?x{h>~OZJ4ClK(3C9<>$f>U&xWlWWU5!+DY7 ze=C@h|4g*4*f;moH8;05YiY}mdwaCZ#@YMGgUR~V@#JXj(hK{dW|F$Ixi!4=l{n=4 zTNd^{7rm*B2U7mlu9cWg*S{0(>q$4x_tnh@4q9GITN{-g5M&(S^xD> zPkncNb94LT#zS3^JmbqXCI2gGvwgLs{rIrR2lS2I3>zBjnYs;Eep+-#*O=ZqekYw4 zlL?FDOG|fGV`D?dkPw{w*Yt;_p0Knw6dKyQ z>a1|&hh_0m42!JP>S=0iDHJ+v1ePC`^X2^9a7}-@G!d4DhK8QH?oO+~`C(ZUkISZ9 zPAim`sHdl+yRjpFWe;k`JASIpr_UQ`RGEN-qAzb!euSLEhxf)D-dl5c zJ92op=J0OM;e8;7cV`ao?i}7{a(G|J;qA-eeJzJ4dn;GV_wVHJewf31IEVL(9Nw>T zcr&P2)x!B0WYx;&$vM3FIlMD-cnfoQ=jHI~b9ikzybE)9g&f|+IlRkqcx!TaYjb#| z9G=Yoeg?>8Kk>hp@Eo%w{54VbQe^%dnB~0@*{R0kF(AG~Pu47XnaIlCk8GA{XJsGG z;e9NJ_i1D=F`N7|z9cM9o+0lG^vcRMAp5)(?5ym3zD;?SMItMcJu&5dgIrnJ&B(rN ziItUYoR_3aRyKr;DeQ0&toRaBuR!)_ORTKy+9$~R5xugqHzRv(71{jx5vOWZ=B-2K z`Ioi1F-JCp%=0$OyE2FO${e2Tr@y{RIKQ7`^T#=|pXJC7A$vy^e>W|VciffJ>;nkS zt0Mabvi((LpWr1`PZik=_DFB7B6|ih8BfZUP3x}SYi%qv&c=Gp9-?|GD!wIJK1v*Ja;E=HblBX4fR+f~@RhWPZ&qC4NIS>;)`;aAjp5tBE*$SFfz>7sxKDBI~9gdHp1@T-5i@gLiTo1;>z+~cTV-Rz5y9kFkD&QF5y`P%F1>>Ey;I=2=OIB_!P25b|)+Q z0WzOU%F51odQ#uBvN~iwKFiA1=E!b9Mzb8QEbn$?CsmQj`6!+)S>D%?U2%M6o1HWg z3(cnYJ@Tid%LZgLBjL)*UYp{1eG*0C-Hy!bQC4;bGOtHj*_3zMI24ki$EO>;)k;ld|Y(c5!VKea-5_V@=0pXVE!)wF>VbGEYw*Pde`qGC7|| zuE*(5_`lrx2$SeOX2{CEf{bB9xV*f{AHq9;?DavC)O(l7S+kz+k2f8c$$7F~uCubY z=J4V(hB1`o#peK5kja^@o-SFQoZISYm6h#Ac7uie6#JDQiF;>Lb=kfg*-M+FXqgz{ z%G!JvGWo8xlI(LWQFN(_;&FxiDe9*(z${dey$IR4Rb;P1=3`;+uSHdC-h|BC!L00) z$h?{}XE3*Gi$-JD3ipXX?BMB!%uJ{t!JY-%5)3W1Pt@Kz?z=E%>JRRLxHZJjd z^1Cp+Z8#3b2|Sn1U0_8jW{;}`>-OnY+*b?a2tVb7;MJB|M8bkh1sZU=pIPCrLJ13U7K(RpUpYE5oAG+5GM2}$ zfI4#HzC7TFLm8HH6gN*ph*tF43;SMQTz7Pgc9+Tn8;4lBe8h1Nxt@J5c*Itpw}SlE z)qehuu-b2$!dqqi%`{mbzpClTjcPfyrOHQcF63CX6;MZRo~#S2V9WY*mAbHTKyUDPriC#rmA`HGaY6}^y@Au!_#I{gI=^9?~j7%Fp8Y!;9jYF z!cJ>wuNoNYAHJ$wx{_UB+4SUS*rr%qInY)0$iv+x=mio8N(lqmm;;Mk7$}-OOg_8`xKVx}!3| z{?UpEU)h9@xO(j$BeKW)w8lp2NjL$m+#COMS{;;p$B;6S2$K@=ooV&cCle}tOsLR9 z9fcMpn3qoLXxSbhi;tG=&{6W`luS*HvIVd;yho*N4+%ADCw;LGb#bFkoJ?Db8yr{+ zj+*^=>|%~c!7w(T{vul?Z>HZ-CMHQ)lgV)2p)oZZMW6V=ljmQ*OW)+5&EN7O?~6bt zz~9Mat4ykQ@GBGVx3a?HEPmH8=_)USML%zs#>s+CT8zMp(aB*RzRD4X7tCc&!z^ zm^_wWxfYO4`$&#W{QGx-Mfj=1-vNFfuHnpc%26HRT1TSa4;FyCkqPbso5(Nu&bp3r zvXbnUJ@4Dlk+TkVf;IeG%Ih_hsT(PCyD1m<8Zk-vi$V4}l+mAAazey^^>Y6)tf8|)kLbQ zRFfKT7C0N!fqFpFg*7@9t*9BafL723+Q9{YS50BvZA54a8d6?iXrAJ_?Q2Y(IT4|ajS0e=fV0PX-E1Rnw)2D`yW zz@6alz+K>@;A7zL!6(4S!QJ4KU=R2d_%!$oxCeX|d=7jb+zY+{{sH_W*bBZ0z68Du v_JMx_UjbhQ_kn)~UjttU$1dI@lL)^A|8p!cj-|k{6gZXw$5P-ADh2)*uvEGA diff --git a/nUpdate.Internal/app.config b/nUpdate.Internal/app.config deleted file mode 100644 index 5af92fa5..00000000 --- a/nUpdate.Internal/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/nUpdate.Internal/nUpdate.Internal.csproj b/nUpdate.Internal/nUpdate.Internal.csproj deleted file mode 100644 index ca30941e..00000000 --- a/nUpdate.Internal/nUpdate.Internal.csproj +++ /dev/null @@ -1,182 +0,0 @@ - - - - - Debug - AnyCPU - {EFB71D69-EBF9-4F60-B776-DE443730A3DD} - Library - Properties - nUpdate.Internal - nUpdate.Internal - v4.0 - 512 - - ..\ - true - - - - - true - full - false - bin\Debug\ - TRACE - prompt - 0 - false - bin\Debug\nUpdate.Internal.xml - MinimumRecommendedRules.ruleset - - - full - true - bin\Release\ - TRACE - prompt - 4 - true - - - OnBuildSuccess - - - true - bin\No TAP\ - DEBUG;TRACE - bin\Debug\nUpdate.XML - 0 - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\Provide TAP\ - TRACE;DEBUG;PROVIDE_TAP - bin\Debug\nUpdate.XML - 0 - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\Newtonsoft.Json.12.0.2\lib\net40\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - - Component - - - - - Form - - - PopupDialog.cs - - - - True - True - Resources.resx - - - - - - - ResXFileCodeGenerator - Designer - Resources.Designer.cs - - - PopupDialog.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - - \ No newline at end of file diff --git a/nUpdate.Internal/nUpdate.Internal.csproj.DotSettings b/nUpdate.Internal/nUpdate.Internal.csproj.DotSettings deleted file mode 100644 index 6e7fff86..00000000 --- a/nUpdate.Internal/nUpdate.Internal.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - No \ No newline at end of file diff --git a/nUpdate.Internal/nUpdate.csproj.DotSettings b/nUpdate.Internal/nUpdate.csproj.DotSettings deleted file mode 100644 index 6e7fff86..00000000 --- a/nUpdate.Internal/nUpdate.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - No \ No newline at end of file diff --git a/nUpdate.Internal/packages.config b/nUpdate.Internal/packages.config deleted file mode 100644 index 5710d21a..00000000 --- a/nUpdate.Internal/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nUpdate.ProvideTAP/Properties/AssemblyInfo.cs b/nUpdate.ProvideTAP/Properties/AssemblyInfo.cs deleted file mode 100644 index a082350b..00000000 --- a/nUpdate.ProvideTAP/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,40 +0,0 @@ -// AssemblyInfo.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System.Reflection; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("nUpdate.ProvideTAP")] -[assembly: - AssemblyDescription( - "The nUpdate class library the provides all features used for updating based on asynchronous tasks.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("nUpdate.ProvideTAP")] -[assembly: AssemblyCopyright("Copyright © Dominic Beger 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly -// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von -// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("b60f0aee-f710-44ff-9c64-7bc4fcbd1bf5")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -// indem Sie "*" wie unten gezeigt eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.5.0.0")] -[assembly: AssemblyFileVersion("3.5.0.0")] diff --git a/nUpdate.ProvideTAP/UI/Dialogs/NewUpdateDialog.Designer.cs b/nUpdate.ProvideTAP/UI/Dialogs/NewUpdateDialog.Designer.cs deleted file mode 100644 index 2d95bdc4..00000000 --- a/nUpdate.ProvideTAP/UI/Dialogs/NewUpdateDialog.Designer.cs +++ /dev/null @@ -1,227 +0,0 @@ -using nUpdate.Internal.UI.Controls; - -namespace nUpdate.UI.Dialogs -{ - partial class NewUpdateDialog - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.changelogTextBox = new System.Windows.Forms.RichTextBox(); - this.headerLabel = new System.Windows.Forms.Label(); - this.infoLabel = new System.Windows.Forms.Label(); - this.newestVersionLabel = new System.Windows.Forms.Label(); - this.currentVersionLabel = new System.Windows.Forms.Label(); - this.updateSizeLabel = new System.Windows.Forms.Label(); - this.changelogLabel = new System.Windows.Forms.Label(); - this.iconPictureBox = new System.Windows.Forms.PictureBox(); - this.controlPanel1 = new BottomPanel(); - this.cancelButton = new System.Windows.Forms.Button(); - this.installButton = new System.Windows.Forms.Button(); - this.accessLabel = new System.Windows.Forms.Label(); - this.line1 = new Line(); - ((System.ComponentModel.ISupportInitialize)(this.iconPictureBox)).BeginInit(); - this.controlPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // changelogTextBox - // - this.changelogTextBox.BackColor = System.Drawing.Color.White; - this.changelogTextBox.BulletIndent = 10; - this.changelogTextBox.Location = new System.Drawing.Point(12, 185); - this.changelogTextBox.Name = "changelogTextBox"; - this.changelogTextBox.ReadOnly = true; - this.changelogTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedVertical; - this.changelogTextBox.Size = new System.Drawing.Size(351, 102); - this.changelogTextBox.TabIndex = 0; - this.changelogTextBox.Text = ""; - this.changelogTextBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.changelogTextBox_LinkClicked); - // - // headerLabel - // - this.headerLabel.AutoSize = true; - this.headerLabel.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headerLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(51)))), ((int)(((byte)(153))))); - this.headerLabel.Location = new System.Drawing.Point(61, 12); - this.headerLabel.Name = "headerLabel"; - this.headerLabel.Size = new System.Drawing.Size(189, 21); - this.headerLabel.TabIndex = 2; - this.headerLabel.Text = "{0} new updates available."; - // - // infoLabel - // - this.infoLabel.Location = new System.Drawing.Point(63, 36); - this.infoLabel.Name = "infoLabel"; - this.infoLabel.Size = new System.Drawing.Size(300, 34); - this.infoLabel.TabIndex = 4; - this.infoLabel.Text = "New updates can be downloaded for {0}."; - // - // newestVersionLabel - // - this.newestVersionLabel.AutoSize = true; - this.newestVersionLabel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.newestVersionLabel.Location = new System.Drawing.Point(9, 82); - this.newestVersionLabel.Name = "newestVersionLabel"; - this.newestVersionLabel.Size = new System.Drawing.Size(121, 13); - this.newestVersionLabel.TabIndex = 12; - this.newestVersionLabel.Text = "Available versions: {0}"; - // - // currentVersionLabel - // - this.currentVersionLabel.AutoSize = true; - this.currentVersionLabel.Location = new System.Drawing.Point(9, 100); - this.currentVersionLabel.Name = "currentVersionLabel"; - this.currentVersionLabel.Size = new System.Drawing.Size(104, 13); - this.currentVersionLabel.TabIndex = 13; - this.currentVersionLabel.Text = "Current version: {0}"; - // - // updateSizeLabel - // - this.updateSizeLabel.AutoSize = true; - this.updateSizeLabel.Location = new System.Drawing.Point(9, 117); - this.updateSizeLabel.Name = "updateSizeLabel"; - this.updateSizeLabel.Size = new System.Drawing.Size(118, 13); - this.updateSizeLabel.TabIndex = 14; - this.updateSizeLabel.Text = "Total package size: {0}"; - // - // changelogLabel - // - this.changelogLabel.AutoSize = true; - this.changelogLabel.Location = new System.Drawing.Point(9, 166); - this.changelogLabel.Name = "changelogLabel"; - this.changelogLabel.Size = new System.Drawing.Size(67, 13); - this.changelogLabel.TabIndex = 15; - this.changelogLabel.Text = "Changelog:"; - // - // iconPictureBox - // - this.iconPictureBox.Location = new System.Drawing.Point(16, 17); - this.iconPictureBox.Name = "iconPictureBox"; - this.iconPictureBox.Size = new System.Drawing.Size(41, 39); - this.iconPictureBox.TabIndex = 11; - this.iconPictureBox.TabStop = false; - // - // controlPanel1 - // - this.controlPanel1.BackColor = System.Drawing.SystemColors.Control; - this.controlPanel1.Controls.Add(this.cancelButton); - this.controlPanel1.Controls.Add(this.installButton); - this.controlPanel1.Location = new System.Drawing.Point(0, 296); - this.controlPanel1.Name = "controlPanel1"; - this.controlPanel1.Size = new System.Drawing.Size(371, 39); - this.controlPanel1.TabIndex = 16; - // - // cancelButton - // - this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(278, 8); - this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(85, 23); - this.cancelButton.TabIndex = 17; - this.cancelButton.Text = "Cancel"; - this.cancelButton.UseVisualStyleBackColor = true; - // - // installButton - // - this.installButton.Location = new System.Drawing.Point(163, 8); - this.installButton.Name = "installButton"; - this.installButton.Size = new System.Drawing.Size(111, 23); - this.installButton.TabIndex = 0; - this.installButton.Text = "Install"; - this.installButton.UseVisualStyleBackColor = true; - this.installButton.Click += new System.EventHandler(this.installButton_Click); - // - // accessLabel - // - this.accessLabel.AutoSize = true; - this.accessLabel.Location = new System.Drawing.Point(9, 134); - this.accessLabel.Name = "accessLabel"; - this.accessLabel.Size = new System.Drawing.Size(54, 13); - this.accessLabel.TabIndex = 17; - this.accessLabel.Text = "Accesses:"; - // - // line1 - // - this.line1.LineAlignment = Line.Alignment.Horizontal; - this.line1.Location = new System.Drawing.Point(7, 151); - this.line1.Name = "line1"; - this.line1.Size = new System.Drawing.Size(356, 10); - this.line1.TabIndex = 18; - this.line1.Text = "line1"; - // - // NewUpdateDialog - // - this.AcceptButton = this.installButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.White; - this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(371, 335); - this.Controls.Add(this.line1); - this.Controls.Add(this.accessLabel); - this.Controls.Add(this.controlPanel1); - this.Controls.Add(this.changelogLabel); - this.Controls.Add(this.updateSizeLabel); - this.Controls.Add(this.currentVersionLabel); - this.Controls.Add(this.newestVersionLabel); - this.Controls.Add(this.iconPictureBox); - this.Controls.Add(this.infoLabel); - this.Controls.Add(this.headerLabel); - this.Controls.Add(this.changelogTextBox); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "NewUpdateDialog"; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "FormTitle"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.NewUpdateDialog_FormClosing); - this.Load += new System.EventHandler(this.NewUpdateDialog_Load); - ((System.ComponentModel.ISupportInitialize)(this.iconPictureBox)).EndInit(); - this.controlPanel1.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.RichTextBox changelogTextBox; - private System.Windows.Forms.Label headerLabel; - private System.Windows.Forms.Label infoLabel; - private System.Windows.Forms.PictureBox iconPictureBox; - private System.Windows.Forms.Label newestVersionLabel; - private System.Windows.Forms.Label currentVersionLabel; - private System.Windows.Forms.Label updateSizeLabel; - private System.Windows.Forms.Label changelogLabel; - private BottomPanel controlPanel1; - private System.Windows.Forms.Button cancelButton; - private System.Windows.Forms.Button installButton; - private System.Windows.Forms.Label accessLabel; - private Line line1; - } -} \ No newline at end of file diff --git a/nUpdate.ProvideTAP/Updating/UpdateConfiguration.cs b/nUpdate.ProvideTAP/Updating/UpdateConfiguration.cs deleted file mode 100644 index d3a79d3c..00000000 --- a/nUpdate.ProvideTAP/Updating/UpdateConfiguration.cs +++ /dev/null @@ -1,80 +0,0 @@ -// UpdateConfiguration.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net; -using System.Threading; -using System.Threading.Tasks; -using nUpdate.Internal.Core; - -namespace nUpdate.Updating -{ - // PROVIDE TAP - public partial class UpdateConfiguration - { - /// - /// Downloads the update configurations from the server. - /// - /// The url of the configuration file. - /// The optional proxy to use. - /// - /// The optional to use for canceling the - /// operation. - /// - /// The timeout for the download request. In milliseconds. Default 10000. - /// Returns an containing the package configurations. - public static Task> DownloadAsync(Uri configFileUri, WebProxy proxy, - CancellationTokenSource cancellationTokenSource = null, int timeout = 10000) - { - return DownloadAsync(configFileUri, null, proxy, cancellationTokenSource, timeout); - } - - /// - /// Downloads the update configurations from the server. - /// - /// The url of the configuration file. - /// The HTTP authentication credentials. - /// The optional proxy to use. - /// - /// The optional to use for canceling the - /// operation. - /// - /// The timeout for the download request. In milliseconds. Default 10000. - /// Returns an containing the package configurations. - public static async Task> DownloadAsync(Uri configFileUri, - NetworkCredential credentials, - WebProxy proxy, CancellationTokenSource cancellationTokenSource = null, int timeout = 10000) - { - ServicePointManager.Expect100Continue = true; - ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; - - var request = (HttpWebRequest) WebRequestWrapper.Create(configFileUri); - request.Timeout = timeout; - - if (credentials != null) - request.Credentials = credentials; - if (proxy != null) - request.Proxy = proxy; - - string source; - var response = cancellationTokenSource != null - ? await request.GetResponseAsync(cancellationTokenSource.Token) - : (HttpWebResponse) await request.GetResponseAsync(); - - using (var sr = new StreamReader(response.GetResponseStream() ?? - throw new InvalidOperationException( - "The response stream of the configuration file web request is invalid.")) - ) - { - source = await sr.ReadToEndAsync(); - } - - return !string.IsNullOrEmpty(source) - ? Serializer.Deserialize>(source) - : Enumerable.Empty(); - } - } -} \ No newline at end of file diff --git a/nUpdate.ProvideTAP/Updating/UpdateManager.cs b/nUpdate.ProvideTAP/Updating/UpdateManager.cs deleted file mode 100644 index e62a9c90..00000000 --- a/nUpdate.ProvideTAP/Updating/UpdateManager.cs +++ /dev/null @@ -1,287 +0,0 @@ -// UpdateManager.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net; -using System.Threading; -using System.Threading.Tasks; -using nUpdate.Exceptions; -using nUpdate.Internal.Core; -using nUpdate.Internal.Core.Operations; -using nUpdate.UpdateEventArgs; - -namespace nUpdate.Updating -{ - // PROVIDE TAP - /// - /// Provides functionality to update .NET-applications. - /// - public partial class UpdateManager - { - /// - /// Downloads the available update packages from the server. - /// - /// - public void DownloadPackages() - { - if (!Directory.Exists(_applicationUpdateDirectory)) - Directory.CreateDirectory(_applicationUpdateDirectory); - - foreach (var updateConfiguration in PackageConfigurations) - { - WebResponse webResponse = null; - try - { - var webRequest = WebRequestWrapper.Create(updateConfiguration.UpdatePackageUri); - if (HttpAuthenticationCredentials != null) - webRequest.Credentials = HttpAuthenticationCredentials; - using (webResponse = webRequest.GetResponse()) - { - var buffer = new byte[1024]; - _packageFilePaths.Add(new UpdateVersion(updateConfiguration.LiteralVersion), - Path.Combine(_applicationUpdateDirectory, - $"{updateConfiguration.LiteralVersion}.zip")); - using (var fileStream = File.Create(Path.Combine(_applicationUpdateDirectory, - $"{updateConfiguration.LiteralVersion}.zip"))) - { - using (var input = webResponse.GetResponseStream()) - { - if (input == null) - throw new Exception("The response stream couldn't be read."); - - var size = input.Read(buffer, 0, buffer.Length); - while (size > 0) - { - fileStream.Write(buffer, 0, size); - size = input.Read(buffer, 0, buffer.Length); - } - - if (!updateConfiguration.UseStatistics || !IncludeCurrentPcIntoStatistics) - continue; - - var response = - new WebClient {Credentials = HttpAuthenticationCredentials}.DownloadString( - $"{updateConfiguration.UpdatePhpFileUri}?versionid={updateConfiguration.VersionId}&os={SystemInformation.OperatingSystemName}"); // Only for calling it - - if (string.IsNullOrEmpty(response)) - return; - } - } - } - } - finally - { - webResponse?.Close(); - } - } - } - - /// - /// Downloads the available update packages from the server, asynchronously. - /// - /// - /// - /// - public Task DownloadPackagesAsync(IProgress progress = null) - { - return TaskEx.Run(async () => - { - _downloadCancellationTokenSource?.Dispose(); - _downloadCancellationTokenSource = new CancellationTokenSource(); - - long received = 0; - var total = PackageConfigurations.Select(config => GetUpdatePackageSize(config.UpdatePackageUri)) - .Where(updatePackageSize => updatePackageSize != null) - .Sum(updatePackageSize => updatePackageSize.Value); - - if (!Directory.Exists(_applicationUpdateDirectory)) - Directory.CreateDirectory(_applicationUpdateDirectory); - - foreach (var updateConfiguration in PackageConfigurations) - { - WebResponse webResponse = null; - try - { - if (_downloadCancellationTokenSource.Token.IsCancellationRequested) - { - DeletePackages(); - Cleanup(); - throw new OperationCanceledException(); - } - - var webRequest = WebRequestWrapper.Create(updateConfiguration.UpdatePackageUri); - if (HttpAuthenticationCredentials != null) - webRequest.Credentials = HttpAuthenticationCredentials; - webResponse = await webRequest.GetResponseAsync(); - - var buffer = new byte[1024]; - _packageFilePaths.Add(new UpdateVersion(updateConfiguration.LiteralVersion), - Path.Combine(_applicationUpdateDirectory, - $"{updateConfiguration.LiteralVersion}.zip")); - using (var fileStream = File.Create(Path.Combine(_applicationUpdateDirectory, - $"{updateConfiguration.LiteralVersion}.zip"))) - { - using (var input = webResponse.GetResponseStream()) - { - if (input == null) - throw new Exception("The response stream couldn't be read."); - - if (_downloadCancellationTokenSource.Token.IsCancellationRequested) - { - DeletePackages(); - Cleanup(); - throw new OperationCanceledException(); - } - - var size = await input.ReadAsync(buffer, 0, buffer.Length); - while (size > 0) - { - if (_downloadCancellationTokenSource.Token.IsCancellationRequested) - { - fileStream.Flush(); - fileStream.Close(); - DeletePackages(); - Cleanup(); - throw new OperationCanceledException(); - } - - await fileStream.WriteAsync(buffer, 0, size); - received += size; - progress?.Report(new UpdateDownloadProgressChangedEventArgs(received, - (long) total, (float) (received / total) * 100)); - size = await input.ReadAsync(buffer, 0, buffer.Length); - } - - if (!updateConfiguration.UseStatistics || !IncludeCurrentPcIntoStatistics) - continue; - - var response = - new WebClient - { - Credentials = - HttpAuthenticationCredentials - }.DownloadString( - $"{updateConfiguration.UpdatePhpFileUri}?versionid={updateConfiguration.VersionId}&os={SystemInformation.OperatingSystemName}"); // Only for calling it - if (!string.IsNullOrEmpty(response)) - throw new StatisticsException(string.Format( - _lp.StatisticsScriptExceptionText, response)); - } - } - } - finally - { - webResponse?.Close(); - } - } - }); - } - - /// - /// Searches for updates. - /// - /// Returns true if updates were found; otherwise, false. - /// The calculation of the size of the available updates has failed. - public bool SearchForUpdates() - { - // It may be that this is not the first search call and previously saved data needs to be disposed. - Cleanup(); - - if (!ConnectionManager.IsConnectionAvailable()) - return false; - - ServicePointManager.Expect100Continue = true; - ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; - var configuration = - UpdateConfiguration.Download(UpdateConfigurationFileUri, HttpAuthenticationCredentials, Proxy, - SearchTimeout); - - var result = new UpdateResult(configuration, CurrentVersion, - IncludeAlpha, IncludeBeta, Conditions); - if (!result.UpdatesFound) - return false; - - PackageConfigurations = result.NewestConfigurations; - double updatePackageSize = 0; - foreach (var updateConfiguration in PackageConfigurations) - { - updateConfiguration.UpdatePackageUri = ConvertPackageUri(updateConfiguration.UpdatePackageUri); - updateConfiguration.UpdatePhpFileUri = ConvertStatisticsUri(updateConfiguration.UpdatePhpFileUri); - - var newPackageSize = GetUpdatePackageSize(updateConfiguration.UpdatePackageUri); - if (newPackageSize == null) - throw new SizeCalculationException(_lp.PackageSizeCalculationExceptionText); - - updatePackageSize += newPackageSize.Value; - if (updateConfiguration.Operations == null) continue; - if (_packageOperations == null) - _packageOperations = new Dictionary>(); - _packageOperations.Add(new UpdateVersion(updateConfiguration.LiteralVersion), - updateConfiguration.Operations); - } - - TotalSize = updatePackageSize; - return true; - } - - /// - /// Searches for updates, asynchronously. - /// - /// - /// - /// - public Task SearchForUpdatesAsync() - { - return TaskEx.Run(async () => - { - // It may be that this is not the first search call and previously saved data needs to be disposed. - Cleanup(); - _searchCancellationTokenSource?.Dispose(); - _searchCancellationTokenSource = new CancellationTokenSource(); - - if (!ConnectionManager.IsConnectionAvailable()) - return false; - - _searchCancellationTokenSource.Token.ThrowIfCancellationRequested(); - ServicePointManager.Expect100Continue = true; - ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; - var configuration = - await UpdateConfiguration.DownloadAsync(UpdateConfigurationFileUri, HttpAuthenticationCredentials, - Proxy, _searchCancellationTokenSource, SearchTimeout); - - _searchCancellationTokenSource.Token.ThrowIfCancellationRequested(); - var result = new UpdateResult(configuration, CurrentVersion, - IncludeAlpha, IncludeBeta, Conditions); - if (!result.UpdatesFound) - return false; - - PackageConfigurations = result.NewestConfigurations; - double updatePackageSize = 0; - foreach (var updateConfiguration in PackageConfigurations) - { - updateConfiguration.UpdatePackageUri = ConvertPackageUri(updateConfiguration.UpdatePackageUri); - updateConfiguration.UpdatePhpFileUri = ConvertStatisticsUri(updateConfiguration.UpdatePhpFileUri); - - _searchCancellationTokenSource.Token.ThrowIfCancellationRequested(); - var newPackageSize = GetUpdatePackageSize(updateConfiguration.UpdatePackageUri); - if (newPackageSize == null) - throw new SizeCalculationException(_lp.PackageSizeCalculationExceptionText); - - updatePackageSize += newPackageSize.Value; - if (updateConfiguration.Operations == null) continue; - if (_packageOperations == null) - _packageOperations = new Dictionary>(); - _packageOperations.Add(new UpdateVersion(updateConfiguration.LiteralVersion), - updateConfiguration.Operations); - } - - TotalSize = updatePackageSize; - if (!_searchCancellationTokenSource.Token.IsCancellationRequested) - return true; - throw new OperationCanceledException(); - }); - } - } -} \ No newline at end of file diff --git a/nUpdate.ProvideTAP/app.config b/nUpdate.ProvideTAP/app.config deleted file mode 100644 index 870df23a..00000000 --- a/nUpdate.ProvideTAP/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj b/nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj deleted file mode 100644 index 8277e311..00000000 --- a/nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj +++ /dev/null @@ -1,139 +0,0 @@ - - - - - Debug - AnyCPU - {B60F0AEE-F710-44FF-9C64-7BC4FCBD1BF5} - Library - Properties - nUpdate - nUpdate.ProvideTAP - v4.0 - 512 - - - - - - true - full - false - bin\Debug\ - TRACE - prompt - 4 - - - full - true - bin\Release\ - DEBUG;TRACE - prompt - 4 - true - - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll - - - - - - - - - - - - - Form - - - Form - - - NewUpdateDialog.cs - - - Form - - - NoUpdateFoundDialog.cs - - - Form - - - UpdateDownloadDialog.cs - - - Form - - - UpdateSearchDialog.cs - - - - - - - - {efb71d69-ebf9-4f60-b776-de443730a3dd} - nUpdate.Internal - - - - - - - - - BaseDialog.cs - Designer - - - NewUpdateDialog.cs - Designer - - - NoUpdateFoundDialog.cs - Designer - - - UpdateDownloadDialog.cs - - - UpdateSearchDialog.cs - - - - - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - \ No newline at end of file diff --git a/nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj.DotSettings b/nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj.DotSettings deleted file mode 100644 index 6e7fff86..00000000 --- a/nUpdate.ProvideTAP/nUpdate.ProvideTAP.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - No \ No newline at end of file diff --git a/nUpdate.ProvideTAP/packages.config b/nUpdate.ProvideTAP/packages.config deleted file mode 100644 index 2164004d..00000000 --- a/nUpdate.ProvideTAP/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/nUpdate.Shared/Updating/UpdaterUI.cs b/nUpdate.Shared/Updating/UpdaterUI.cs deleted file mode 100644 index 7e814c73..00000000 --- a/nUpdate.Shared/Updating/UpdaterUI.cs +++ /dev/null @@ -1,61 +0,0 @@ -// UpdaterUI.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System.Threading; -using nUpdate.Internal.Core.Localization; - -namespace nUpdate.Updating -{ - public sealed partial class UpdaterUI - { - private readonly LocalizationProperties _lp; -#pragma warning disable IDE0051 // Nicht verwendete private Member entfernen - private bool _active; -#pragma warning restore IDE0051 // Nicht verwendete private Member entfernen - - /// - /// Initializes a new instance of the -class. - /// - /// The instance of the to handle over. - /// The synchronization context to use. - public UpdaterUI(UpdateManager updateManager, SynchronizationContext context) - : this(updateManager, context, false) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// The update manager. - /// The context. - /// - /// If set to true a hidden search will be provided in order to search in the - /// background without informing the user. - /// - public UpdaterUI(UpdateManager updateManager, SynchronizationContext context, bool useHiddenSearch) - { - UpdateManager = updateManager; - Context = context; - UseHiddenSearch = useHiddenSearch; - _lp = LocalizationHelper.GetLocalizationProperties(UpdateManager.LanguageCulture, - UpdateManager.CultureFilePaths); - } - - /// - /// Gets or sets the to use for mashalling the user interface specific calls to - /// the current UI thread. - /// - internal SynchronizationContext Context { get; set; } - - /// - /// Gets or sets the given instance of the -class. - /// - internal UpdateManager UpdateManager { get; set; } - - /// - /// Gets or sets a value indicating whether a hidden search should be provided in order to search in the background - /// without informing the user, or not. - /// - public bool UseHiddenSearch { get; set; } - } -} \ No newline at end of file diff --git a/nUpdate.Shared/nUpdate.Shared.projitems b/nUpdate.Shared/nUpdate.Shared.projitems deleted file mode 100644 index 702120b3..00000000 --- a/nUpdate.Shared/nUpdate.Shared.projitems +++ /dev/null @@ -1,26 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 1fc358a3-632d-4e44-8533-057d72176220 - - - nUpdate.Shared - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nUpdate.Shared/nUpdate.Shared.shproj b/nUpdate.Shared/nUpdate.Shared.shproj deleted file mode 100644 index 07c9ae5e..00000000 --- a/nUpdate.Shared/nUpdate.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 1fc358a3-632d-4e44-8533-057d72176220 - 14.0 - - - - - - - - diff --git a/nUpdate.Test/ConditionsAllTest.cs b/nUpdate.Test/ConditionsAllTest.cs index 0fbd92f1..e0654797 100644 --- a/nUpdate.Test/ConditionsAllTest.cs +++ b/nUpdate.Test/ConditionsAllTest.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; -using nUpdate.Internal.Core; using nUpdate.Updating; namespace nUpdate.Test diff --git a/nUpdate.Test/ConditionsAtLeastOneTest.cs b/nUpdate.Test/ConditionsAtLeastOneTest.cs index b71f4382..157a7d6c 100644 --- a/nUpdate.Test/ConditionsAtLeastOneTest.cs +++ b/nUpdate.Test/ConditionsAtLeastOneTest.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; -using nUpdate.Internal.Core; using nUpdate.Updating; namespace nUpdate.Test @@ -418,7 +417,7 @@ public void ConditionCheckWithoutClientValuesAndWithoutRemoteValuesMustWorkWell( [TestMethod] [TestCategory("Conditions")] - [Description("If no conditions are defined in the package, we always pull the update")] + [System.ComponentModel.Description("If no conditions are defined in the package, we always pull the update")] public void ConditionCheckWithoutRemoteValuesMustAllwayReturnTrue() { _updateConfigs.Add(CreateConfig("1.2.0.0", RolloutConditionMode.AtLeastOne, new List())); @@ -431,7 +430,7 @@ public void ConditionCheckWithoutRemoteValuesMustAllwayReturnTrue() [TestMethod] [TestCategory("Conditions")] - [Description("If no conditions are defined in the package, we always pull the update")] + [System.ComponentModel.Description("If no conditions are defined in the package, we always pull the update")] public void ConditionCheckWithoutRemoteValuesMustReturnAllUpdates() { _updateConfigs.Add(CreateConfig("1.2.0.0", RolloutConditionMode.AtLeastOne, new List())); diff --git a/nUpdate.Test/ConnectionCheckerTest.cs b/nUpdate.Test/ConnectionCheckerTest.cs deleted file mode 100644 index 717cf7b9..00000000 --- a/nUpdate.Test/ConnectionCheckerTest.cs +++ /dev/null @@ -1,21 +0,0 @@ -// ConnectionCheckerTest.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using Microsoft.VisualStudio.TestTools.UnitTesting; -using nUpdate.Internal.Core; - -namespace nUpdate.Test -{ - [TestClass] - public class ConnectionCheckerTest - { - /// - /// Checks if the "wininet.dll" returns the right stats. - /// - [TestMethod] - public void CanReturnConnectionStatus() - { - Assert.IsTrue(ConnectionManager.IsConnectionAvailable()); - } - } -} \ No newline at end of file diff --git a/nUpdate.Test/Properties/AssemblyInfo.cs b/nUpdate.Test/Properties/AssemblyInfo.cs index 23fd5297..42c71290 100644 --- a/nUpdate.Test/Properties/AssemblyInfo.cs +++ b/nUpdate.Test/Properties/AssemblyInfo.cs @@ -38,5 +38,5 @@ // durch Einsatz von '*', wie in nachfolgendem Beispiel: // [Assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.5.0.0")] -[assembly: AssemblyFileVersion("3.5.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] diff --git a/nUpdate.Test/RsaSignatureTest.cs b/nUpdate.Test/RsaSignatureTest.cs index d6c65cc9..ae911069 100644 --- a/nUpdate.Test/RsaSignatureTest.cs +++ b/nUpdate.Test/RsaSignatureTest.cs @@ -4,7 +4,6 @@ using System; using System.IO; using Microsoft.VisualStudio.TestTools.UnitTesting; -using nUpdate.Internal.Core; namespace nUpdate.Test { diff --git a/nUpdate.Test/UriConnectorTest.cs b/nUpdate.Test/UriConnectorTest.cs index 11cc8b77..d781c85e 100644 --- a/nUpdate.Test/UriConnectorTest.cs +++ b/nUpdate.Test/UriConnectorTest.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using Microsoft.VisualStudio.TestTools.UnitTesting; -using nUpdate.Internal.Core; namespace nUpdate.Test { diff --git a/nUpdate.Test/UseDynamicUpdateUriTest.cs b/nUpdate.Test/UseDynamicUpdateUriTest.cs index 9c980f2d..d5e46856 100644 --- a/nUpdate.Test/UseDynamicUpdateUriTest.cs +++ b/nUpdate.Test/UseDynamicUpdateUriTest.cs @@ -3,6 +3,7 @@ using System; using System.Globalization; +using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; using nUpdate.Updating; @@ -13,6 +14,28 @@ public class UseDynamicUpdateUriTest { private const string _publicKey = "xhHXp+QCvWb8+W6TR/hkkhEy9h9WwdAMBMDJbsfn3ObF6U5K2KQCKQ6Alr4iXqlwvcYHKt2CG2M4m9So+rA/N3gg/AETbd74MYXaMRtDqLjkTQuG8EI9JqnlKAR3JS4zWkZghtPsYHtzox7J7Z94iDLAP899r+n9yeafYWwXOsRiTOxKhO9oHHQAK5JlRe9yHMM9F+WanEOGTqfI5FwvldH1Wnahs4xJMhDSB9m92D2zu9nruCmA+7l12hoQOIpsF4hKT6cm4Hm+TcZURForopS4I/lU9W+FDv+GMBrf46+tX2QfmBN9x/NUciyYJvFEAVA1JUXhYT19v+2tW1paASlHhzDGrEFpruWK/NNXPNOlEfdjpZRrvdsRGRYwt5bwt8H7+9n8MAI9ERXO627MIm9wrhvsCuZDDStJNMK05AbOfK/4KwVUUxCn0LO7/aWkhEkljz8fz+cS3lA2yX0Scl8r/z1iRyDjLQJ08bnZJrc3LsVOwQVef1/86IpBBOSkco4g6iaZzgfFSKHNpJvah5Gpa5rt9dq9omcNTANGh5KMNjD7zLM0sXQd3Te1vj5bsWXdBrqFdtWJt627/NTUIEvfKmI4V+hvc3VGnXmBIAPUyodC2pxoDrqWElIXMMgaYl2ifLVQdP7Dw6Z9lZ0CSjW5//Juq/vTANMPBjf6LazWxYto+hTQGjBUYYCaGQKNk3lHkFCBIIMvpGANPjWuLUn0Vbh2PI5KkPElHbJ0CAYRHRG2brNP8Zw95NhaZYMoec3cMLokeU31M1TgkCHeqZspnYlKcGxgQj8xCCPmSwriB1jjGJRBrhC2CK7izrn8Dq7uu0Epg2M8nKeYzhFuiBUashVB/YFUmdA9LALUihv4XN0yXQ4C8UJvsGo+vtpdfWx51smMZxSLcjgfDgnNPR2ZKlJbG7bEowUduZWGurGhRNREC+9E1BZCRylI6c0B+7pgeiOexDzWgQlNnslQWtQs7M1ctsic+8EtOYXd//a4PO1bBhpL9u+FPB+Ek8kSSaGhDUsv0ZkNFdyqKVeP+EmGY5UaQ+b0lCdYmoQjp07Yd3lEb+T7vT/AntBSDcvUITSeP4imgYE7bw5Qo3nWWv3dHz4ubGxrumqQD1I/x7X/QU9SMVfMtcswCLx8inJICaw8jJ5E/mH5lFWY8IOjI5211CkjepKc2wtoeSYxFSVw+896vG3n0dlqerddaBr6kBRSOz5gXS4cucYPXZwiHHaFOqRBdVA84yKn9YNMiVSPdbSIYZk3GEjvQTz9dizOVdQKV0c+HyjrXfXsnwOhMFN8x1iBOD0oeUSMjiV2WidETK117Wnz36lFkUmf7TwOVhaHCI0YC6w9zm9rrcpPWQ==AQAB"; + + [TestInitialize] + public void SetEntryAssembly() + { + SetEntryAssembly(Assembly.GetCallingAssembly()); + } + + /// + /// Allows setting the Entry Assembly when needed. + /// Use AssemblyUtilities.SetEntryAssembly() as first line in XNA ad hoc tests + /// + /// Assembly to set as entry assembly + public void SetEntryAssembly(Assembly assembly) + { + AppDomainManager manager = new AppDomainManager(); + FieldInfo entryAssemblyfield = manager.GetType().GetField("m_entryAssembly", BindingFlags.Instance | BindingFlags.NonPublic); + entryAssemblyfield.SetValue(manager, assembly); + + AppDomain domain = AppDomain.CurrentDomain; + FieldInfo domainManagerField = domain.GetType().GetField("_domainManager", BindingFlags.Instance | BindingFlags.NonPublic); + domainManagerField.SetValue(domain, manager); + } [TestMethod] public void CanConvertPackageUriIp() diff --git a/nUpdate.Test/app.config b/nUpdate.Test/app.config index a51f2fad..34b4d452 100644 --- a/nUpdate.Test/app.config +++ b/nUpdate.Test/app.config @@ -1,5 +1,4 @@  - @@ -9,12 +8,12 @@ - + - + - \ No newline at end of file + diff --git a/nUpdate.Test/nUpdate.Test.csproj b/nUpdate.Test/nUpdate.Test.csproj index 3ac9e2f8..7a7cb6f2 100644 --- a/nUpdate.Test/nUpdate.Test.csproj +++ b/nUpdate.Test/nUpdate.Test.csproj @@ -1,5 +1,6 @@  - + + Debug AnyCPU @@ -8,7 +9,7 @@ Properties nUpdate.Test nUpdate.Test - v4.0 + v4.6.1 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -30,6 +31,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -38,37 +40,20 @@ TRACE prompt 4 + false - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True + + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True + + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - True - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - True - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll - True - @@ -76,15 +61,10 @@ - - - - - + - @@ -92,20 +72,16 @@ - - - {b60f0aee-f710-44ff-9c64-7bc4fcbd1bf5} - nUpdate.ProvideTAP - - - {efb71d69-ebf9-4f60-b776-de443730a3dd} - nUpdate.Internal - - + + + {6bb31893-efce-406f-9d18-80959a956f99} + nUpdate + + @@ -132,9 +108,10 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + + - + \ No newline at end of file diff --git a/nUpdate.UpdateInstaller/packages.config b/nUpdate.UpdateInstaller/packages.config index 2584cabe..c9435606 100644 --- a/nUpdate.UpdateInstaller/packages.config +++ b/nUpdate.UpdateInstaller/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/nUpdate.UserInterfaceTest/App.config b/nUpdate.UserInterfaceTest/App.config deleted file mode 100644 index af4478f0..00000000 --- a/nUpdate.UserInterfaceTest/App.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nUpdate.UserInterfaceTest/MainDialog.Designer.cs b/nUpdate.UserInterfaceTest/MainDialog.Designer.cs deleted file mode 100644 index 18b2df93..00000000 --- a/nUpdate.UserInterfaceTest/MainDialog.Designer.cs +++ /dev/null @@ -1,79 +0,0 @@ -namespace nUpdate.UserInterfaceTest -{ - partial class MainDialog - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.updateButton = new System.Windows.Forms.Button(); - this.hiddenSearchCheckBox = new System.Windows.Forms.CheckBox(); - this.SuspendLayout(); - // - // updateButton - // - this.updateButton.Location = new System.Drawing.Point(77, 82); - this.updateButton.Name = "updateButton"; - this.updateButton.Size = new System.Drawing.Size(141, 72); - this.updateButton.TabIndex = 0; - this.updateButton.Text = "Update"; - this.updateButton.UseVisualStyleBackColor = true; - this.updateButton.Click += new System.EventHandler(this.updateButton_Click); - // - // hiddenSearchCheckBox - // - this.hiddenSearchCheckBox.AutoSize = true; - this.hiddenSearchCheckBox.Location = new System.Drawing.Point(77, 49); - this.hiddenSearchCheckBox.Name = "hiddenSearchCheckBox"; - this.hiddenSearchCheckBox.Size = new System.Drawing.Size(147, 27); - this.hiddenSearchCheckBox.TabIndex = 1; - this.hiddenSearchCheckBox.Text = "Hidden Search"; - this.hiddenSearchCheckBox.UseVisualStyleBackColor = true; - this.hiddenSearchCheckBox.CheckedChanged += new System.EventHandler(this.hiddenSearchCheckBox_CheckedChanged); - // - // MainDialog - // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 23F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Window; - this.ClientSize = new System.Drawing.Size(284, 261); - this.Controls.Add(this.hiddenSearchCheckBox); - this.Controls.Add(this.updateButton); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.MaximizeBox = false; - this.Name = "MainDialog"; - this.Text = "MainDialog"; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button updateButton; - private System.Windows.Forms.CheckBox hiddenSearchCheckBox; - } -} - diff --git a/nUpdate.UserInterfaceTest/MainDialog.cs b/nUpdate.UserInterfaceTest/MainDialog.cs deleted file mode 100644 index 6017735b..00000000 --- a/nUpdate.UserInterfaceTest/MainDialog.cs +++ /dev/null @@ -1,34 +0,0 @@ -// MainDialog.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System; -using System.Globalization; -using System.Threading; -using System.Windows.Forms; -using nUpdate.Updating; - -namespace nUpdate.UserInterfaceTest -{ - public partial class MainDialog : Form - { - private readonly UpdaterUI _updaterUI; - - public MainDialog() - { - InitializeComponent(); - UpdateManager manager = new UpdateManager(new Uri("http://localhost/nupdate/updates.json"), "vRt6o2QsPy9P7NnMoa2iOVXcJhVDUCXEbOFOxrAZAcKmKVr/9JEOicpiAiWXUqm1jqH0WAgP0NpQL5p1EGFRbfdqlTnHgflqmg9TzY6Y3eR0rNDtefxKhoPd2gKJDTGXBICbBqALpUwaMyNHCzk9XbuT3HorVd+ZHHi/SaMOpNLhXUKmFpgfkUpj35PG9v4CDM0i3YntgRv6BwF8gNBftbmQxp0riGs+blLYM9IlBHhfWWW6hBDCdPNLlDJ53EM0LQB4BYnH/+PtjcPwiFrZC0gtIEHcGA/k/Es/KBSYGrRsxYfUCarfqdu2pYFyTTRXXdJrap9dtx7a443XGEQ2vXd425QKRJiDViHDP5jAVLDji+4lIsB1iJTmENhTF26Zng305/GqKCKRXyJpjh93MjrUIVG5uPSl+oxA33luH00ISI3ivPN4YBTQkwPjTp7gP6Kh3uj02DCsELZSeyY6tP/IVuc3REFV6mhguSO0MeSRjUAx61i6t1LgPVr+qEn/yCAz3jLlxwLfBfL0RA1vESiD6i6kvidNHiv6Sa/T7Wy4J0PrwiLy3y3jax4pwL2n2uDTVPJWXFdDWJV4Ud8He58KL6ItNn1K7L3n0i5mZaQZjU5EgzObdLEaH/icvxit6TOAJ5FC0Ktq1J4IzzR4JH36Cfn+izoslO5hWIdun2gcQmODB8JNdw2/fXxffwjDCYN6ue/loZsSxGvcFQvtenNs/vY9JGwJU3bYPmvXsHOfn06w0r42IUYmbx/OgoTI9TBbhNCuHWJ8h9vAE+k56HYDz/mbKOlrGdHZvhWBkG96x9wFyM22ppw1VazP01rjCB9UQD3NW+jFfhUWYx5j0vX6I8QEBuzvTXm5HX36OUHPixmgQMdUFUiirVijYWRyAI96zvFTL4SmWY8p8XTErlV4SFMaNfZKGHQnsADwF2MyGPTzZGpZcXtNjDuzQmUYUhnVuJvd+ZVb1gCZkVIiQ5wM+xPWUcLzbBjl6XYL5YXbDvorW+kUiziGkM9FAViEbnYPqVQnNYx6h0heopqGkLLVFA85cMxXJAoLHyMxGEQNh0TqcIVvSQ7y5u28NKlP6rMa+beIuUZp+2Fm+LdjIEsBRQdoE5BgRM9rGqdClGirsqtBcXhpCnxcOJCJqpvkPahInDmkr8Mw/UZ/CbCFEDXy18c8L9owsb8LLp2xxl0P63QDbpVYi+IjhQKshgb/UtYxSQi5hfZp6LljqV5oRZx1FIg8mjxp2XUWNRZKvQrM9KIG6kwXB9lYihmmPNkLMAz1pZgg8VnLeaVlD+DcK6BIH6+QHZFLDIn60TlRQgtf16j4iQ4gtfd2YXtydgISw/WJctaFYPNHuQXTWgjLQQ==AQAB", new CultureInfo("en")); - manager.RunInstallerAsAdmin = false; - _updaterUI = new UpdaterUI(manager, SynchronizationContext.Current); - } - - private void updateButton_Click(object sender, EventArgs e) - { - _updaterUI.ShowUserInterface(); - } - - private void hiddenSearchCheckBox_CheckedChanged(object sender, EventArgs e) - { - _updaterUI.UseHiddenSearch = true; - } - } -} \ No newline at end of file diff --git a/nUpdate.UserInterfaceTest/MainDialog.resx b/nUpdate.UserInterfaceTest/MainDialog.resx deleted file mode 100644 index 1af7de15..00000000 --- a/nUpdate.UserInterfaceTest/MainDialog.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/nUpdate.UserInterfaceTest/Program.cs b/nUpdate.UserInterfaceTest/Program.cs deleted file mode 100644 index a651410c..00000000 --- a/nUpdate.UserInterfaceTest/Program.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Program.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System; -using System.Windows.Forms; - -namespace nUpdate.UserInterfaceTest -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainDialog()); - } - } -} \ No newline at end of file diff --git a/nUpdate.UserInterfaceTest/Properties/AssemblyInfo.cs b/nUpdate.UserInterfaceTest/Properties/AssemblyInfo.cs deleted file mode 100644 index 34dbb374..00000000 --- a/nUpdate.UserInterfaceTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,40 +0,0 @@ -// AssemblyInfo.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System.Reflection; -using System.Runtime.InteropServices; -using nUpdate.Core; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("nUpdate.UserInterfaceTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("nUpdate.UserInterfaceTest")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1c11588b-06fc-4502-a7c1-00c75e9e551f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: nUpdateVersion("1.0")] \ No newline at end of file diff --git a/nUpdate.UserInterfaceTest/nUpdate.UserInterfaceTest.csproj b/nUpdate.UserInterfaceTest/nUpdate.UserInterfaceTest.csproj deleted file mode 100644 index 05ff3c33..00000000 --- a/nUpdate.UserInterfaceTest/nUpdate.UserInterfaceTest.csproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - Debug - AnyCPU - {1C11588B-06FC-4502-A7C1-00C75E9E551F} - WinExe - Properties - nUpdate.UserInterfaceTest - nUpdate.UserInterfaceTest - v4.0 - 512 - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll - - - - - - - - - - - - - Form - - - MainDialog.cs - - - - - MainDialog.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - {b60f0aee-f710-44ff-9c64-7bc4fcbd1bf5} - nUpdate.ProvideTAP - - - {EFB71D69-EBF9-4F60-B776-DE443730A3DD} - nUpdate.Internal - - - - - - - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - - \ No newline at end of file diff --git a/nUpdate.UserInterfaceTest/packages.config b/nUpdate.UserInterfaceTest/packages.config deleted file mode 100644 index 2164004d..00000000 --- a/nUpdate.UserInterfaceTest/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/nUpdate.WPFUpdateInstaller/App.config b/nUpdate.WPFUpdateInstaller/App.config index 9350691e..fd3b4100 100644 --- a/nUpdate.WPFUpdateInstaller/App.config +++ b/nUpdate.WPFUpdateInstaller/App.config @@ -1,7 +1,6 @@ - - + - + - \ No newline at end of file + diff --git a/nUpdate.WPFUpdateInstaller/InstallerServiceProvider.cs b/nUpdate.WPFUpdateInstaller/InstallerServiceProvider.cs index 315baa23..956d3b85 100644 --- a/nUpdate.WPFUpdateInstaller/InstallerServiceProvider.cs +++ b/nUpdate.WPFUpdateInstaller/InstallerServiceProvider.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using nUpdate.UpdateInstaller.Client.GuiInterface; +using nUpdate.UpdateInstaller.UIBase; using nUpdate.WPFUpdateInstaller; [assembly: ServiceProvider(typeof(InstallerServiceProvider))] diff --git a/nUpdate.WPFUpdateInstaller/MainWindow.xaml.cs b/nUpdate.WPFUpdateInstaller/MainWindow.xaml.cs index 76565b04..21c60391 100644 --- a/nUpdate.WPFUpdateInstaller/MainWindow.xaml.cs +++ b/nUpdate.WPFUpdateInstaller/MainWindow.xaml.cs @@ -2,12 +2,8 @@ // Copyright (C) Dominic Beger 17.06.2019 using System; -using System.Drawing.Imaging; -using System.IO; using System.Windows; -using System.Windows.Media.Imaging; -using nUpdate.Internal.Core; -using nUpdate.UpdateInstaller.Client.GuiInterface; +using nUpdate.UpdateInstaller.UIBase; namespace nUpdate.WPFUpdateInstaller { @@ -24,18 +20,18 @@ public MainWindow() public void Initialize() { ShowDialog(); - using (var memory = new MemoryStream()) - { - var bitmap = IconHelper.ExtractAssociatedIcon(Program.ApplicationExecutablePath).ToBitmap(); - bitmap.Save(memory, ImageFormat.Png); - memory.Position = 0; - var bitmapImage = new BitmapImage(); - bitmapImage.BeginInit(); - bitmapImage.StreamSource = memory; - bitmapImage.CacheOption = BitmapCacheOption.OnLoad; - bitmapImage.EndInit(); - Icon = bitmapImage; - } + //using (var memory = new MemoryStream()) + //{ + // var bitmap = IconHelper.ExtractAssociatedIcon(Program.ApplicationExecutablePath).ToBitmap(); + // bitmap.Save(memory, ImageFormat.Png); + // memory.Position = 0; + // var bitmapImage = new BitmapImage(); + // bitmapImage.BeginInit(); + // bitmapImage.StreamSource = memory; + // bitmapImage.CacheOption = BitmapCacheOption.OnLoad; + // bitmapImage.EndInit(); + // Icon = bitmapImage; + //} Title = Program.AppName; copyingLabel.Text = Program.ExtractFilesText; diff --git a/nUpdate.WPFUpdateInstaller/Program.cs b/nUpdate.WPFUpdateInstaller/Program.cs index 98ae391a..93bf34ec 100644 --- a/nUpdate.WPFUpdateInstaller/Program.cs +++ b/nUpdate.WPFUpdateInstaller/Program.cs @@ -6,8 +6,7 @@ using System.Text; using System.Threading; using System.Windows; -using nUpdate.Internal.Core; -using nUpdate.Internal.Core.Operations; +using nUpdate.Operations; namespace nUpdate.WPFUpdateInstaller { diff --git a/nUpdate.WPFUpdateInstaller/ProgressReporterService.cs b/nUpdate.WPFUpdateInstaller/ProgressReporterService.cs index fe93b911..25720f11 100644 --- a/nUpdate.WPFUpdateInstaller/ProgressReporterService.cs +++ b/nUpdate.WPFUpdateInstaller/ProgressReporterService.cs @@ -2,7 +2,7 @@ // Copyright (C) Dominic Beger 17.06.2019 using System; -using nUpdate.UpdateInstaller.Client.GuiInterface; +using nUpdate.UpdateInstaller.UIBase; namespace nUpdate.WPFUpdateInstaller { diff --git a/nUpdate.WPFUpdateInstaller/Properties/Resources.Designer.cs b/nUpdate.WPFUpdateInstaller/Properties/Resources.Designer.cs index 70b6543c..a32ebbc9 100644 --- a/nUpdate.WPFUpdateInstaller/Properties/Resources.Designer.cs +++ b/nUpdate.WPFUpdateInstaller/Properties/Resources.Designer.cs @@ -1,69 +1,61 @@ //------------------------------------------------------------------------------ // // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion: 4.0.30319.42000 +// Laufzeitversion:4.0.30319.42000 // -// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn -// der Code neu generiert wird. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ -namespace nUpdate.WPFUpdateInstaller.Properties -{ - - +namespace nUpdate.WPFUpdateInstaller.Properties { + using System; + + /// /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. /// - // Diese Klasse wurde von der StronglyTypedResourceBuilder-Klasse - // über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - // mit der Option /str erneut aus, oder erstellen Sie Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("nUpdate.WPFUpdateInstaller.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden. + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/nUpdate.WPFUpdateInstaller/Properties/Settings.Designer.cs b/nUpdate.WPFUpdateInstaller/Properties/Settings.Designer.cs index 271a919b..9f2b774b 100644 --- a/nUpdate.WPFUpdateInstaller/Properties/Settings.Designer.cs +++ b/nUpdate.WPFUpdateInstaller/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ -namespace nUpdate.WPFUpdateInstaller.Properties -{ - - +namespace nUpdate.WPFUpdateInstaller.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/nUpdate.WPFUpdateInstaller/Win32/NativeMethods.cs b/nUpdate.WPFUpdateInstaller/Win32/NativeMethods.cs new file mode 100644 index 00000000..10c2d8fb --- /dev/null +++ b/nUpdate.WPFUpdateInstaller/Win32/NativeMethods.cs @@ -0,0 +1,25 @@ +// NativeMethods.cs, 10.06.2019 +// Copyright (C) Dominic Beger 17.06.2019 + +using System; +using System.Runtime.InteropServices; +using System.Text; + +namespace nUpdate.WPFUpdateInstaller.Win32 +{ + internal class NativeMethods + { + [DllImport("shell32.dll", EntryPoint = "ExtractAssociatedIcon", CharSet = CharSet.Auto)] + public static extern IntPtr ExtractAssociatedIcon(HandleRef hInst, StringBuilder iconPath, ref int index); + + [DllImport("wininet.dll")] + public static extern bool InternetGetConnectedState(out int connDescription, int reservedValue); + + [DllImport("user32.dll")] + internal static extern IntPtr SendMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam); + + [DllImport("Shlwapi.dll", CharSet = CharSet.Auto)] + public static extern int StrFormatByteSize(long fileSize, + [MarshalAs(UnmanagedType.LPTStr)] StringBuilder buffer, int bufferSize); + } +} \ No newline at end of file diff --git a/nUpdate.WPFUpdateInstaller/nUpdate.WPFUpdateInstaller.csproj b/nUpdate.WPFUpdateInstaller/nUpdate.WPFUpdateInstaller.csproj index e5eff15b..bb674368 100644 --- a/nUpdate.WPFUpdateInstaller/nUpdate.WPFUpdateInstaller.csproj +++ b/nUpdate.WPFUpdateInstaller/nUpdate.WPFUpdateInstaller.csproj @@ -8,11 +8,12 @@ Library nUpdate.WPFUpdateInstaller nUpdate.WPFUpdateInstaller - v4.6 + v4.6.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + AnyCPU @@ -59,6 +60,7 @@ + MSBuild:Compile Designer @@ -106,13 +108,13 @@ - + {5E63208A-8F06-4B99-A41D-F469BE4CFD00} - nUpdate.UpdateInstaller.Client.GuiInterface + nUpdate.UpdateInstaller.UIBase - - {EFB71D69-EBF9-4F60-B776-DE443730A3DD} - nUpdate.Internal + + {6BB31893-EFCE-406F-9D18-80959A956F99} + nUpdate diff --git a/nUpdate.WPFUserInterface.Test/App.xaml b/nUpdate.WPFUserInterface.Test/App.xaml deleted file mode 100644 index 8cf2ae82..00000000 --- a/nUpdate.WPFUserInterface.Test/App.xaml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/nUpdate.WPFUserInterface.Test/App.xaml.cs b/nUpdate.WPFUserInterface.Test/App.xaml.cs deleted file mode 100644 index be0d0b3d..00000000 --- a/nUpdate.WPFUserInterface.Test/App.xaml.cs +++ /dev/null @@ -1,20 +0,0 @@ -// App.xaml.cs, 10.06.2019 -// Copyright (C) Dominic Beger 17.06.2019 - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; - -namespace nUpdate.WPFUserInterface.Test -{ - /// - /// Interaktionslogik für "App.xaml" - /// - public partial class App : Application - { - } -} \ No newline at end of file diff --git a/nUpdate.WPFUserInterface.Test/MainWindow.xaml b/nUpdate.WPFUserInterface.Test/MainWindow.xaml deleted file mode 100644 index 2dec2a1c..00000000 --- a/nUpdate.WPFUserInterface.Test/MainWindow.xaml +++ /dev/null @@ -1,16 +0,0 @@ - - - -