mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 22:11:48 +08:00
lib Update
correction for update window
This commit is contained in:
Dimitrij
@@ -11,8 +11,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AWSSDK.Core" Version="3.7.105.12" />
|
||||
<PackageReference Include="AWSSDK.EC2" Version="3.7.124.2" />
|
||||
<PackageReference Include="AWSSDK.Core" Version="3.7.105.13" />
|
||||
<PackageReference Include="AWSSDK.EC2" Version="3.7.125" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
|
||||
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -9,14 +9,14 @@ using System.Resources;
|
||||
[assembly: AssemblyDescription("Multi-Remote Next Generation Connection Manager")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("mRemoteNG")]
|
||||
[assembly: AssemblyProduct("mRemoteNG")]
|
||||
[assembly: AssemblyCopyright("<EFBFBD> 2023 mRemoteNG")]
|
||||
[assembly: AssemblyProduct("mRemoteNG Connection Manager")]
|
||||
[assembly: AssemblyCopyright("(c) 2023 mRemoteNG")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Version information
|
||||
[assembly: AssemblyVersion("1.77.3.1754")]
|
||||
[assembly: AssemblyFileVersion("1.77.3.1754")]
|
||||
[assembly: AssemblyVersion("1.77.3.1763")]
|
||||
[assembly: AssemblyFileVersion("1.77.3.1763")]
|
||||
[assembly: NeutralResourcesLanguageAttribute("en-US")]
|
||||
[assembly: AssemblyInformationalVersion("1.77.3 (Nightly Build: 1754)")]
|
||||
[assembly: AssemblyInformationalVersion("1.77.3 (Nightly Build: 1763)")]
|
||||
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
{
|
||||
major = Convert.ToInt32(matches[0].Groups["major"].Value);
|
||||
minor = Convert.ToInt32(matches[0].Groups["minor"].Value);
|
||||
build = Convert.ToInt32(matches[0].Groups["build"].Value) + 1;
|
||||
revision = Convert.ToInt32(matches[0].Groups["revision"].Value);
|
||||
build = Convert.ToInt32(matches[0].Groups["build"].Value);
|
||||
if( this.Host.ResolveParameterValue("-","-","BuildConfiguration") == "Release" )
|
||||
revision++;
|
||||
build++;
|
||||
}
|
||||
#>
|
||||
|
||||
@@ -27,8 +27,8 @@ using System.Resources;
|
||||
[assembly: AssemblyDescription("Multi-Remote Next Generation Connection Manager")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("mRemoteNG")]
|
||||
[assembly: AssemblyProduct("mRemoteNG")]
|
||||
[assembly: AssemblyCopyright("<EFBFBD> 2023 mRemoteNG")]
|
||||
[assembly: AssemblyProduct("mRemoteNG Connection Manager")]
|
||||
[assembly: AssemblyCopyright("(c) 2023 mRemoteNG")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
@@ -42,6 +42,6 @@ using System.Resources;
|
||||
int major = 1;
|
||||
int minor = 77;
|
||||
int revision = 3;
|
||||
int build = 1754;
|
||||
int build = 0;
|
||||
string channel = "Nightly Build";
|
||||
#>
|
||||
351
mRemoteNG/UI/Window/UpdateWindow.Designer.cs
generated
351
mRemoteNG/UI/Window/UpdateWindow.Designer.cs
generated
@@ -4,219 +4,220 @@ using mRemoteNG.UI.Controls;
|
||||
|
||||
namespace mRemoteNG.UI.Window
|
||||
{
|
||||
public partial class UpdateWindow
|
||||
{
|
||||
public partial class UpdateWindow
|
||||
{
|
||||
#region Windows Form Designer generated code
|
||||
internal Controls.MrngLabel lblStatus;
|
||||
internal Controls.MrngTextBox txtChangeLog;
|
||||
internal Controls.MrngLabel lblChangeLogLabel;
|
||||
internal Controls.MrngLabel lblLatestVersionLabel;
|
||||
internal Controls.MrngLabel lblInstalledVersionLabel;
|
||||
internal Controls.MrngLabel lblLatestVersion;
|
||||
internal Controls.MrngLabel lblInstalledVersion;
|
||||
internal System.Windows.Forms.PictureBox pbUpdateImage;
|
||||
internal MrngButton btnCheckForUpdate;
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.btnCheckForUpdate = new MrngButton();
|
||||
this.lblChangeLogLabel = new mRemoteNG.UI.Controls.MrngLabel();
|
||||
this.txtChangeLog = new mRemoteNG.UI.Controls.MrngTextBox();
|
||||
this.lblStatus = new mRemoteNG.UI.Controls.MrngLabel();
|
||||
this.lblLatestVersionLabel = new mRemoteNG.UI.Controls.MrngLabel();
|
||||
this.lblInstalledVersionLabel = new mRemoteNG.UI.Controls.MrngLabel();
|
||||
this.lblLatestVersion = new mRemoteNG.UI.Controls.MrngLabel();
|
||||
this.lblInstalledVersion = new mRemoteNG.UI.Controls.MrngLabel();
|
||||
this.pbUpdateImage = new System.Windows.Forms.PictureBox();
|
||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.prgbDownload = new mRemoteNG.UI.Controls.MrngProgressBar();
|
||||
this.btnDownload = new MrngButton();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbUpdateImage)).BeginInit();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
internal Controls.MrngLabel lblStatus;
|
||||
internal Controls.MrngTextBox txtChangeLog;
|
||||
internal Controls.MrngLabel lblChangeLogLabel;
|
||||
internal Controls.MrngLabel lblLatestVersionLabel;
|
||||
internal Controls.MrngLabel lblInstalledVersionLabel;
|
||||
internal Controls.MrngLabel lblLatestVersion;
|
||||
internal Controls.MrngLabel lblInstalledVersion;
|
||||
internal MrngButton btnCheckForUpdate;
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
btnCheckForUpdate = new MrngButton();
|
||||
lblChangeLogLabel = new MrngLabel();
|
||||
txtChangeLog = new MrngTextBox();
|
||||
lblStatus = new MrngLabel();
|
||||
lblLatestVersionLabel = new MrngLabel();
|
||||
lblInstalledVersionLabel = new MrngLabel();
|
||||
lblLatestVersion = new MrngLabel();
|
||||
lblInstalledVersion = new MrngLabel();
|
||||
tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
btnDownload = new MrngButton();
|
||||
prgbDownload = new MrngProgressBar();
|
||||
pbUpdateImage = new System.Windows.Forms.PictureBox();
|
||||
tableLayoutPanel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)pbUpdateImage).BeginInit();
|
||||
SuspendLayout();
|
||||
//
|
||||
// btnCheckForUpdate
|
||||
//
|
||||
this.btnCheckForUpdate._mice = MrngButton.MouseState.HOVER;
|
||||
this.btnCheckForUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnCheckForUpdate.Location = new System.Drawing.Point(3, 94);
|
||||
this.btnCheckForUpdate.Name = "btnCheckForUpdate";
|
||||
this.btnCheckForUpdate.Size = new System.Drawing.Size(104, 32);
|
||||
this.btnCheckForUpdate.TabIndex = 5;
|
||||
this.btnCheckForUpdate.Text = "Check Again";
|
||||
this.btnCheckForUpdate.UseVisualStyleBackColor = true;
|
||||
this.btnCheckForUpdate.Click += new System.EventHandler(this.btnCheckForUpdate_Click);
|
||||
btnCheckForUpdate._mice = MrngButton.MouseState.OUT;
|
||||
btnCheckForUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
btnCheckForUpdate.Location = new System.Drawing.Point(3, 94);
|
||||
btnCheckForUpdate.Name = "btnCheckForUpdate";
|
||||
btnCheckForUpdate.Size = new System.Drawing.Size(104, 32);
|
||||
btnCheckForUpdate.TabIndex = 5;
|
||||
btnCheckForUpdate.Text = "Check Again";
|
||||
btnCheckForUpdate.UseVisualStyleBackColor = true;
|
||||
btnCheckForUpdate.Click += btnCheckForUpdate_Click;
|
||||
//
|
||||
// lblChangeLogLabel
|
||||
//
|
||||
this.lblChangeLogLabel.AutoSize = true;
|
||||
this.lblChangeLogLabel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblChangeLogLabel.Location = new System.Drawing.Point(3, 129);
|
||||
this.lblChangeLogLabel.Name = "lblChangeLogLabel";
|
||||
this.lblChangeLogLabel.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
|
||||
this.lblChangeLogLabel.Size = new System.Drawing.Size(73, 23);
|
||||
this.lblChangeLogLabel.TabIndex = 0;
|
||||
this.lblChangeLogLabel.Text = "Change Log:";
|
||||
lblChangeLogLabel.AutoSize = true;
|
||||
lblChangeLogLabel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
|
||||
lblChangeLogLabel.Location = new System.Drawing.Point(3, 129);
|
||||
lblChangeLogLabel.Name = "lblChangeLogLabel";
|
||||
lblChangeLogLabel.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
|
||||
lblChangeLogLabel.Size = new System.Drawing.Size(73, 23);
|
||||
lblChangeLogLabel.TabIndex = 0;
|
||||
lblChangeLogLabel.Text = "Change Log:";
|
||||
//
|
||||
// txtChangeLog
|
||||
//
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.txtChangeLog, 3);
|
||||
this.txtChangeLog.Cursor = System.Windows.Forms.Cursors.Arrow;
|
||||
this.txtChangeLog.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.txtChangeLog.Location = new System.Drawing.Point(3, 155);
|
||||
this.txtChangeLog.Multiline = true;
|
||||
this.txtChangeLog.Name = "txtChangeLog";
|
||||
this.txtChangeLog.ReadOnly = true;
|
||||
this.txtChangeLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
|
||||
this.txtChangeLog.Size = new System.Drawing.Size(728, 225);
|
||||
this.txtChangeLog.TabIndex = 1;
|
||||
this.txtChangeLog.TabStop = false;
|
||||
tableLayoutPanel1.SetColumnSpan(txtChangeLog, 3);
|
||||
txtChangeLog.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
txtChangeLog.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||
txtChangeLog.Location = new System.Drawing.Point(3, 381);
|
||||
txtChangeLog.Multiline = true;
|
||||
txtChangeLog.Name = "txtChangeLog";
|
||||
txtChangeLog.ReadOnly = true;
|
||||
txtChangeLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
|
||||
txtChangeLog.Size = new System.Drawing.Size(728, 14);
|
||||
txtChangeLog.TabIndex = 1;
|
||||
txtChangeLog.TabStop = false;
|
||||
//
|
||||
// lblStatus
|
||||
//
|
||||
this.lblStatus.AutoSize = true;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.lblStatus, 3);
|
||||
this.lblStatus.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblStatus.ForeColor = System.Drawing.SystemColors.ControlText;
|
||||
this.lblStatus.Location = new System.Drawing.Point(3, 0);
|
||||
this.lblStatus.Name = "lblStatus";
|
||||
this.lblStatus.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
|
||||
this.lblStatus.Size = new System.Drawing.Size(57, 31);
|
||||
this.lblStatus.TabIndex = 0;
|
||||
this.lblStatus.Text = "Status";
|
||||
this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
lblStatus.AutoSize = true;
|
||||
tableLayoutPanel1.SetColumnSpan(lblStatus, 3);
|
||||
lblStatus.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
|
||||
lblStatus.ForeColor = System.Drawing.SystemColors.ControlText;
|
||||
lblStatus.Location = new System.Drawing.Point(3, 0);
|
||||
lblStatus.Name = "lblStatus";
|
||||
lblStatus.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
|
||||
lblStatus.Size = new System.Drawing.Size(57, 31);
|
||||
lblStatus.TabIndex = 0;
|
||||
lblStatus.Text = "Status";
|
||||
lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// lblLatestVersionLabel
|
||||
//
|
||||
this.lblLatestVersionLabel.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.lblLatestVersionLabel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblLatestVersionLabel.Location = new System.Drawing.Point(3, 61);
|
||||
this.lblLatestVersionLabel.Name = "lblLatestVersionLabel";
|
||||
this.lblLatestVersionLabel.Size = new System.Drawing.Size(120, 30);
|
||||
this.lblLatestVersionLabel.TabIndex = 3;
|
||||
this.lblLatestVersionLabel.Text = "Current version:";
|
||||
this.lblLatestVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
lblLatestVersionLabel.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
lblLatestVersionLabel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
|
||||
lblLatestVersionLabel.Location = new System.Drawing.Point(3, 61);
|
||||
lblLatestVersionLabel.Name = "lblLatestVersionLabel";
|
||||
lblLatestVersionLabel.Size = new System.Drawing.Size(120, 30);
|
||||
lblLatestVersionLabel.TabIndex = 3;
|
||||
lblLatestVersionLabel.Text = "Current version:";
|
||||
lblLatestVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
//
|
||||
// lblInstalledVersionLabel
|
||||
//
|
||||
this.lblInstalledVersionLabel.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.lblInstalledVersionLabel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblInstalledVersionLabel.Location = new System.Drawing.Point(3, 31);
|
||||
this.lblInstalledVersionLabel.Name = "lblInstalledVersionLabel";
|
||||
this.lblInstalledVersionLabel.Size = new System.Drawing.Size(120, 30);
|
||||
this.lblInstalledVersionLabel.TabIndex = 1;
|
||||
this.lblInstalledVersionLabel.Text = "Installed version:";
|
||||
this.lblInstalledVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
lblInstalledVersionLabel.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
lblInstalledVersionLabel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
|
||||
lblInstalledVersionLabel.Location = new System.Drawing.Point(3, 31);
|
||||
lblInstalledVersionLabel.Name = "lblInstalledVersionLabel";
|
||||
lblInstalledVersionLabel.Size = new System.Drawing.Size(120, 30);
|
||||
lblInstalledVersionLabel.TabIndex = 1;
|
||||
lblInstalledVersionLabel.Text = "Installed version:";
|
||||
lblInstalledVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
//
|
||||
// lblLatestVersion
|
||||
//
|
||||
this.lblLatestVersion.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.lblLatestVersion.Location = new System.Drawing.Point(129, 61);
|
||||
this.lblLatestVersion.Name = "lblLatestVersion";
|
||||
this.lblLatestVersion.Size = new System.Drawing.Size(104, 30);
|
||||
this.lblLatestVersion.TabIndex = 4;
|
||||
this.lblLatestVersion.Text = "Version";
|
||||
this.lblLatestVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
lblLatestVersion.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
lblLatestVersion.Location = new System.Drawing.Point(129, 61);
|
||||
lblLatestVersion.Name = "lblLatestVersion";
|
||||
lblLatestVersion.Size = new System.Drawing.Size(166, 30);
|
||||
lblLatestVersion.TabIndex = 4;
|
||||
lblLatestVersion.Text = "Version";
|
||||
lblLatestVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// lblInstalledVersion
|
||||
//
|
||||
this.lblInstalledVersion.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.lblInstalledVersion.Location = new System.Drawing.Point(129, 31);
|
||||
this.lblInstalledVersion.Name = "lblInstalledVersion";
|
||||
this.lblInstalledVersion.Size = new System.Drawing.Size(104, 30);
|
||||
this.lblInstalledVersion.TabIndex = 2;
|
||||
this.lblInstalledVersion.Text = "Version";
|
||||
this.lblInstalledVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// pbUpdateImage
|
||||
//
|
||||
this.pbUpdateImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.pbUpdateImage.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.pbUpdateImage.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.pbUpdateImage.Location = new System.Drawing.Point(239, 34);
|
||||
this.pbUpdateImage.Name = "pbUpdateImage";
|
||||
this.tableLayoutPanel1.SetRowSpan(this.pbUpdateImage, 4);
|
||||
this.pbUpdateImage.Size = new System.Drawing.Size(492, 115);
|
||||
this.pbUpdateImage.TabIndex = 45;
|
||||
this.pbUpdateImage.TabStop = false;
|
||||
this.pbUpdateImage.Visible = false;
|
||||
this.pbUpdateImage.Click += new System.EventHandler(this.pbUpdateImage_Click);
|
||||
lblInstalledVersion.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
lblInstalledVersion.Location = new System.Drawing.Point(129, 31);
|
||||
lblInstalledVersion.Name = "lblInstalledVersion";
|
||||
lblInstalledVersion.Size = new System.Drawing.Size(166, 30);
|
||||
lblInstalledVersion.TabIndex = 2;
|
||||
lblInstalledVersion.Text = "Version";
|
||||
lblInstalledVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// tableLayoutPanel1
|
||||
//
|
||||
this.tableLayoutPanel1.ColumnCount = 3;
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
this.tableLayoutPanel1.Controls.Add(this.lblChangeLogLabel, 0, 4);
|
||||
this.tableLayoutPanel1.Controls.Add(this.lblStatus, 0, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.btnCheckForUpdate, 0, 3);
|
||||
this.tableLayoutPanel1.Controls.Add(this.lblInstalledVersionLabel, 0, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.lblLatestVersionLabel, 0, 2);
|
||||
this.tableLayoutPanel1.Controls.Add(this.lblInstalledVersion, 1, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.lblLatestVersion, 1, 2);
|
||||
this.tableLayoutPanel1.Controls.Add(this.txtChangeLog, 0, 5);
|
||||
this.tableLayoutPanel1.Controls.Add(this.btnDownload, 0, 6);
|
||||
this.tableLayoutPanel1.Controls.Add(this.pbUpdateImage, 3, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.prgbDownload, 2, 6);
|
||||
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
|
||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
this.tableLayoutPanel1.RowCount = 7;
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
|
||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(734, 418);
|
||||
this.tableLayoutPanel1.TabIndex = 46;
|
||||
//
|
||||
// prgbDownload
|
||||
//
|
||||
this.prgbDownload.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.prgbDownload.Location = new System.Drawing.Point(239, 386);
|
||||
this.prgbDownload.Name = "prgbDownload";
|
||||
this.prgbDownload.Size = new System.Drawing.Size(492, 29);
|
||||
this.prgbDownload.TabIndex = 3;
|
||||
this.prgbDownload.Visible = false;
|
||||
tableLayoutPanel1.ColumnCount = 3;
|
||||
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
tableLayoutPanel1.Controls.Add(lblChangeLogLabel, 0, 4);
|
||||
tableLayoutPanel1.Controls.Add(lblStatus, 0, 0);
|
||||
tableLayoutPanel1.Controls.Add(btnCheckForUpdate, 0, 3);
|
||||
tableLayoutPanel1.Controls.Add(lblInstalledVersionLabel, 0, 1);
|
||||
tableLayoutPanel1.Controls.Add(lblLatestVersionLabel, 0, 2);
|
||||
tableLayoutPanel1.Controls.Add(lblInstalledVersion, 1, 1);
|
||||
tableLayoutPanel1.Controls.Add(lblLatestVersion, 1, 2);
|
||||
tableLayoutPanel1.Controls.Add(txtChangeLog, 0, 5);
|
||||
tableLayoutPanel1.Controls.Add(btnDownload, 0, 6);
|
||||
tableLayoutPanel1.Controls.Add(prgbDownload, 2, 6);
|
||||
tableLayoutPanel1.Controls.Add(pbUpdateImage, 2, 3);
|
||||
tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
|
||||
tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
tableLayoutPanel1.RowCount = 9;
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||
tableLayoutPanel1.Size = new System.Drawing.Size(734, 418);
|
||||
tableLayoutPanel1.TabIndex = 46;
|
||||
//
|
||||
// btnDownload
|
||||
//
|
||||
this.btnDownload._mice = MrngButton.MouseState.HOVER;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.btnDownload, 2);
|
||||
this.btnDownload.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.btnDownload.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnDownload.Location = new System.Drawing.Point(3, 386);
|
||||
this.btnDownload.Name = "btnDownload";
|
||||
this.btnDownload.Size = new System.Drawing.Size(230, 29);
|
||||
this.btnDownload.TabIndex = 2;
|
||||
this.btnDownload.Text = "Download and Install";
|
||||
this.btnDownload.UseVisualStyleBackColor = true;
|
||||
this.btnDownload.Click += new System.EventHandler(this.btnDownload_Click);
|
||||
btnDownload._mice = MrngButton.MouseState.OUT;
|
||||
tableLayoutPanel1.SetColumnSpan(btnDownload, 2);
|
||||
btnDownload.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
btnDownload.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
btnDownload.Location = new System.Drawing.Point(3, 401);
|
||||
btnDownload.Name = "btnDownload";
|
||||
btnDownload.Size = new System.Drawing.Size(292, 14);
|
||||
btnDownload.TabIndex = 2;
|
||||
btnDownload.Text = "Download and Install";
|
||||
btnDownload.UseVisualStyleBackColor = true;
|
||||
btnDownload.Click += btnDownload_Click;
|
||||
//
|
||||
// prgbDownload
|
||||
//
|
||||
prgbDownload.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
prgbDownload.Location = new System.Drawing.Point(301, 401);
|
||||
prgbDownload.Name = "prgbDownload";
|
||||
prgbDownload.Size = new System.Drawing.Size(430, 14);
|
||||
prgbDownload.TabIndex = 3;
|
||||
prgbDownload.Visible = false;
|
||||
//
|
||||
// pbUpdateImage
|
||||
//
|
||||
pbUpdateImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
pbUpdateImage.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
pbUpdateImage.Location = new System.Drawing.Point(301, 94);
|
||||
pbUpdateImage.Name = "pbUpdateImage";
|
||||
tableLayoutPanel1.SetRowSpan(pbUpdateImage, 4);
|
||||
pbUpdateImage.Size = new System.Drawing.Size(33, 32);
|
||||
pbUpdateImage.TabIndex = 45;
|
||||
pbUpdateImage.TabStop = false;
|
||||
pbUpdateImage.Visible = false;
|
||||
pbUpdateImage.Click += pbUpdateImage_Click;
|
||||
//
|
||||
// UpdateWindow
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.ClientSize = new System.Drawing.Size(734, 418);
|
||||
this.Controls.Add(this.tableLayoutPanel1);
|
||||
this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Name = "UpdateWindow";
|
||||
this.TabText = "Update";
|
||||
this.Text = "Update";
|
||||
this.Load += new System.EventHandler(this.Update_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbUpdateImage)).EndInit();
|
||||
this.tableLayoutPanel1.ResumeLayout(false);
|
||||
this.tableLayoutPanel1.PerformLayout();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
ClientSize = new System.Drawing.Size(734, 418);
|
||||
Controls.Add(tableLayoutPanel1);
|
||||
Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||
Name = "UpdateWindow";
|
||||
TabText = "Update";
|
||||
Text = "Update";
|
||||
Load += Update_Load;
|
||||
tableLayoutPanel1.ResumeLayout(false);
|
||||
tableLayoutPanel1.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)pbUpdateImage).EndInit();
|
||||
ResumeLayout(false);
|
||||
}
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
|
||||
internal MrngButton btnDownload;
|
||||
internal Controls.MrngProgressBar prgbDownload;
|
||||
internal System.Windows.Forms.PictureBox pbUpdateImage;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ namespace mRemoteNG.UI.Window
|
||||
Runtime.MessageCollector?.AddExceptionStackTrace(Language.UpdateCheckCompleteFailed, ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void SetVisibilityOfUpdateControls(bool visible)
|
||||
{
|
||||
lblChangeLogLabel.Visible = visible;
|
||||
|
||||
@@ -1,64 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
|
||||
@@ -476,7 +476,7 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
|
||||
<Exec Command="echo $(ConfigurationName) > buildenv.tmp" />
|
||||
<Exec Command="echo $(ConfigurationName) > buildenv.tmp
"$(DevEnvDir)TextTransform.exe" -a !!BuildConfiguration!$(Configuration) "$(ProjectDir)Properties\AssemblyInfo.tt"" />
|
||||
</Target>
|
||||
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||
<Exec Command=":: When passing paths to powershell scripts, check if the path ends with a backslash "\"
:: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one.

powershell -noprofile -command "sleep 2"

set /p buildenv=<buildenv.tmp

:: Manual builds, set the cert password and uncomment below.
:: IF "%25APPVEYOR_BUILD_FOLDER"=="" ( set cert_pwd= )

:: Call the post build powershell script
powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_mremoteng.ps1" -SolutionDir "$(SolutionDir)\" -TargetDir "$(TargetDir)\" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "$(CertPath)" -CertificatePassword "$(CertPassword)" -ExcludeFromSigning "PuTTYNG.exe"" />
|
||||
|
||||
@@ -120,9 +120,6 @@
|
||||
<Component Id="cmp6107C12C2A55CB8E7E97FF2C9A33F385" Directory="INSTALLDIR" Guid="*">
|
||||
<File Id="fil135F9AEEB4A74E1EE438100986E97C41" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.Xaml.Behaviors.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp1FF884F3A57BE81D6F6723E190FA13B8" Directory="INSTALLDIR" Guid="*">
|
||||
<File Id="filD21FDAF1DEE86A89847F409021A410BF" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG-Installer-1.77.3.0.msi" />
|
||||
</Component>
|
||||
<Component Id="cmp41D33384103998013724F7507BE537A3" Directory="INSTALLDIR" Guid="*">
|
||||
<File Id="filD409F3953DFE64FEE2FDC4460BD98297" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG.deps.json" />
|
||||
</Component>
|
||||
@@ -133,9 +130,6 @@
|
||||
<File Id="filAC4D49028FDDA1626E5B006C9D1ED57E" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG.dll.config" />
|
||||
</Component>
|
||||
|
||||
<Component Id="cmp67313C6B4CE3487E9A8165EFFE369D16" Directory="INSTALLDIR" Guid="*">
|
||||
<File Id="fil5F0524AF62166FF3C4DAE07F1113C0D9" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG.pdb" />
|
||||
</Component>
|
||||
<Component Id="cmp9FF194CCD09E9797444CF95F7C37C75A" Directory="INSTALLDIR" Guid="*">
|
||||
<File Id="fil09655B2FCDF14CBBA2E03BBD3F6C58EE" KeyPath="yes" Source="$(var.HarvestPath)\mRemoteNG.runtimeconfig.json" />
|
||||
</Component>
|
||||
|
||||
Reference in New Issue
Block a user