From 0661d67148619ebc88afbd771b7d2ed6f3100a47 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Fri, 10 Jun 2022 20:23:07 +0200 Subject: [PATCH] Update to .NET 6 except the both *.GUI-Projects --- NuGet.Config | 6 + .../Pilz.Updating.Administration.GUI.csproj | 22 +- .../Pilz.Updating.Administration.csproj | 21 +- .../UpdateServerConfig.cs | 15 +- .../Pilz.Updating.Client.GUI.csproj | 13 +- .../Pilz.Updating.Client.csproj | 8 +- Pilz.Updating.Client/UpdateClient.cs | 6 +- .../Pilz.Updating.GUIBase.csproj | 7 +- .../Main.Designer.cs | 190 +++++++----------- Pilz.Updating.UpdateInstaller/Main.cs | 15 +- Pilz.Updating.UpdateInstaller/Main.resx | 62 +----- .../Pilz.Updating.UpdateInstaller.csproj | 23 +-- Pilz.Updating/Pilz.Updating.csproj | 6 +- .../UpdateInstaller/UpdateInstallerConfig.cs | 3 +- Shared Libs/Pilz.Cryptography.dll | Bin 10752 -> 10752 bytes Shared Libs/drsPwEnc.dll | Bin 22016 -> 0 bytes 16 files changed, 121 insertions(+), 276 deletions(-) create mode 100644 NuGet.Config delete mode 100644 Shared Libs/drsPwEnc.dll diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..9395b03 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj b/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj index eb7bb4e..6f7aed1 100644 --- a/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj +++ b/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj @@ -1,10 +1,10 @@ - + WinExe Pilz.Updating.Administration.GUI.My.MyApplication Pilz.Updating.Administration.GUI WindowsForms - net48 + net6.0-windows true $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest @@ -47,6 +47,7 @@ + @@ -54,10 +55,6 @@ ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll - - ..\Shared Libs\drsPwEnc.dll - - ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll False @@ -72,9 +69,6 @@ ..\Shared Libs\Pilz.Cryptography.dll - - - @@ -262,16 +256,12 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + all - + - + diff --git a/Pilz.Updating.Administration/Pilz.Updating.Administration.csproj b/Pilz.Updating.Administration/Pilz.Updating.Administration.csproj index 8b8522a..f989bb4 100644 --- a/Pilz.Updating.Administration/Pilz.Updating.Administration.csproj +++ b/Pilz.Updating.Administration/Pilz.Updating.Administration.csproj @@ -2,7 +2,7 @@ Pilz.Updating.Administration Windows - net48 + net6.0-windows $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest Pilz.Updating.Server @@ -39,14 +39,11 @@ + - - ..\Shared Libs\drsPwEnc.dll - - ..\Shared Libs\Pilz.Cryptography.dll @@ -104,14 +101,14 @@ - - - + + + - - - - + + + + diff --git a/Pilz.Updating.Administration/UpdateServerConfig.cs b/Pilz.Updating.Administration/UpdateServerConfig.cs index af22247..cdc3462 100644 --- a/Pilz.Updating.Administration/UpdateServerConfig.cs +++ b/Pilz.Updating.Administration/UpdateServerConfig.cs @@ -1,5 +1,4 @@ -using drsPwEnc; -using Newtonsoft.Json; +using Newtonsoft.Json; using Pilz.Cryptography; using System; using System.Collections.Generic; @@ -17,18 +16,6 @@ namespace Pilz.Updating.Administration public string UpdateInfoFilename { get; set; } public string Username { get; set; } - [JsonProperty("Password")] - private string PasswordOld - { - set - { - if (string.IsNullOrEmpty(value)) - Password = string.Empty; - else - Password = new drsPwEnc.drsPwEnc().DecryptData(value); - } - } - [JsonProperty("PasswordV3")] public SecureString Password { get; set; } } diff --git a/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj b/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj index 2a1ecbe..475c69e 100644 --- a/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj +++ b/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj @@ -1,9 +1,9 @@ - + SM64_ROM_Manager.Updating.Client.GUI Windows - net48 + net6.0-windows true $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest @@ -39,11 +39,11 @@ TRACE + - ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll False @@ -58,9 +58,6 @@ ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll - - - @@ -174,8 +171,8 @@ - - + + diff --git a/Pilz.Updating.Client/Pilz.Updating.Client.csproj b/Pilz.Updating.Client/Pilz.Updating.Client.csproj index 3dfd09f..b7faa3f 100644 --- a/Pilz.Updating.Client/Pilz.Updating.Client.csproj +++ b/Pilz.Updating.Client/Pilz.Updating.Client.csproj @@ -1,8 +1,8 @@ - + Pilz.Updating Windows - net48 + net6.0-windows $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest Pilz.Updating.Client @@ -38,12 +38,10 @@ TRACE;RelMono + - - - diff --git a/Pilz.Updating.Client/UpdateClient.cs b/Pilz.Updating.Client/UpdateClient.cs index 5ce83c7..5d4d868 100644 --- a/Pilz.Updating.Client/UpdateClient.cs +++ b/Pilz.Updating.Client/UpdateClient.cs @@ -60,8 +60,7 @@ namespace Pilz.Updating public bool InstallAsAdmin { get; set; } = false; public uint MillisecondsToWaitForHostApplicationToClose { get; set; } = 10000; public bool ForceClosingHostApplication { get; set; } = true; - public Color UpdateWindowBaseColor { get; set; } = Color.FromArgb(unchecked((int)0xFFB7472A)); - public Color UpdateWindowCanvasColor { get; set; } = Color.FromArgb(unchecked((int)0xFFFFFFFF)); + public bool UIDarkMode { get; set; } = false; // C o n s t r u c t o r s @@ -248,8 +247,7 @@ namespace Pilz.Updating HostApplicationProcessPath = Assembly.GetEntryAssembly().Location, MillisecondsToWaitForHostApplicationToClose = MillisecondsToWaitForHostApplicationToClose, ForceClosingHostApplication = ForceClosingHostApplication, - UpdateWindowBaseColor = UpdateWindowBaseColor, - UpdateWindowCanvasColor = UpdateWindowCanvasColor + UIDarkMode = UIDarkMode }; // Start UpdateInstaller diff --git a/Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj b/Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj index 9f3a413..b9bdd4d 100644 --- a/Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj +++ b/Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj @@ -1,8 +1,8 @@ - + Pilz.Updating.GUIBase Windows - net48 + net6.0-windows $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest Pilz.Updating.GUIBase @@ -37,15 +37,14 @@ TRACE;RelMono + - ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll - diff --git a/Pilz.Updating.UpdateInstaller/Main.Designer.cs b/Pilz.Updating.UpdateInstaller/Main.Designer.cs index add8411..eafd303 100644 --- a/Pilz.Updating.UpdateInstaller/Main.Designer.cs +++ b/Pilz.Updating.UpdateInstaller/Main.Designer.cs @@ -7,7 +7,7 @@ using Microsoft.VisualBasic.CompilerServices; namespace Pilz.Updating.UpdateInstaller { [DesignerGenerated()] - public partial class Main : DevComponents.DotNetBar.OfficeForm + public partial class Main : Telerik.WinControls.UI.RadForm { // Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -37,114 +37,108 @@ namespace Pilz.Updating.UpdateInstaller private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); - this._ProgressBarX1 = new DevComponents.DotNetBar.Controls.ProgressBarX(); this._Panel1 = new System.Windows.Forms.Panel(); - this._LabelX_Header = new DevComponents.DotNetBar.LabelX(); - this._LabelX_Status = new DevComponents.DotNetBar.LabelX(); + this.radWaitingBar1 = new Telerik.WinControls.UI.RadWaitingBar(); + this.dotsLineWaitingBarIndicatorElement1 = new Telerik.WinControls.UI.DotsLineWaitingBarIndicatorElement(); + this.radLabel_Status = new Telerik.WinControls.UI.RadLabel(); + this.radLabel_Header = new Telerik.WinControls.UI.RadLabel(); this._Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel_Status)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel_Header)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); this.SuspendLayout(); // - // _ProgressBarX1 - // - this._ProgressBarX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - // - // - // - this._ProgressBarX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this._ProgressBarX1.Location = new System.Drawing.Point(3, 94); - this._ProgressBarX1.Name = "_ProgressBarX1"; - this._ProgressBarX1.ProgressType = DevComponents.DotNetBar.eProgressItemType.Marquee; - this._ProgressBarX1.Size = new System.Drawing.Size(628, 16); - this._ProgressBarX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this._ProgressBarX1.TabIndex = 0; - // // _Panel1 // this._Panel1.BackColor = System.Drawing.Color.Transparent; - this._Panel1.Controls.Add(this._LabelX_Header); - this._Panel1.Controls.Add(this._LabelX_Status); - this._Panel1.Controls.Add(this._ProgressBarX1); + this._Panel1.Controls.Add(this.radWaitingBar1); + this._Panel1.Controls.Add(this.radLabel_Status); + this._Panel1.Controls.Add(this.radLabel_Header); this._Panel1.Dock = System.Windows.Forms.DockStyle.Fill; this._Panel1.Location = new System.Drawing.Point(0, 0); this._Panel1.Name = "_Panel1"; - this._Panel1.Size = new System.Drawing.Size(634, 111); + this._Panel1.Size = new System.Drawing.Size(692, 106); this._Panel1.TabIndex = 1; // - // _LabelX_Header + // radWaitingBar1 // - this._LabelX_Header.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.radWaitingBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.radWaitingBar1.Location = new System.Drawing.Point(3, 85); + this.radWaitingBar1.Name = "radWaitingBar1"; + this.radWaitingBar1.Size = new System.Drawing.Size(130, 18); + this.radWaitingBar1.TabIndex = 3; + this.radWaitingBar1.Text = "radWaitingBar1"; + this.radWaitingBar1.WaitingIndicators.Add(this.dotsLineWaitingBarIndicatorElement1); + this.radWaitingBar1.WaitingSpeed = 80; + this.radWaitingBar1.WaitingStyle = Telerik.WinControls.Enumerations.WaitingBarStyles.DotsLine; + ((Telerik.WinControls.UI.RadWaitingBarElement)(radWaitingBar1.GetChildAt(0))).WaitingSpeed = 80; + ((Telerik.WinControls.UI.WaitingBarContentElement)(radWaitingBar1.GetChildAt(0).GetChildAt(0))).WaitingStyle = Telerik.WinControls.Enumerations.WaitingBarStyles.DotsLine; + ((Telerik.WinControls.UI.WaitingBarSeparatorElement)(radWaitingBar1.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Dash = false; + // + // dotsLineWaitingBarIndicatorElement1 + // + this.dotsLineWaitingBarIndicatorElement1.Name = "dotsLineWaitingBarIndicatorElement1"; + // + // radLabel_Status + // + this.radLabel_Status.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.radLabel_Status.AutoSize = false; + this.radLabel_Status.Location = new System.Drawing.Point(139, 85); + this.radLabel_Status.Name = "radLabel_Status"; + this.radLabel_Status.Size = new System.Drawing.Size(550, 18); + this.radLabel_Status.TabIndex = 2; + this.radLabel_Status.Text = "Idle ..."; // + // radLabel_Header // - // - this._LabelX_Header.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this._LabelX_Header.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this._LabelX_Header.Image = global::Pilz.Updating.UpdateInstaller.MyIcons.icons8_installing_updates_48px; - this._LabelX_Header.Location = new System.Drawing.Point(3, 3); - this._LabelX_Header.Name = "_LabelX_Header"; - this._LabelX_Header.Size = new System.Drawing.Size(628, 56); - this._LabelX_Header.TabIndex = 3; - this._LabelX_Header.Text = "
SM64 ROM M" + - "anager wird aktuallisierung ...
"; - // - // _LabelX_Status - // - this._LabelX_Status.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.radLabel_Header.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - // - // - // - this._LabelX_Status.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this._LabelX_Status.Location = new System.Drawing.Point(3, 65); - this._LabelX_Status.Name = "_LabelX_Status"; - this._LabelX_Status.Size = new System.Drawing.Size(628, 23); - this._LabelX_Status.TabIndex = 2; - this._LabelX_Status.Text = "Idle ..."; + this.radLabel_Header.AutoSize = false; + this.radLabel_Header.Image = global::Pilz.Updating.UpdateInstaller.MyIcons.icons8_installing_updates_48px; + this.radLabel_Header.Location = new System.Drawing.Point(3, 3); + this.radLabel_Header.Name = "radLabel_Header"; + this.radLabel_Header.Size = new System.Drawing.Size(686, 76); + this.radLabel_Header.TabIndex = 1; + this.radLabel_Header.Text = "SM64 ROM Manager wird aktu" + + "allisierung ..."; + this.radLabel_Header.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; + this.radLabel_Header.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; // // Main // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleBaseSize = new System.Drawing.Size(7, 15); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(634, 111); + this.ClientSize = new System.Drawing.Size(692, 106); this.Controls.Add(this._Panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "Main"; + // + // + // + this.RootElement.ApplyShapeToControl = true; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Installing"; this._Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radWaitingBar1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel_Status)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radLabel_Header)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); this.ResumeLayout(false); } - private DevComponents.DotNetBar.Controls.ProgressBarX _ProgressBarX1; - - internal DevComponents.DotNetBar.Controls.ProgressBarX ProgressBarX1 - { - [MethodImpl(MethodImplOptions.Synchronized)] - get - { - return _ProgressBarX1; - } - - [MethodImpl(MethodImplOptions.Synchronized)] - set - { - if (_ProgressBarX1 != null) - { - } - - _ProgressBarX1 = value; - if (_ProgressBarX1 != null) - { - } - } - } - private Panel _Panel1; + private Telerik.WinControls.UI.RadLabel radLabel_Status; + private Telerik.WinControls.UI.RadLabel radLabel_Header; + private Telerik.WinControls.UI.RadWaitingBar radWaitingBar1; + private Telerik.WinControls.UI.DotsLineWaitingBarIndicatorElement dotsLineWaitingBarIndicatorElement1; internal Panel Panel1 { @@ -167,53 +161,5 @@ namespace Pilz.Updating.UpdateInstaller } } } - - private DevComponents.DotNetBar.LabelX _LabelX_Status; - - internal DevComponents.DotNetBar.LabelX LabelX_Status - { - [MethodImpl(MethodImplOptions.Synchronized)] - get - { - return _LabelX_Status; - } - - [MethodImpl(MethodImplOptions.Synchronized)] - set - { - if (_LabelX_Status != null) - { - } - - _LabelX_Status = value; - if (_LabelX_Status != null) - { - } - } - } - - private DevComponents.DotNetBar.LabelX _LabelX_Header; - - internal DevComponents.DotNetBar.LabelX LabelX_Header - { - [MethodImpl(MethodImplOptions.Synchronized)] - get - { - return _LabelX_Header; - } - - [MethodImpl(MethodImplOptions.Synchronized)] - set - { - if (_LabelX_Header != null) - { - } - - _LabelX_Header = value; - if (_LabelX_Header != null) - { - } - } - } } } \ No newline at end of file diff --git a/Pilz.Updating.UpdateInstaller/Main.cs b/Pilz.Updating.UpdateInstaller/Main.cs index 07d8c50..febbaeb 100644 --- a/Pilz.Updating.UpdateInstaller/Main.cs +++ b/Pilz.Updating.UpdateInstaller/Main.cs @@ -4,7 +4,8 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Threading.Tasks; using System.Windows.Forms; -using global::DevComponents.DotNetBar; +using Telerik.WinControls; +using Telerik.WinControls.Themes; namespace Pilz.Updating.UpdateInstaller { @@ -32,9 +33,8 @@ namespace Pilz.Updating.UpdateInstaller InitializeComponent(); // Init Style - StyleManager.Style = eStyle.Office2016; - StyleManager.MetroColorGeneratorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(Installer.Configuration.UpdateWindowCanvasColor, Installer.Configuration.UpdateWindowBaseColor); - StyleManager.UpdateAmbientColors(this); + RadThemeComponentBase themeToUse = Installer.Configuration.UIDarkMode ? new FluentDarkTheme() : new FluentTheme(); + ThemeResolutionService.ApplicationThemeName = themeToUse.ThemeName; // Init Application Header Text string header; @@ -47,7 +47,8 @@ namespace Pilz.Updating.UpdateInstaller header = My.Resources.UpdateInstallerGuiLangRes.String_UpdateIsRunning; } - LabelX_Header.Text = $"
{header}
"; + radLabel_Header.Text = $"
{header}
"; + radLabel_Header.Text = $"{header}"; } if (Installer is null) @@ -131,8 +132,8 @@ namespace Pilz.Updating.UpdateInstaller break; } - LabelX_Status.Text = newStatusText; - LabelX_Status.Image = newStatusImage; + radLabel_Status.Text = newStatusText; + radLabel_Status.Image = newStatusImage; //if (newStatus == UpdateInstallerStatus.Done) //{ diff --git a/Pilz.Updating.UpdateInstaller/Main.resx b/Pilz.Updating.UpdateInstaller/Main.resx index 96f590b..d2235dd 100644 --- a/Pilz.Updating.UpdateInstaller/Main.resx +++ b/Pilz.Updating.UpdateInstaller/Main.resx @@ -1,64 +1,4 @@ - - - + diff --git a/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj b/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj index cf92eb5..2fad043 100644 --- a/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj +++ b/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj @@ -4,7 +4,7 @@ Pilz.Updating.UpdateInstaller.My.MyApplication Pilz.Updating.UpdateInstaller WindowsForms - net48 + net6.0-windows true $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest @@ -46,22 +46,13 @@ TRACE;RelMono + - - - - - ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll - False - - - ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll - - - - + + 2022.2.510.0 + @@ -78,9 +69,7 @@ - - Form - + Main.cs Form diff --git a/Pilz.Updating/Pilz.Updating.csproj b/Pilz.Updating/Pilz.Updating.csproj index b8ac467..c99ce90 100644 --- a/Pilz.Updating/Pilz.Updating.csproj +++ b/Pilz.Updating/Pilz.Updating.csproj @@ -2,7 +2,7 @@ Pilz.Updating Windows - net48 + net6.0-windows $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest Pilz.Updating @@ -38,12 +38,10 @@ TRACE;RelMono + - - - diff --git a/Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs b/Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs index d3efa28..e450d59 100644 --- a/Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs +++ b/Pilz.Updating/UpdateInstaller/UpdateInstallerConfig.cs @@ -14,8 +14,7 @@ namespace Pilz.Updating.UpdateInstaller public string HostApplicationProcessPath { get; set; } public bool ForceClosingHostApplication { get; set; } public uint MillisecondsToWaitForHostApplicationToClose { get; set; } - public Color UpdateWindowBaseColor { get; set; } - public Color UpdateWindowCanvasColor { get; set; } + public bool UIDarkMode { get; set; } public ApplicationVersion CurrentApplicationVersion { get; set; } public ApplicationVersion NewApplicationVersion { get; set; } diff --git a/Shared Libs/Pilz.Cryptography.dll b/Shared Libs/Pilz.Cryptography.dll index 20d0e809444cdeffbf53a335d65814e281e18ce8..d9b6a3e330e6e7f0c0e84647e63d35749fa392a6 100644 GIT binary patch delta 105 zcmZn&X$YCn!SeP;>%WaXGI9cS?QE>Zt7du3Sdp)k9yUQ>^A5QhW|sQH%|9kvCQ!C_n{|C_@E7s^#C#jO$z+<(F9QerdCa@*6e)XxcA< diff --git a/Shared Libs/drsPwEnc.dll b/Shared Libs/drsPwEnc.dll deleted file mode 100644 index 0dcf69d60411f3e1f60026c0bcebd8c3044e9799..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22016 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 YE*>mCkRAm*U-WN$irFLO&$k8sACCIvr2qf`