microsoft
/
2LCS
зеркало из https://github.com/microsoft/2LCS.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

small fixes

This commit is contained in:
Tomek Melissa 2019-12-10 01:51:52 +01:00
Родитель cb2da7f15f
Коммит c661214e77
5 изменённых файлов: 26 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
2LCS/2LCS.csproj
Просмотреть файл

@ -65,7 +65,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="CsvHelper, Version=12.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
<HintPath>..\packages\CsvHelper.12.2.1\lib\net47\CsvHelper.dll</HintPath>
<HintPath>..\packages\CsvHelper.12.2.2\lib\net47\CsvHelper.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.11.17.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlAgilityPack.1.11.17\lib\Net45\HtmlAgilityPack.dll</HintPath>

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

@ -766,7 +766,7 @@
this.exportUpdateScheduleForAllProjectsToolStripMenuItem.Name = "exportUpdateScheduleForAllProjectsToolStripMenuItem";
this.exportUpdateScheduleForAllProjectsToolStripMenuItem.Size = new System.Drawing.Size(487, 40);
this.exportUpdateScheduleForAllProjectsToolStripMenuItem.Text = "Export update schedule for all projects";
this.exportUpdateScheduleForAllProjectsToolStripMenuItem.Click += new System.EventHandler(this.exportUpdateScheduleForAllProjectsToolStripMenuItem_Click);
this.exportUpdateScheduleForAllProjectsToolStripMenuItem.Click += new System.EventHandler(this.ExportUpdateScheduleForAllProjectsToolStripMenuItem_Click);
//
// logoutToolStripMenuItem
//
@ -1177,7 +1177,7 @@
this.saasUpcomingUpdatesToolStripMenuItem.Name = "saasUpcomingUpdatesToolStripMenuItem";
this.saasUpcomingUpdatesToolStripMenuItem.Size = new System.Drawing.Size(310, 36);
this.saasUpcomingUpdatesToolStripMenuItem.Text = "Upcoming updates";
this.saasUpcomingUpdatesToolStripMenuItem.Click += new System.EventHandler(this.saasUpcomingUpdatesToolStripMenuItem_Click);
this.saasUpcomingUpdatesToolStripMenuItem.Click += new System.EventHandler(this.SaasUpcomingUpdatesToolStripMenuItem_Click);
//
// saasDetailedBuildInfoToolStripMenuItem
//

18
2LCS/Forms/MainForm.cs
Просмотреть файл

@ -707,7 +707,7 @@ namespace LCS.Forms
var exportedInstances = new List<ExportedInstance>();
Projects = _httpClientHelper.GetAllProjects();
Projects = excludeProjectsForOrganisation(Projects); //remove all internal projects for export.
Projects = ExcludeProjectsForOrganization(Projects); //remove all internal projects for export.
foreach (var _project in Projects)
{
@ -2060,7 +2060,7 @@ namespace LCS.Forms
Cursor = Cursors.Default;
}
private void saasUpcomingUpdatesToolStripMenuItem_Click(object sender, EventArgs e)
private void SaasUpcomingUpdatesToolStripMenuItem_Click(object sender, EventArgs e)
{
Cursor = Cursors.WaitCursor;
@ -2068,18 +2068,18 @@ namespace LCS.Forms
if (calendar == null || calendar.Count == 0)
{
Cursor = Cursors.Default;
MessageBox.Show($"Request to get upcoming updates calendar failed. You are using learning project or you do not have access to that information.");
MessageBox.Show($"Request to get upcoming service updates calendar failed. You are using learning project or you do not have access to that information.");
return;
}
using var form = new UpcomingUpdates();
form.Calendar = calendar;
form.Text = $"Upcoming updates for {_selectedProject.Name} project.";
form.Text = $"Upcoming service updates for {_selectedProject.Name} project.";
form.ShowDialog();
Cursor = Cursors.Default;
}
private List<LcsProject> excludeProjectsForOrganisation(List<LcsProject> _projects)
private List<LcsProject> ExcludeProjectsForOrganization(List<LcsProject> _projects)
{
string exclOrg = Properties.Settings.Default.projOrgExcl;
if (string.IsNullOrEmpty(exclOrg))
@ -2100,10 +2100,10 @@ namespace LCS.Forms
}
}
private void exportUpdateScheduleForAllProjectsToolStripMenuItem_Click(object sender, EventArgs e)
private void ExportUpdateScheduleForAllProjectsToolStripMenuItem_Click(object sender, EventArgs e)
{
notifyIcon.BalloonTipText = $"Exporting updates for all LCS projects. Please wait...";
notifyIcon.BalloonTipTitle = "Exporting updates list";
notifyIcon.BalloonTipText = $"Exporting updates schedule for all LCS projects. Please wait...";
notifyIcon.BalloonTipTitle = "Exporting updates schedule list";
notifyIcon.ShowBalloonTip(2000); //This setting might be overruled by the OS
@ -2112,7 +2112,7 @@ namespace LCS.Forms
var exportedUpdates = new List<Datum>();
Projects = _httpClientHelper.GetAllProjects();
Projects = excludeProjectsForOrganisation(Projects); //remove all internal projects for export.
Projects = ExcludeProjectsForOrganization(Projects); //remove all internal projects for export.
foreach (var _project in Projects)
{

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

@ -43,17 +43,17 @@
//
this.AutoRefreshCheckBox.AutoSize = true;
this.AutoRefreshCheckBox.Location = new System.Drawing.Point(7, 29);
this.AutoRefreshCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AutoRefreshCheckBox.Margin = new System.Windows.Forms.Padding(4);
this.AutoRefreshCheckBox.Name = "AutoRefreshCheckBox";
this.AutoRefreshCheckBox.Size = new System.Drawing.Size(146, 29);
this.AutoRefreshCheckBox.Size = new System.Drawing.Size(474, 29);
this.AutoRefreshCheckBox.TabIndex = 0;
this.AutoRefreshCheckBox.Text = "Auto-refresh";
this.AutoRefreshCheckBox.Text = "Auto-refresh list of instances after switching project";
this.AutoRefreshCheckBox.UseVisualStyleBackColor = true;
//
// closeButton
//
this.closeButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.closeButton.Location = new System.Drawing.Point(431, 224);
this.closeButton.Location = new System.Drawing.Point(424, 224);
this.closeButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.closeButton.Name = "closeButton";
this.closeButton.Size = new System.Drawing.Size(223, 39);
@ -68,25 +68,24 @@
this.groupBoxExportConfig.Controls.Add(this.textBoxProjectExcl);
this.groupBoxExportConfig.Location = new System.Drawing.Point(16, 110);
this.groupBoxExportConfig.Name = "groupBoxExportConfig";
this.groupBoxExportConfig.Size = new System.Drawing.Size(637, 85);
this.groupBoxExportConfig.Size = new System.Drawing.Size(637, 108);
this.groupBoxExportConfig.TabIndex = 5;
this.groupBoxExportConfig.TabStop = false;
this.groupBoxExportConfig.Text = "Export instances/updates";
//
// labelOrgNameExcl
//
this.labelOrgNameExcl.AutoSize = true;
this.labelOrgNameExcl.Location = new System.Drawing.Point(6, 38);
this.labelOrgNameExcl.Location = new System.Drawing.Point(6, 36);
this.labelOrgNameExcl.Name = "labelOrgNameExcl";
this.labelOrgNameExcl.Size = new System.Drawing.Size(293, 25);
this.labelOrgNameExcl.Size = new System.Drawing.Size(332, 52);
this.labelOrgNameExcl.TabIndex = 1;
this.labelOrgNameExcl.Text = "Exclude projects for organisation";
this.labelOrgNameExcl.Text = "Exclude projects for all organizations containing the following string\r\n\r\n";
//
// textBoxProjectExcl
//
this.textBoxProjectExcl.Location = new System.Drawing.Point(318, 38);
this.textBoxProjectExcl.Location = new System.Drawing.Point(344, 59);
this.textBoxProjectExcl.Name = "textBoxProjectExcl";
this.textBoxProjectExcl.Size = new System.Drawing.Size(307, 29);
this.textBoxProjectExcl.Size = new System.Drawing.Size(287, 29);
this.textBoxProjectExcl.TabIndex = 0;
//
// groupBoxUIConfig
@ -103,12 +102,12 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(667, 275);
this.ClientSize = new System.Drawing.Size(669, 275);
this.Controls.Add(this.groupBoxUIConfig);
this.Controls.Add(this.groupBoxExportConfig);
this.Controls.Add(this.closeButton);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Margin = new System.Windows.Forms.Padding(4);
this.MinimizeBox = false;
this.Name = "Parameters";
this.ShowInTaskbar = false;

4
2LCS/packages.config
Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CsvHelper" version="12.2.1" targetFramework="net472" />
<package id="CsvHelper" version="12.2.2" targetFramework="net472" />
<package id="DocX" version="1.5.0" targetFramework="net472" />
<package id="HtmlAgilityPack" version="1.11.17" targetFramework="net472" />
<package id="Microsoft.CSharp" version="4.6.0" targetFramework="net472" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />