зеркало из https://github.com/microsoft/2LCS.git
fixed latest pull request merge issues
Replaced System.Text.Json with Newtonsoft.Json
This commit is contained in:
Родитель
81c50be552
Коммит
7bf1b728fe
|
@ -64,11 +64,11 @@
|
|||
<StartupObject>LCS.Program</StartupObject>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CsvHelper, Version=12.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CsvHelper.12.2.3\lib\net47\CsvHelper.dll</HintPath>
|
||||
<Reference Include="CsvHelper, Version=15.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CsvHelper.15.0.1\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>
|
||||
<Reference Include="HtmlAgilityPack, Version=1.11.22.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\HtmlAgilityPack.1.11.22\lib\Net45\HtmlAgilityPack.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
|
||||
|
@ -77,35 +77,17 @@
|
|||
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Linq.Dynamic, Version=1.0.6132.35681, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Linq.Dynamic.1.0.7\lib\net40\System.Linq.Dynamic.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Caching" />
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Text.Encodings.Web, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Encodings.Web.4.7.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Text.Json, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Json.4.7.1\lib\net461\System.Text.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
|
||||
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xaml" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
|
@ -117,11 +99,11 @@
|
|||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Xceed.Document.NET, Version=1.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\DocX.1.5.0\lib\net40\Xceed.Document.NET.dll</HintPath>
|
||||
<Reference Include="Xceed.Document.NET, Version=1.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\DocX.1.6.0\lib\net40\Xceed.Document.NET.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xceed.Words.NET, Version=1.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\DocX.1.5.0\lib\net40\Xceed.Words.NET.dll</HintPath>
|
||||
<Reference Include="Xceed.Words.NET, Version=1.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\DocX.1.6.0\lib\net40\Xceed.Words.NET.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
@ -280,6 +262,7 @@
|
|||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\Parameters.resx">
|
||||
<DependentUpon>Parameters.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\PowerShell.resx">
|
||||
<DependentUpon>PowerShell.cs</DependentUpon>
|
||||
|
|
|
@ -38,6 +38,8 @@
|
|||
<value />
|
||||
</setting>
|
||||
<setting name="keepCache" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="minimizeToNotificationArea" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
|
@ -61,6 +63,10 @@
|
|||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
|
|
|
@ -4,7 +4,7 @@ using System.Collections.Generic;
|
|||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.Caching;
|
||||
using System.Text.Json;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace LCS.Cache
|
||||
{
|
||||
|
@ -56,7 +56,7 @@ namespace LCS.Cache
|
|||
{
|
||||
using(var writer = new StreamWriter(tempFile))
|
||||
{
|
||||
writer.Write(JsonSerializer.Serialize(EnvironmentCredentialCache, EnvironmentCredentialCache.GetType()));
|
||||
writer.Write(JsonConvert.SerializeObject(EnvironmentCredentialCache));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -79,7 +79,7 @@ namespace LCS.Cache
|
|||
{
|
||||
var cache = reader.ReadToEnd();
|
||||
|
||||
store = JsonSerializer.Deserialize<CredentialsStore>(cache);
|
||||
store = JsonConvert.DeserializeObject<CredentialsStore>(cache);
|
||||
|
||||
store.RebuildMemCache();
|
||||
}
|
||||
|
|
|
@ -1409,7 +1409,7 @@
|
|||
this.notifyIconMenuClose.Index = 0;
|
||||
this.notifyIconMenuClose.Name = "notifyIconMenuClose";
|
||||
this.notifyIconMenuClose.Text = "Close 2LCS";
|
||||
this.notifyIconMenuClose.Click += new System.EventHandler(this.notifyIconMenuClose_Click);
|
||||
this.notifyIconMenuClose.Click += new System.EventHandler(this.NotifyIconMenuClose_Click);
|
||||
//
|
||||
// cheEnvironmentChangesToolStripMenuItem
|
||||
//
|
||||
|
|
|
@ -19,6 +19,7 @@ using System.Windows.Forms;
|
|||
using Xceed.Document.NET;
|
||||
using Xceed.Words.NET;
|
||||
using static LCS.NativeMethods;
|
||||
using System.Globalization;
|
||||
|
||||
namespace LCS.Forms
|
||||
{
|
||||
|
@ -51,6 +52,26 @@ namespace LCS.Forms
|
|||
public int top;
|
||||
public int right;
|
||||
public int bottom;
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public static bool operator ==(RECT left, RECT right)
|
||||
{
|
||||
return left.Equals(right);
|
||||
}
|
||||
|
||||
public static bool operator !=(RECT left, RECT right)
|
||||
{
|
||||
return !(left == right);
|
||||
}
|
||||
}
|
||||
|
||||
public MainForm()
|
||||
|
@ -67,8 +88,10 @@ namespace LCS.Forms
|
|||
Button button_Cancel = new Button() { Text = "Cancel", Location = new Point(140, 30) };
|
||||
button_OK.DialogResult = DialogResult.OK;
|
||||
button_Cancel.DialogResult = DialogResult.Cancel;
|
||||
FlowLayoutPanel panel = new FlowLayoutPanel();
|
||||
panel.Dock = DockStyle.Fill;
|
||||
FlowLayoutPanel panel = new FlowLayoutPanel
|
||||
{
|
||||
Dock = DockStyle.Fill
|
||||
};
|
||||
|
||||
form.Text = "Choose user";
|
||||
form.ClientSize = new Size(280, 60);
|
||||
|
@ -350,7 +373,7 @@ namespace LCS.Forms
|
|||
<UserName>{rdpEntry.Domain}\{rdpEntry.Username}</UserName>
|
||||
</RDP>
|
||||
<ConnectionType>RDPConfigured</ConnectionType>
|
||||
<ID>{Guid.NewGuid().ToString()}</ID>
|
||||
<ID>{Guid.NewGuid()}</ID>
|
||||
<Name>{instance.InstanceId}-{rdpEntry.Machine}</Name>
|
||||
<OpenEmbedded>true</OpenEmbedded>
|
||||
<Url>{rdpEntry.Address}:{rdpEntry.Port}</Url>
|
||||
|
@ -781,7 +804,7 @@ namespace LCS.Forms
|
|||
try
|
||||
{
|
||||
using StreamWriter sw = new StreamWriter(savefile.FileName, false, Encoding.Unicode);
|
||||
var csv = new CsvWriter(sw);
|
||||
var csv = new CsvWriter(sw, CultureInfo.CurrentCulture);
|
||||
csv.WriteRecords(exportedInstances);
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -1278,7 +1301,7 @@ namespace LCS.Forms
|
|||
Cursor = Cursors.Default;
|
||||
}
|
||||
|
||||
private void notifyIconMenuClose_Click(object sender, EventArgs e)
|
||||
private void NotifyIconMenuClose_Click(object sender, EventArgs e)
|
||||
{
|
||||
closeFromNotificationArea = true;
|
||||
this.Close();
|
||||
|
@ -1684,9 +1707,11 @@ namespace LCS.Forms
|
|||
if (nsgRule == null)
|
||||
{
|
||||
var networkSecurityGroup = _httpClientHelper.GetNetworkSecurityGroup(instance);
|
||||
using var form = new ChooseNSG();
|
||||
form.NetworkSecurityGroup = networkSecurityGroup;
|
||||
form.Text = $"Choose firewall rule to delete";
|
||||
using var form = new ChooseNSG
|
||||
{
|
||||
NetworkSecurityGroup = networkSecurityGroup,
|
||||
Text = $"Choose firewall rule to delete"
|
||||
};
|
||||
form.ShowDialog();
|
||||
if (!form.Cancelled && (form.NSGRule != null))
|
||||
{
|
||||
|
@ -1830,7 +1855,7 @@ namespace LCS.Forms
|
|||
<UserName>{rdpEntry.Domain}\{rdpEntry.Username}</UserName>
|
||||
</RDP>
|
||||
<ConnectionType>RDPConfigured</ConnectionType>
|
||||
<ID>{Guid.NewGuid().ToString()}</ID>
|
||||
<ID>{Guid.NewGuid()}</ID>
|
||||
<Name>{saasInstance.InstanceId}-{rdpEntry.Machine}</Name>
|
||||
<OpenEmbedded>true</OpenEmbedded>
|
||||
<Url>{rdpEntry.Address}:{rdpEntry.Port}</Url>
|
||||
|
@ -2189,7 +2214,7 @@ namespace LCS.Forms
|
|||
try
|
||||
{
|
||||
using StreamWriter sw = new StreamWriter(savefile.FileName, false, Encoding.Unicode);
|
||||
var csv = new CsvWriter(sw);
|
||||
var csv = new CsvWriter(sw, CultureInfo.CurrentCulture);
|
||||
csv.WriteRecords(exportedUpdates);
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
|
@ -34,23 +34,23 @@
|
|||
this.labelOrgNameExcl = new System.Windows.Forms.Label();
|
||||
this.textBoxProjectExcl = new System.Windows.Forms.TextBox();
|
||||
this.groupBoxUIConfig = new System.Windows.Forms.GroupBox();
|
||||
this.groupBox1 = new System.Windows.Forms.GroupBox();
|
||||
this.minimizeToNotificationArea = new System.Windows.Forms.CheckBox();
|
||||
this.groupBoxCaching = new System.Windows.Forms.GroupBox();
|
||||
this.ClearCacheButton = new System.Windows.Forms.Button();
|
||||
this.StoreCacheCheckBox = new System.Windows.Forms.CheckBox();
|
||||
this.CachingEnabledCheckbox = new System.Windows.Forms.CheckBox();
|
||||
this.minimizeToNotificationArea = new System.Windows.Forms.CheckBox();
|
||||
this.groupBoxExportConfig.SuspendLayout();
|
||||
this.groupBoxUIConfig.SuspendLayout();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.groupBoxCaching.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// AutoRefreshCheckBox
|
||||
//
|
||||
this.AutoRefreshCheckBox.AutoSize = true;
|
||||
this.AutoRefreshCheckBox.Location = new System.Drawing.Point(4, 16);
|
||||
this.AutoRefreshCheckBox.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.AutoRefreshCheckBox.Location = new System.Drawing.Point(11, 30);
|
||||
this.AutoRefreshCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.AutoRefreshCheckBox.Name = "AutoRefreshCheckBox";
|
||||
this.AutoRefreshCheckBox.Size = new System.Drawing.Size(264, 17);
|
||||
this.AutoRefreshCheckBox.Size = new System.Drawing.Size(474, 29);
|
||||
this.AutoRefreshCheckBox.TabIndex = 0;
|
||||
this.AutoRefreshCheckBox.Text = "Auto-refresh list of instances after switching project";
|
||||
this.AutoRefreshCheckBox.UseVisualStyleBackColor = true;
|
||||
|
@ -58,10 +58,10 @@
|
|||
// closeButton
|
||||
//
|
||||
this.closeButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
|
||||
this.closeButton.Location = new System.Drawing.Point(231, 188);
|
||||
this.closeButton.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.closeButton.Location = new System.Drawing.Point(429, 402);
|
||||
this.closeButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.closeButton.Name = "closeButton";
|
||||
this.closeButton.Size = new System.Drawing.Size(122, 21);
|
||||
this.closeButton.Size = new System.Drawing.Size(224, 39);
|
||||
this.closeButton.TabIndex = 4;
|
||||
this.closeButton.Text = "Close";
|
||||
this.closeButton.UseVisualStyleBackColor = true;
|
||||
|
@ -71,64 +71,76 @@
|
|||
//
|
||||
this.groupBoxExportConfig.Controls.Add(this.labelOrgNameExcl);
|
||||
this.groupBoxExportConfig.Controls.Add(this.textBoxProjectExcl);
|
||||
this.groupBoxExportConfig.Location = new System.Drawing.Point(9, 118);
|
||||
this.groupBoxExportConfig.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupBoxExportConfig.Location = new System.Drawing.Point(17, 268);
|
||||
this.groupBoxExportConfig.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBoxExportConfig.Name = "groupBoxExportConfig";
|
||||
this.groupBoxExportConfig.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.groupBoxExportConfig.Size = new System.Drawing.Size(347, 59);
|
||||
this.groupBoxExportConfig.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBoxExportConfig.Size = new System.Drawing.Size(636, 109);
|
||||
this.groupBoxExportConfig.TabIndex = 5;
|
||||
this.groupBoxExportConfig.TabStop = false;
|
||||
this.groupBoxExportConfig.Text = "Export instances/updates";
|
||||
//
|
||||
// labelOrgNameExcl
|
||||
//
|
||||
this.labelOrgNameExcl.Location = new System.Drawing.Point(3, 20);
|
||||
this.labelOrgNameExcl.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
||||
this.labelOrgNameExcl.Location = new System.Drawing.Point(6, 37);
|
||||
this.labelOrgNameExcl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.labelOrgNameExcl.Name = "labelOrgNameExcl";
|
||||
this.labelOrgNameExcl.Size = new System.Drawing.Size(181, 28);
|
||||
this.labelOrgNameExcl.Size = new System.Drawing.Size(332, 52);
|
||||
this.labelOrgNameExcl.TabIndex = 1;
|
||||
this.labelOrgNameExcl.Text = "Exclude projects for all organizations containing the following string\r\n\r\n";
|
||||
//
|
||||
// textBoxProjectExcl
|
||||
//
|
||||
this.textBoxProjectExcl.Location = new System.Drawing.Point(188, 32);
|
||||
this.textBoxProjectExcl.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.textBoxProjectExcl.Location = new System.Drawing.Point(345, 59);
|
||||
this.textBoxProjectExcl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.textBoxProjectExcl.Name = "textBoxProjectExcl";
|
||||
this.textBoxProjectExcl.Size = new System.Drawing.Size(158, 20);
|
||||
this.textBoxProjectExcl.Size = new System.Drawing.Size(286, 29);
|
||||
this.textBoxProjectExcl.TabIndex = 0;
|
||||
//
|
||||
// groupBoxUIConfig
|
||||
//
|
||||
this.groupBoxUIConfig.Controls.Add(this.minimizeToNotificationArea);
|
||||
this.groupBoxUIConfig.Controls.Add(this.AutoRefreshCheckBox);
|
||||
this.groupBoxUIConfig.Location = new System.Drawing.Point(9, 7);
|
||||
this.groupBoxUIConfig.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupBoxUIConfig.Location = new System.Drawing.Point(17, 13);
|
||||
this.groupBoxUIConfig.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBoxUIConfig.Name = "groupBoxUIConfig";
|
||||
this.groupBoxUIConfig.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.groupBoxUIConfig.Size = new System.Drawing.Size(347, 39);
|
||||
this.groupBoxUIConfig.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBoxUIConfig.Size = new System.Drawing.Size(636, 121);
|
||||
this.groupBoxUIConfig.TabIndex = 6;
|
||||
this.groupBoxUIConfig.TabStop = false;
|
||||
this.groupBoxUIConfig.Text = "UI";
|
||||
//
|
||||
// groupBox1
|
||||
// minimizeToNotificationArea
|
||||
//
|
||||
this.groupBox1.Controls.Add(this.ClearCacheButton);
|
||||
this.groupBox1.Controls.Add(this.StoreCacheCheckBox);
|
||||
this.groupBox1.Controls.Add(this.CachingEnabledCheckbox);
|
||||
this.groupBox1.Location = new System.Drawing.Point(9, 50);
|
||||
this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox1.Name = "groupBox1";
|
||||
this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox1.Size = new System.Drawing.Size(347, 64);
|
||||
this.groupBox1.TabIndex = 7;
|
||||
this.groupBox1.TabStop = false;
|
||||
this.groupBox1.Text = "Caching";
|
||||
this.minimizeToNotificationArea.AutoSize = true;
|
||||
this.minimizeToNotificationArea.Location = new System.Drawing.Point(10, 69);
|
||||
this.minimizeToNotificationArea.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
|
||||
this.minimizeToNotificationArea.Name = "minimizeToNotificationArea";
|
||||
this.minimizeToNotificationArea.Size = new System.Drawing.Size(459, 29);
|
||||
this.minimizeToNotificationArea.TabIndex = 2;
|
||||
this.minimizeToNotificationArea.Text = "Closing the window minimizes to notification area";
|
||||
this.minimizeToNotificationArea.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// groupBoxCaching
|
||||
//
|
||||
this.groupBoxCaching.Controls.Add(this.ClearCacheButton);
|
||||
this.groupBoxCaching.Controls.Add(this.StoreCacheCheckBox);
|
||||
this.groupBoxCaching.Controls.Add(this.CachingEnabledCheckbox);
|
||||
this.groupBoxCaching.Location = new System.Drawing.Point(17, 142);
|
||||
this.groupBoxCaching.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBoxCaching.Name = "groupBoxCaching";
|
||||
this.groupBoxCaching.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBoxCaching.Size = new System.Drawing.Size(636, 118);
|
||||
this.groupBoxCaching.TabIndex = 7;
|
||||
this.groupBoxCaching.TabStop = false;
|
||||
this.groupBoxCaching.Text = "Caching";
|
||||
//
|
||||
// ClearCacheButton
|
||||
//
|
||||
this.ClearCacheButton.Location = new System.Drawing.Point(236, 36);
|
||||
this.ClearCacheButton.Location = new System.Drawing.Point(432, 60);
|
||||
this.ClearCacheButton.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
|
||||
this.ClearCacheButton.Name = "ClearCacheButton";
|
||||
this.ClearCacheButton.Size = new System.Drawing.Size(106, 23);
|
||||
this.ClearCacheButton.Size = new System.Drawing.Size(194, 42);
|
||||
this.ClearCacheButton.TabIndex = 2;
|
||||
this.ClearCacheButton.Text = "Clear cache";
|
||||
this.ClearCacheButton.UseVisualStyleBackColor = true;
|
||||
|
@ -137,10 +149,10 @@
|
|||
// StoreCacheCheckBox
|
||||
//
|
||||
this.StoreCacheCheckBox.AutoSize = true;
|
||||
this.StoreCacheCheckBox.Location = new System.Drawing.Point(4, 37);
|
||||
this.StoreCacheCheckBox.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.StoreCacheCheckBox.Location = new System.Drawing.Point(7, 68);
|
||||
this.StoreCacheCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.StoreCacheCheckBox.Name = "StoreCacheCheckBox";
|
||||
this.StoreCacheCheckBox.Size = new System.Drawing.Size(212, 17);
|
||||
this.StoreCacheCheckBox.Size = new System.Drawing.Size(375, 29);
|
||||
this.StoreCacheCheckBox.TabIndex = 1;
|
||||
this.StoreCacheCheckBox.Text = "Save cache on exit and load on startup";
|
||||
this.StoreCacheCheckBox.UseVisualStyleBackColor = true;
|
||||
|
@ -148,10 +160,10 @@
|
|||
// CachingEnabledCheckbox
|
||||
//
|
||||
this.CachingEnabledCheckbox.AutoSize = true;
|
||||
this.CachingEnabledCheckbox.Location = new System.Drawing.Point(4, 16);
|
||||
this.CachingEnabledCheckbox.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.CachingEnabledCheckbox.Location = new System.Drawing.Point(7, 30);
|
||||
this.CachingEnabledCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.CachingEnabledCheckbox.Name = "CachingEnabledCheckbox";
|
||||
this.CachingEnabledCheckbox.Size = new System.Drawing.Size(110, 17);
|
||||
this.CachingEnabledCheckbox.Size = new System.Drawing.Size(199, 29);
|
||||
this.CachingEnabledCheckbox.TabIndex = 0;
|
||||
this.CachingEnabledCheckbox.Text = "Enabled (memory)";
|
||||
this.CachingEnabledCheckbox.UseVisualStyleBackColor = true;
|
||||
|
@ -159,30 +171,15 @@
|
|||
//
|
||||
// Parameters
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(365, 216);
|
||||
this.Controls.Add(this.groupBox1);
|
||||
// minimizeToNotificationArea
|
||||
//
|
||||
this.minimizeToNotificationArea.AutoSize = true;
|
||||
this.minimizeToNotificationArea.Location = new System.Drawing.Point(5, 46);
|
||||
this.minimizeToNotificationArea.Name = "minimizeToNotificationArea";
|
||||
this.minimizeToNotificationArea.Size = new System.Drawing.Size(335, 21);
|
||||
this.minimizeToNotificationArea.TabIndex = 2;
|
||||
this.minimizeToNotificationArea.Text = "Closing the window minimizes to notification area";
|
||||
this.minimizeToNotificationArea.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// Parameters
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(487, 206);
|
||||
this.ClientSize = new System.Drawing.Size(714, 463);
|
||||
this.Controls.Add(this.groupBoxUIConfig);
|
||||
this.Controls.Add(this.groupBoxCaching);
|
||||
this.Controls.Add(this.groupBoxExportConfig);
|
||||
this.Controls.Add(this.closeButton);
|
||||
this.Icon = global::LCS.Properties.Resources.favicon_blue;
|
||||
this.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "Parameters";
|
||||
|
@ -195,8 +192,8 @@
|
|||
this.groupBoxExportConfig.PerformLayout();
|
||||
this.groupBoxUIConfig.ResumeLayout(false);
|
||||
this.groupBoxUIConfig.PerformLayout();
|
||||
this.groupBox1.ResumeLayout(false);
|
||||
this.groupBox1.PerformLayout();
|
||||
this.groupBoxCaching.ResumeLayout(false);
|
||||
this.groupBoxCaching.PerformLayout();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
@ -214,7 +211,7 @@
|
|||
private System.Windows.Forms.Label labelOrgNameExcl;
|
||||
private System.Windows.Forms.TextBox textBoxProjectExcl;
|
||||
private System.Windows.Forms.GroupBox groupBoxUIConfig;
|
||||
private System.Windows.Forms.GroupBox groupBox1;
|
||||
private System.Windows.Forms.GroupBox groupBoxCaching;
|
||||
private System.Windows.Forms.CheckBox StoreCacheCheckBox;
|
||||
private System.Windows.Forms.CheckBox CachingEnabledCheckbox;
|
||||
private System.Windows.Forms.Button ClearCacheButton;
|
||||
|
|
|
@ -23,7 +23,7 @@ namespace LCS.Forms
|
|||
|
||||
private void OkButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
setParameters();
|
||||
SetParameters();
|
||||
Close();
|
||||
}
|
||||
|
||||
|
@ -42,7 +42,7 @@ namespace LCS.Forms
|
|||
SetStoreCacheEnabledDisabled();
|
||||
}
|
||||
|
||||
private void setParameters()
|
||||
private void SetParameters()
|
||||
{
|
||||
Properties.Settings.Default.autorefresh = AutoRefreshCheckBox.Checked;
|
||||
Properties.Settings.Default.minimizeToNotificationArea = minimizeToNotificationArea.Checked;
|
||||
|
|
|
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
|
|||
// 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("0.27.0.0")]
|
||||
[assembly: AssemblyFileVersion("0.27.0.0")]
|
||||
[assembly: AssemblyVersion("0.28.0.0")]
|
||||
[assembly: AssemblyFileVersion("0.28.0.0")]
|
||||
|
|
|
@ -12,7 +12,7 @@ namespace LCS.Properties {
|
|||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
|
@ -140,6 +140,8 @@ namespace LCS.Properties {
|
|||
}
|
||||
set {
|
||||
this["keepCache"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
<Setting Name="keepCache" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
<Setting Name="minimizeToNotificationArea" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
|
|
|
@ -1,18 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CsvHelper" version="12.2.3" targetFramework="net472" />
|
||||
<package id="DocX" version="1.5.0" targetFramework="net472" />
|
||||
<package id="HtmlAgilityPack" version="1.11.17" targetFramework="net472" />
|
||||
<package id="CsvHelper" version="15.0.1" targetFramework="net472" />
|
||||
<package id="DocX" version="1.6.0" targetFramework="net472" />
|
||||
<package id="HtmlAgilityPack" version="1.11.22" targetFramework="net472" />
|
||||
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.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.Buffers" version="4.5.0" targetFramework="net472" />
|
||||
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net461" />
|
||||
<package id="System.Memory" version="4.5.3" targetFramework="net472" />
|
||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net472" />
|
||||
<package id="System.Text.Encodings.Web" version="4.7.0" targetFramework="net472" />
|
||||
<package id="System.Text.Json" version="4.7.1" targetFramework="net472" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net472" />
|
||||
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
|
||||
</packages>
|
Загрузка…
Ссылка в новой задаче