diff --git a/SunnyUI.Demo/Bin/SunnyUI.Common.dll b/SunnyUI.Demo/Bin/SunnyUI.Common.dll
index 93f6655d..34b6ccb9 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 b735f59e..22dc3337 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 bb88916e..3871ed46 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Properties/AssemblyInfo.cs b/SunnyUI.Demo/Properties/AssemblyInfo.cs
index 75f46a48..9ab48cc6 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.2.9.0")]
-[assembly: AssemblyFileVersion("3.2.9.0")]
+[assembly: AssemblyVersion("3.3.0.0")]
+[assembly: AssemblyFileVersion("3.3.0.0")]
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index d7f7540f..1dd7bbef 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -41,11 +41,11 @@
app.manifest
-
- ..\packages\SunnyUI.3.2.9\lib\net472\SunnyUI.dll
+
+ ..\packages\SunnyUI.3.3.0\lib\net472\SunnyUI.dll
-
- ..\packages\SunnyUI.Common.3.2.9\lib\net472\SunnyUI.Common.dll
+
+ ..\packages\SunnyUI.Common.3.3.0\lib\net472\SunnyUI.Common.dll
diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config
index 42990f79..1a8385eb 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/Charts/UIDoughnutChart.cs b/SunnyUI/Charts/UIDoughnutChart.cs
index 8014cf51..8325640d 100644
--- a/SunnyUI/Charts/UIDoughnutChart.cs
+++ b/SunnyUI/Charts/UIDoughnutChart.cs
@@ -148,7 +148,7 @@ namespace Sunny.UI
Angle pieAngle = new Angle(start, angle, text);
GetSeriesRect(pie, ref pieAngle);
- Angles[pieIndex].TryAddOrUpdate(i, pieAngle);
+ Angles[pieIndex].Upsert(i, pieAngle);
start += angle;
}
}
diff --git a/SunnyUI/Charts/UIPieChart.cs b/SunnyUI/Charts/UIPieChart.cs
index 7ab0d0d2..09afc776 100644
--- a/SunnyUI/Charts/UIPieChart.cs
+++ b/SunnyUI/Charts/UIPieChart.cs
@@ -148,7 +148,7 @@ namespace Sunny.UI
}
}
- Angles[pieIndex].TryAddOrUpdate(i, new Angle(start, angle, text));
+ Angles[pieIndex].Upsert(i, new Angle(start, angle, text));
start += angle;
}
}
diff --git a/SunnyUI/Style/UIStyles.cs b/SunnyUI/Style/UIStyles.cs
index 31eaddf2..f66c68ff 100644
--- a/SunnyUI/Style/UIStyles.cs
+++ b/SunnyUI/Style/UIStyles.cs
@@ -165,7 +165,7 @@ namespace Sunny.UI
{
if (!Forms.ContainsKey(guid))
{
- Forms.TryAddOrUpdate(guid, form);
+ Forms.Upsert(guid, form);
return true;
}
@@ -181,7 +181,7 @@ namespace Sunny.UI
{
if (!Pages.ContainsKey(guid))
{
- Pages.TryAddOrUpdate(guid, page);
+ Pages.Upsert(guid, page);
return true;
}
@@ -196,7 +196,7 @@ namespace Sunny.UI
{
if (!Forms.ContainsKey(form.Guid))
{
- Forms.TryAddOrUpdate(form.Guid, form);
+ Forms.Upsert(form.Guid, form);
return true;
}
@@ -211,7 +211,7 @@ namespace Sunny.UI
{
if (!Pages.ContainsKey(page.Guid))
{
- Pages.TryAddOrUpdate(page.Guid, page);
+ Pages.Upsert(page.Guid, page);
return true;
}
diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj
index 7c05c29d..3d8d6ac8 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -9,18 +9,18 @@
SunnyUI.Net 是基于.Net Framework 4.0~4.8、.Net6、.Net7 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
CopyRight © SunnyUI.Net 2012-2022
GPL-3.0-only
- 3.2.9
+ 3.3.0
ShenYonghua
SunnyUI.Net
SunnyUI
https://gitee.com/yhuse/SunnyUI
https://gitee.com/yhuse/SunnyUI
- False
+ True
SunnyUI.png
False
D:\Key\SunnyUI.pfx
False
- True
+ False
False
@@ -75,7 +75,7 @@
-
+