diff --git a/SunnyUI.Demo/Bin/SunnyUI.Common.dll b/SunnyUI.Demo/Bin/SunnyUI.Common.dll index f8731998..72991dfc 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.Common.dll and b/SunnyUI.Demo/Bin/SunnyUI.Common.dll differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe index c277ff1c..30311b8b 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe and b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll index 3c11ff63..187dfc08 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Charts/FBarChartEx.Designer.cs b/SunnyUI.Demo/Charts/FBarChartEx.Designer.cs deleted file mode 100644 index b1a89c36..00000000 --- a/SunnyUI.Demo/Charts/FBarChartEx.Designer.cs +++ /dev/null @@ -1,155 +0,0 @@ -namespace Sunny.UI.Demo -{ - partial class FBarChartEx - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.uiSymbolButton1 = new Sunny.UI.UISymbolButton(); - this.uiImageButton3 = new Sunny.UI.UIImageButton(); - this.uiImageButton2 = new Sunny.UI.UIImageButton(); - this.uiImageButton1 = new Sunny.UI.UIImageButton(); - this.BarChart = new Sunny.UI.UIBarChartEx(); - this.uiSymbolButton2 = new Sunny.UI.UISymbolButton(); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton1)).BeginInit(); - this.SuspendLayout(); - // - // uiSymbolButton1 - // - this.uiSymbolButton1.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiSymbolButton1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiSymbolButton1.Location = new System.Drawing.Point(348, 505); - this.uiSymbolButton1.MinimumSize = new System.Drawing.Size(1, 1); - this.uiSymbolButton1.Name = "uiSymbolButton1"; - this.uiSymbolButton1.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.uiSymbolButton1.Size = new System.Drawing.Size(100, 27); - this.uiSymbolButton1.Symbol = 61568; - this.uiSymbolButton1.TabIndex = 34; - this.uiSymbolButton1.Text = "数据"; - this.uiSymbolButton1.Click += new System.EventHandler(this.uiSymbolButton1_Click); - // - // uiImageButton3 - // - this.uiImageButton3.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiImageButton3.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiImageButton3.Image = global::Sunny.UI.Demo.Properties.Resources.ChartDarkStyle; - this.uiImageButton3.Location = new System.Drawing.Point(242, 505); - this.uiImageButton3.Name = "uiImageButton3"; - this.uiImageButton3.Size = new System.Drawing.Size(100, 27); - this.uiImageButton3.TabIndex = 33; - this.uiImageButton3.TabStop = false; - this.uiImageButton3.Text = " Dark"; - this.uiImageButton3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.uiImageButton3.Click += new System.EventHandler(this.uiImageButton3_Click); - // - // uiImageButton2 - // - this.uiImageButton2.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiImageButton2.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiImageButton2.Image = global::Sunny.UI.Demo.Properties.Resources.ChartPlainStyle; - this.uiImageButton2.Location = new System.Drawing.Point(136, 505); - this.uiImageButton2.Name = "uiImageButton2"; - this.uiImageButton2.Size = new System.Drawing.Size(100, 27); - this.uiImageButton2.TabIndex = 32; - this.uiImageButton2.TabStop = false; - this.uiImageButton2.Text = " Plain"; - this.uiImageButton2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.uiImageButton2.Click += new System.EventHandler(this.uiImageButton2_Click); - // - // uiImageButton1 - // - this.uiImageButton1.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiImageButton1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiImageButton1.Image = global::Sunny.UI.Demo.Properties.Resources.ChartDefaultStyle; - this.uiImageButton1.Location = new System.Drawing.Point(30, 505); - this.uiImageButton1.Name = "uiImageButton1"; - this.uiImageButton1.Size = new System.Drawing.Size(100, 27); - this.uiImageButton1.TabIndex = 31; - this.uiImageButton1.TabStop = false; - this.uiImageButton1.Text = " Default"; - this.uiImageButton1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.uiImageButton1.Click += new System.EventHandler(this.uiImageButton1_Click); - // - // BarChart - // - this.BarChart.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(244)))), ((int)(((byte)(244)))), ((int)(((byte)(244))))); - this.BarChart.Font = new System.Drawing.Font("微软雅黑", 12F); - this.BarChart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(54)))), ((int)(((byte)(54))))); - this.BarChart.Location = new System.Drawing.Point(30, 55); - this.BarChart.MinimumSize = new System.Drawing.Size(1, 1); - this.BarChart.Name = "BarChart"; - this.BarChart.Size = new System.Drawing.Size(670, 430); - this.BarChart.TabIndex = 35; - this.BarChart.Text = "uiBarChartEx1"; - // - // uiSymbolButton2 - // - this.uiSymbolButton2.Cursor = System.Windows.Forms.Cursors.Hand; - this.uiSymbolButton2.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiSymbolButton2.Location = new System.Drawing.Point(456, 505); - this.uiSymbolButton2.MinimumSize = new System.Drawing.Size(1, 1); - this.uiSymbolButton2.Name = "uiSymbolButton2"; - this.uiSymbolButton2.Size = new System.Drawing.Size(100, 27); - this.uiSymbolButton2.Symbol = 61568; - this.uiSymbolButton2.TabIndex = 36; - this.uiSymbolButton2.Text = "数据"; - this.uiSymbolButton2.Click += new System.EventHandler(this.uiSymbolButton2_Click); - // - // FBarChartEx - // - this.AllowShowTitle = true; - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(886, 611); - this.Controls.Add(this.uiSymbolButton2); - this.Controls.Add(this.uiSymbolButton1); - this.Controls.Add(this.uiImageButton3); - this.Controls.Add(this.uiImageButton2); - this.Controls.Add(this.uiImageButton1); - this.Controls.Add(this.BarChart); - this.Name = "FBarChartEx"; - this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0); - this.ShowTitle = true; - this.Symbol = 61568; - this.Text = "BarChartEx"; - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.uiImageButton1)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private UISymbolButton uiSymbolButton1; - private UIImageButton uiImageButton3; - private UIImageButton uiImageButton2; - private UIImageButton uiImageButton1; - private UIBarChartEx BarChart; - private UISymbolButton uiSymbolButton2; - } -} \ No newline at end of file diff --git a/SunnyUI.Demo/Charts/FBarChartEx.cs b/SunnyUI.Demo/Charts/FBarChartEx.cs deleted file mode 100644 index 5ff49aef..00000000 --- a/SunnyUI.Demo/Charts/FBarChartEx.cs +++ /dev/null @@ -1,153 +0,0 @@ -using System.Drawing; - -namespace Sunny.UI.Demo -{ - public partial class FBarChartEx : UIPage - { - public FBarChartEx() - { - InitializeComponent(); - } - - private void uiImageButton1_Click(object sender, System.EventArgs e) - { - BarChart.ChartStyleType = UIChartStyleType.Default; - } - - private void uiImageButton2_Click(object sender, System.EventArgs e) - { - BarChart.ChartStyleType = UIChartStyleType.Plain; - } - - private void uiImageButton3_Click(object sender, System.EventArgs e) - { - BarChart.ChartStyleType = UIChartStyleType.Dark; - } - - private void uiSymbolButton1_Click(object sender, System.EventArgs e) - { - UIBarOption option = new UIBarOption(); - - option.Grid.Bottom = 65; - - option.Title = new UITitle(); - option.Title.Text = "SunnyUI"; - option.Title.SubText = "BarChartEx"; - - //设置Legend - option.Legend = new UILegend(); - option.Legend.Orient = UIOrient.Horizontal; - option.Legend.Top = UITopAlignment.Top; - option.Legend.Left = UILeftAlignment.Left; - option.Legend.AddData("Bar1"); - option.Legend.AddData("Bar2"); - option.Legend.AddData("Bar3"); - - var series = new UIBarSeries(); - series.Name = "Bar1"; - series.ShowBarName = true; - series.ShowValue = true; - series.AddData("通道1", 1.1); - series.AddData("通道2", 1.5); - option.Series.Add(series); - - series = new UIBarSeries(); - series.Name = "Bar2"; - series.ShowBarName = true; - series.ShowValue = true; - series.AddData("通道1", 2.2); - series.AddData("通道2", 2.8); - series.AddData("通道3", 2.5); - option.Series.Add(series); - - series = new UIBarSeries(); - series.Name = "Bar3"; - series.ShowBarName = true; - series.ShowValue = true; - series.AddData("通道1", 0.7); - option.Series.Add(series); - - option.XAxis.Data.Add("Mon"); - option.XAxis.Data.Add("Tue"); - option.XAxis.Data.Add("Wed"); - option.XAxis.Data.Add("Thu"); - option.XAxis.Data.Add("Fri"); - - option.ToolTip.Visible = true; - option.YAxis.Scale = true; - - option.XAxis.Name = ""; - option.YAxis.Name = "数值"; - - option.XAxis.AxisTick.Distance = 14; - option.XAxis.AxisLabel.Angle = 90; - - option.FixedSeriesCount = 3; - option.AutoSizeBars = true; - option.AutoSizeBarsCompact = true; - option.AutoSizeBarsCompactValue = 0.8f; - - option.YAxisScaleLines.Add(new UIScaleLine() { Color = Color.Red, Name = "上限", Value = 12 }); - option.YAxisScaleLines.Add(new UIScaleLine() { Color = Color.Gold, Name = "下限", Value = -20 }); - - option.ToolTip.AxisPointer.Type = UIAxisPointerType.Shadow; - BarChart.SetOption(option); - } - - private void uiSymbolButton2_Click(object sender, System.EventArgs e) - { - UIBarOption option = new UIBarOption(); - option.Title = new UITitle(); - option.Title.Text = "SunnyUI"; - option.Title.SubText = "BarChartEx"; - - //设置Legend - option.Legend = new UILegend(); - option.Legend.Orient = UIOrient.Horizontal; - option.Legend.Top = UITopAlignment.Top; - option.Legend.Left = UILeftAlignment.Left; - option.Legend.AddData("Bar1"); - option.Legend.AddData("Bar2"); - option.Legend.AddData("Bar3"); - - var series = new UIBarSeries(); - series.ShowValue = true; - series.ShowValueFontSize = 6f; - series.MaxWidth = 22; - series.Name = "Bar1"; - series.AddData(1); - option.Series.Add(series); - - series = new UIBarSeries(); - series.ShowValue = true; - series.ShowValueFontSize = 10.5f; - series.MaxWidth = 22; - series.Name = "Bar2"; - series.AddData(2); - series.AddData(3); - option.Series.Add(series); - - series = new UIBarSeries(); - series.ShowValue = true; - series.ShowValueFontSize = 16f; - series.MaxWidth = 22; - series.Name = "Bar3"; - series.AddData(4); - series.AddData(5); - series.AddData(6); - option.Series.Add(series); - - option.XAxis.Data.Add("Mon"); - option.XAxis.Data.Add("Tue"); - option.XAxis.Data.Add("Wed"); - option.XAxis.Data.Add("Thu"); - option.XAxis.Data.Add("Fri"); - - option.ToolTip = new UIBarToolTip(); - option.ToolTip.AxisPointer.Type = UIAxisPointerType.Shadow; - option.AutoSizeBarsCompact = true; - option.AutoSizeBarsCompactValue = 0.1f; - BarChart.SetOption(option); - } - } -} diff --git a/SunnyUI.Demo/Charts/FBarChartEx.resx b/SunnyUI.Demo/Charts/FBarChartEx.resx deleted file mode 100644 index 1af7de15..00000000 --- a/SunnyUI.Demo/Charts/FBarChartEx.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/SunnyUI.Demo/Controls/FDataGridView.Designer.cs b/SunnyUI.Demo/Controls/FDataGridView.Designer.cs index 11ac5dbe..dec27c01 100644 --- a/SunnyUI.Demo/Controls/FDataGridView.Designer.cs +++ b/SunnyUI.Demo/Controls/FDataGridView.Designer.cs @@ -102,7 +102,6 @@ namespace Sunny.UI.Demo this.uiDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle5; this.uiDataGridView1.RowTemplate.Height = 23; this.uiDataGridView1.SelectedIndex = -1; - this.uiDataGridView1.ShowGridLine = true; this.uiDataGridView1.Size = new System.Drawing.Size(800, 351); this.uiDataGridView1.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255))))); this.uiDataGridView1.TabIndex = 6; diff --git a/SunnyUI.Demo/Controls/FDataGridView.cs b/SunnyUI.Demo/Controls/FDataGridView.cs index 7d20c6b2..39dbb67f 100644 --- a/SunnyUI.Demo/Controls/FDataGridView.cs +++ b/SunnyUI.Demo/Controls/FDataGridView.cs @@ -37,7 +37,6 @@ namespace Sunny.UI.Demo uiDataGridView1.SelectIndexChange += uiDataGridView1_SelectIndexChange; - uiDataGridView1.ShowGridLine = true; //设置统计绑定的表格 uiDataGridViewFooter1.DataGridView = uiDataGridView1; } diff --git a/SunnyUI.Demo/Controls/FOther.Designer.cs b/SunnyUI.Demo/Controls/FOther.Designer.cs index 55f9d2ec..1a403356 100644 --- a/SunnyUI.Demo/Controls/FOther.Designer.cs +++ b/SunnyUI.Demo/Controls/FOther.Designer.cs @@ -38,6 +38,9 @@ namespace Sunny.UI.Demo this.uiScrollingText1 = new Sunny.UI.UIScrollingText(); this.uiLine6 = new Sunny.UI.UILine(); this.uiToolTip1 = new Sunny.UI.UIToolTip(this.components); + this.uiLine1 = new Sunny.UI.UILine(); + this.uiVerificationCode1 = new Sunny.UI.UIVerificationCode(); + this.uiVerificationCode2 = new Sunny.UI.UIVerificationCode(); this.SuspendLayout(); // // uiLabel3 @@ -50,6 +53,7 @@ namespace Sunny.UI.Demo this.uiLabel3.TabIndex = 79; this.uiLabel3.Text = "鼠标移过来看提示"; this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLabel3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // uiLabel2 // @@ -61,6 +65,7 @@ namespace Sunny.UI.Demo this.uiLabel2.TabIndex = 78; this.uiLabel2.Text = "鼠标移过来看提示"; this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLabel2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // uiLabel1 // @@ -73,6 +78,7 @@ namespace Sunny.UI.Demo this.uiLabel1.Text = "鼠标移过来看提示"; this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.uiToolTip1.SetToolTip(this.uiLabel1, "赠人玫瑰手有余香"); + this.uiLabel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // uiLine7 // @@ -84,6 +90,7 @@ namespace Sunny.UI.Demo this.uiLine7.TabIndex = 76; this.uiLine7.Text = "UIToolTip"; this.uiLine7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLine7.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // uiScrollingText2 // @@ -95,6 +102,7 @@ namespace Sunny.UI.Demo this.uiScrollingText2.Size = new System.Drawing.Size(319, 35); this.uiScrollingText2.TabIndex = 75; this.uiScrollingText2.Text = "赠人玫瑰手有余香"; + this.uiScrollingText2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // uiScrollingText1 // @@ -111,6 +119,7 @@ namespace Sunny.UI.Demo this.uiScrollingText1.StyleCustomMode = true; this.uiScrollingText1.TabIndex = 74; this.uiScrollingText1.Text = "赠人玫瑰手有余香"; + this.uiScrollingText1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // uiLine6 // @@ -122,6 +131,7 @@ namespace Sunny.UI.Demo this.uiLine6.TabIndex = 73; this.uiLine6.Text = "UIScrollingText"; this.uiLine6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLine6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // uiToolTip1 // @@ -131,11 +141,47 @@ namespace Sunny.UI.Demo this.uiToolTip1.OwnerDraw = true; this.uiToolTip1.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); // + // uiLine1 + // + this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiLine1.Location = new System.Drawing.Point(30, 187); + this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16); + this.uiLine1.Name = "uiLine1"; + this.uiLine1.Size = new System.Drawing.Size(319, 20); + this.uiLine1.TabIndex = 80; + this.uiLine1.Text = "UIVerificationCode"; + this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uiLine1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + // + // uiVerificationCode1 + // + this.uiVerificationCode1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiVerificationCode1.Location = new System.Drawing.Point(30, 225); + this.uiVerificationCode1.MinimumSize = new System.Drawing.Size(1, 1); + this.uiVerificationCode1.Name = "uiVerificationCode1"; + this.uiVerificationCode1.Size = new System.Drawing.Size(100, 35); + this.uiVerificationCode1.TabIndex = 81; + this.uiVerificationCode1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + // + // uiVerificationCode2 + // + this.uiVerificationCode2.CodeLength = 6; + this.uiVerificationCode2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.uiVerificationCode2.Location = new System.Drawing.Point(148, 225); + this.uiVerificationCode2.MinimumSize = new System.Drawing.Size(1, 1); + this.uiVerificationCode2.Name = "uiVerificationCode2"; + this.uiVerificationCode2.Size = new System.Drawing.Size(140, 35); + this.uiVerificationCode2.TabIndex = 82; + this.uiVerificationCode2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); + // // FOther // this.AllowShowTitle = true; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.uiVerificationCode2); + this.Controls.Add(this.uiVerificationCode1); + this.Controls.Add(this.uiLine1); this.Controls.Add(this.uiLabel3); this.Controls.Add(this.uiLabel2); this.Controls.Add(this.uiLabel1); @@ -162,5 +208,8 @@ namespace Sunny.UI.Demo private UIScrollingText uiScrollingText1; private UILine uiLine6; private UIToolTip uiToolTip1; + private UILine uiLine1; + private UIVerificationCode uiVerificationCode1; + private UIVerificationCode uiVerificationCode2; } } \ No newline at end of file diff --git a/SunnyUI.Demo/Properties/AssemblyInfo.cs b/SunnyUI.Demo/Properties/AssemblyInfo.cs index 7a232d01..00384c51 100644 --- a/SunnyUI.Demo/Properties/AssemblyInfo.cs +++ b/SunnyUI.Demo/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //通过使用 "*",如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.1.9.0")] -[assembly: AssemblyFileVersion("3.1.9.0")] +[assembly: AssemblyVersion("3.2.0.0")] +[assembly: AssemblyFileVersion("3.2.0.0")] diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj index 14246dcb..baa4d4be 100644 --- a/SunnyUI.Demo/SunnyUI.Demo.csproj +++ b/SunnyUI.Demo/SunnyUI.Demo.csproj @@ -38,11 +38,11 @@ app.manifest - - ..\packages\SunnyUI.3.1.9\lib\net40\SunnyUI.dll + + ..\packages\SunnyUI.3.2.0\lib\net40\SunnyUI.dll - - ..\packages\SunnyUI.Common.3.1.2\lib\net40\SunnyUI.Common.dll + + ..\packages\SunnyUI.Common.3.2.0\lib\net40\SunnyUI.Common.dll @@ -58,12 +58,6 @@ - - Form - - - FBarChartEx.cs - Form @@ -379,9 +373,6 @@ FCommon.cs - - FBarChartEx.cs - FDoughnutChart.cs diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config index 5c08b3fc..839526a6 100644 --- a/SunnyUI.Demo/packages.config +++ b/SunnyUI.Demo/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj index a083ad89..8dcde5b7 100644 --- a/SunnyUI/SunnyUI.csproj +++ b/SunnyUI/SunnyUI.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net472;net40 + net472;net40 8.0 {AB1CB247-E20B-4CBE-B269-570ADDD96C53} true