This commit is contained in:
Tomek Melissa 2021-05-09 21:14:45 +02:00
Родитель 08ee3e50ba
Коммит 2bf70bd2b9
6 изменённых файлов: 99 добавлений и 37 удалений

Просмотреть файл

@ -58,10 +58,6 @@
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />

52
2LCS/Forms/ChoosePackage.Designer.cs сгенерированный
Просмотреть файл

@ -42,16 +42,18 @@
this.FileAssetDisplayVersion = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.LcsEnvironmentActionId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.LcsEnvironmentId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Scope = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.EstimatedDuration = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.packagesDataGridView)).BeginInit();
this.SuspendLayout();
//
// OkButton
//
this.OkButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.OkButton.Location = new System.Drawing.Point(486, 479);
this.OkButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.OkButton.Location = new System.Drawing.Point(265, 259);
this.OkButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.OkButton.Name = "OkButton";
this.OkButton.Size = new System.Drawing.Size(222, 40);
this.OkButton.Size = new System.Drawing.Size(121, 22);
this.OkButton.TabIndex = 1;
this.OkButton.Text = "OK";
this.OkButton.UseVisualStyleBackColor = true;
@ -61,10 +63,10 @@
//
this.cancelButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancelButton.Location = new System.Drawing.Point(716, 479);
this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cancelButton.Location = new System.Drawing.Point(391, 259);
this.cancelButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(210, 40);
this.cancelButton.Size = new System.Drawing.Size(115, 22);
this.cancelButton.TabIndex = 2;
this.cancelButton.Text = "Cancel";
this.cancelButton.UseVisualStyleBackColor = true;
@ -91,16 +93,18 @@
this.PackageId,
this.FileAssetDisplayVersion,
this.LcsEnvironmentActionId,
this.LcsEnvironmentId});
this.packagesDataGridView.Location = new System.Drawing.Point(15, 16);
this.packagesDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LcsEnvironmentId,
this.Scope,
this.EstimatedDuration});
this.packagesDataGridView.Location = new System.Drawing.Point(8, 9);
this.packagesDataGridView.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.packagesDataGridView.MultiSelect = false;
this.packagesDataGridView.Name = "packagesDataGridView";
this.packagesDataGridView.RowHeadersVisible = false;
this.packagesDataGridView.RowHeadersWidth = 62;
this.packagesDataGridView.RowTemplate.Height = 28;
this.packagesDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.packagesDataGridView.Size = new System.Drawing.Size(1459, 456);
this.packagesDataGridView.Size = new System.Drawing.Size(796, 247);
this.packagesDataGridView.TabIndex = 0;
this.packagesDataGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.PackagesDataGridView_CellMouseDoubleClick);
this.packagesDataGridView.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.PackagesDataGridView_ColumnHeaderMouseClick);
@ -204,19 +208,37 @@
this.LcsEnvironmentId.ReadOnly = true;
this.LcsEnvironmentId.Visible = false;
//
// Scope
//
this.Scope.DataPropertyName = "Scope";
this.Scope.FillWeight = 8F;
this.Scope.HeaderText = "Scope";
this.Scope.MinimumWidth = 8;
this.Scope.Name = "Scope";
this.Scope.ReadOnly = true;
//
// EstimatedDuration
//
this.EstimatedDuration.DataPropertyName = "EstimatedDuration";
this.EstimatedDuration.FillWeight = 8F;
this.EstimatedDuration.HeaderText = "EstimatedDuration";
this.EstimatedDuration.MinimumWidth = 8;
this.EstimatedDuration.Name = "EstimatedDuration";
this.EstimatedDuration.ReadOnly = true;
//
// ChoosePackage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.cancelButton;
this.ClientSize = new System.Drawing.Size(1489, 533);
this.ClientSize = new System.Drawing.Size(812, 289);
this.Controls.Add(this.packagesDataGridView);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.OkButton);
this.Icon = global::LCS.Properties.Resources.favicon_blue;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(948, 467);
this.MinimumSize = new System.Drawing.Size(529, 286);
this.Name = "ChoosePackage";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@ -242,5 +264,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn FileAssetDisplayVersion;
private System.Windows.Forms.DataGridViewTextBoxColumn LcsEnvironmentActionId;
private System.Windows.Forms.DataGridViewTextBoxColumn LcsEnvironmentId;
private System.Windows.Forms.DataGridViewTextBoxColumn Scope;
private System.Windows.Forms.DataGridViewTextBoxColumn EstimatedDuration;
}
}

Просмотреть файл

@ -150,4 +150,10 @@
<metadata name="LcsEnvironmentId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Scope.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="EstimatedDuration.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

Просмотреть файл

@ -936,13 +936,17 @@ namespace LCS.Forms
document.DifferentFirstPage = true;
document.Footers.Odd.InsertParagraph("Generated with ").AppendHyperlink(link2LCS);
var toc = document.InsertTableOfContents("Table of Contents",
TableOfContentsSwitches.O // use paragraphs with built in heading styles
| TableOfContentsSwitches.U // build the toc by using paragraph outline level
| TableOfContentsSwitches.Z // hide tba leader in web layout
| TableOfContentsSwitches.H // use hyperlinks
| TableOfContentsSwitches.W // preserve tabs
| TableOfContentsSwitches.X);// preserve new line characters
var tocSwitches = new Dictionary<TableOfContentsSwitches, string>()
{
{ TableOfContentsSwitches.O, "1-3"},
{ TableOfContentsSwitches.U, ""},
{ TableOfContentsSwitches.Z, ""},
{ TableOfContentsSwitches.H, ""},
{ TableOfContentsSwitches.W, ""},
{ TableOfContentsSwitches.X, ""},
};
var toc = document.InsertTableOfContents("Table of Contents", tocSwitches);
var tocParagraph = document.InsertParagraph();
tocParagraph.InsertPageBreakAfterSelf();

Просмотреть файл

@ -692,7 +692,7 @@ namespace LCS
internal Response StartSandboxServicing(DeployablePackage package, string platformVersion)
{
var parameters = $"package[PackageId]={package.PackageId}&package[Name]={package.Name}&package[Description]={package.Description}&package[packageType]={package.PackageType}&package[ModifiedDate]={package.ModifiedDate}&package[ModifiedBy]={package.ModifiedBy}&package[Publisher]={package.Publisher}&package[LcsEnvironmentActionId]={package.LcsEnvironmentActionId}&package[LcsEnvironmentId]={package.LcsEnvironmentId}&package[FileAssetDisplayVersion]={package.FileAssetDisplayVersion}&package[PlatformVersion]={package.PlatformVersion}&package[AppVersion]={package.AppVersion}&platformReleaseName={platformVersion}";
var parameters = $"package[PackageId]={package.PackageId}&package[Name]={package.Name}&package[Description]={package.Description}&package[packageType]={package.PackageType}&package[ModifiedDate]={package.ModifiedDate}&package[ModifiedBy]={package.ModifiedBy}&package[Publisher]={package.Publisher}&package[Scope]={package.Scope}&package[LcsEnvironmentActionId]={package.LcsEnvironmentActionId}&package[LcsEnvironmentId]={package.LcsEnvironmentId}&package[FileAssetDisplayVersion]={package.FileAssetDisplayVersion}&package[PlatformVersion]={package.PlatformVersion}&package[AppVersion]={package.AppVersion}&package[EstimatedDuration]={package.EstimatedDuration}&platformReleaseName={platformVersion}";
using (_stringContent = new StringContent(parameters, Encoding.UTF8, "application/x-www-form-urlencoded"))
{
SetRequestVerificationToken($"{LcsUrl}/V2");
@ -718,7 +718,7 @@ namespace LCS
internal Response ValidateSandboxServicing(DeployablePackage package)
{
var parameters = $"package[PackageId]={package.PackageId}&package[Name]={package.Name}&package[Description]={package.Description}&package[packageType]={package.PackageType}&package[ModifiedDate]={package.ModifiedDate}&package[ModifiedBy]={package.ModifiedBy}&package[Publisher]={package.Publisher}&package[LcsEnvironmentActionId]={package.LcsEnvironmentActionId}&package[LcsEnvironmentId]={package.LcsEnvironmentId}&package[FileAssetDisplayVersion]={package.FileAssetDisplayVersion}&package[PlatformVersion]={package.PlatformVersion}&package[AppVersion]={package.AppVersion}";
var parameters = $"package[PackageId]={package.PackageId}&package[Name]={package.Name}&package[Description]={package.Description}&package[packageType]={package.PackageType}&package[ModifiedDate]={package.ModifiedDate}&package[ModifiedBy]={package.ModifiedBy}&package[Publisher]={package.Publisher}&package[Scope]={package.Scope}&package[LcsEnvironmentActionId]={package.LcsEnvironmentActionId}&package[LcsEnvironmentId]={package.LcsEnvironmentId}&package[FileAssetDisplayVersion]={package.FileAssetDisplayVersion}&package[PlatformVersion]={package.PlatformVersion}&package[AppVersion]={package.AppVersion}&package[EstimatedDuration]={package.EstimatedDuration}";
using (_stringContent = new StringContent(parameters, Encoding.UTF8, "application/x-www-form-urlencoded"))
{
SetRequestVerificationToken($"{LcsUrl}/V2");

Просмотреть файл

@ -50,6 +50,8 @@ namespace LCS.JsonObjects
public bool CanShowLoginButton { get; set; }
public bool CanShowNavigationLinks { get; set; }
public bool CanShowRdp { get; set; }
public bool CanShowSqlEnableAccess { get; set; }
public bool CanShowStagingEnvironmentId { get; set; }
public bool CanShowTrialLink { get; set; }
public bool CanStart { get; set; }
public bool CanStop { get; set; }
@ -73,14 +75,16 @@ namespace LCS.JsonObjects
public string DeploymentId { get; set; }
public DeploymentState DeploymentState { get; set; }
public string DeploymentStatus { get; set; }
public object DevOpsDetails { get; set; }
public string DevTestEnvironmentType { get; set; }
public string DisasterRecoveryLocation { get; set; }
public string DisasterRecoveryLocationLabel { get; set; }
public string DisplayName { get; set; }
public string EnvironmentAdmin { get; set; }
public object EnvironmentCDSDetails { get; set; }
public EnvironmentCDSDetails EnvironmentCDSDetails { get; set; }
public string EnvironmentId { get; set; }
public string EnvironmentName { get; set; }
public EnvironmentNotifications EnvironmentNotifications { get; set; }
public object Errors { get; set; }
public bool HasStagingEnvironment { get; set; }
public string InstanceId { get; set; }
@ -100,6 +104,8 @@ namespace LCS.JsonObjects
public bool IsPinToD365Visible { get; set; }
public bool IsPreparationFailed { get; set; }
public bool IsPublishedToD365 { get; set; }
public bool IsSandboxUpgradeEnvironment { get; set; }
public bool IsServicingEstimationEnabled { get; set; }
public bool IsStagingDeploymentFailed { get; set; }
public bool IsStagingDeploymentSucceeded { get; set; }
public bool IsUpgradeSelfServeCancelledOrCompleted { get; set; }
@ -129,7 +135,7 @@ namespace LCS.JsonObjects
public bool ShowSslCertRotateWarning { get; set; }
public bool ShowUpgradeEnvironmentDetails { get; set; }
public Credentials[] SqlAzureCredentials { get; set; }
public string StagingActivityId { get; set; }
public System.Guid StagingActivityId { get; set; }
public string StagingDeployedBy { get; set; }
public string StagingDeployedOn { get; set; }//Todo
public string StagingEnvironmentAdministrator { get; set; }
@ -155,8 +161,11 @@ namespace LCS.JsonObjects
public string DeploymentItemName { get; set; }
public string InstanceName { get; set; }
public bool IsCredentialKeyVaultUri { get; set; }
public bool IsPasswordExpired { get; set; }
public string Password { get; set; }
public string PasswordExpiryTime { get; set; }
public object ReasonForAccess { get; set; }
public object ReasonForAccessDetails { get; set; }
public string SymbolicName { get; set; }
public string UserName { get; set; }
}
@ -171,6 +180,7 @@ namespace LCS.JsonObjects
{
public string AppVersion { get; set; }
public string Description { get; set; }
public string EstimatedDuration { get; set; }
public int FileAssetDisplayVersion { get; set; }
public int LcsEnvironmentActionId { get; set; }
public string LcsEnvironmentId { get; set; }
@ -181,6 +191,7 @@ namespace LCS.JsonObjects
public string PackageType { get; set; }
public string PlatformVersion { get; set; }
public string Publisher { get; set; }
public string Scope { get; set; }
}
public class DynamicPaging
@ -273,18 +284,18 @@ namespace LCS.JsonObjects
{
public string CreatedByUserName { get; set; }
public string Description { get; set; }
public bool Favorite { get; set; }
public int Id { get; set; }
public string Name { get; set; }
public string OrganizationName { get; set; }
public int ProductId { get; set; }
public int ProductVersionId { get; set; }
public LCS.Product ProductId { get; set; }
public ProductVersionId ProductVersionId { get; set; }
public ProjectType ProjectTypeId { get; set; }
public string RequestEmailInvited { get; set; }
public bool RequestPending { get; set; }
public bool RequestSentToAlternativeEmail { get; set; }
public SolutionRequestStatus SolutionRequestStatus { get; set; }
public bool Favorite { get; set; }
public string SharepointSite { get; set; }
public int SolutionRequestStatus { get; set; }
public string TfsProjectName { get; set; }
public string TfsServerSite { get; set; }
}
@ -331,9 +342,9 @@ namespace LCS.JsonObjects
public class Product
{
public int ProductId { get; set; }
public LCS.Product ProductId { get; set; }
public string ProductName { get; set; }
public int ProductVersion { get; set; }
public ProductVersionId ProductVersion { get; set; }
public string ProductVersionName { get; set; }
}
@ -345,7 +356,7 @@ namespace LCS.JsonObjects
public int CurrentPhaseId { get; set; }
public string Description { get; set; }
public int Id { get; set; }
public int IndustryId { get; set; }
public Industry IndustryId { get; set; }
public string IndustryName { get; set; }
public int MethodologyId { get; set; }
public object MethodologyName { get; set; }
@ -379,7 +390,7 @@ namespace LCS.JsonObjects
public bool IsOnPremTfsEnabled { get; set; }
public IssueStorage IssueStorageType { get; set; }
public string SharepointSite { get; set; }
public string TfsProjectId { get; set; }
public System.Guid TfsProjectId { get; set; }
public string TfsProjectName { get; set; }
public string TfsServerSite { get; set; }
}
@ -436,6 +447,7 @@ namespace LCS.JsonObjects
public class Response
{
public object ActivityId { get; set; }
public object Data { get; set; }
public int ErrorCode { get; set; }
public object ErrorList { get; set; }
@ -585,6 +597,7 @@ namespace LCS.JsonObjects
public int ActionTypeId { get; set; }
public string CompletionDate { get; set; }
public int Id { get; set; }
public bool IsPostServicing { get; set; }
public string Name { get; set; }
public string PackageAssetId { get; set; }
public string PackageType { get; set; }
@ -608,4 +621,23 @@ namespace LCS.JsonObjects
public string ApplicationRelease { get; set; }
}
public class EnvironmentCDSDetails
{
public string AdditionalInfoMessage { get; set; }
public object AdditionalResourceLinks { get; set; }
public bool AllowCDSResume { get; set; }
public bool AllowNewCDSConfiguration { get; set; }
public string CDSInstanceName { get; set; }
public object CurrentConfigurationState { get; set; }
public object DisplayErrorMessage { get; set; }
public bool IsCDSInstanceConfigured { get; set; }
public bool ShowProvisioningResumedMessage { get; set; }
public bool ShowProvisioningTriggeredMessage { get; set; }
}
public class EnvironmentNotifications
{
public object EnvironmentNotificationDetails { get; set; }
public bool ShowEnvironmentNotifications { get; set; }
}
}