diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index f03073b1..70335b3e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -30,6 +30,8 @@ body:
attributes:
label: NuGet package version
options:
+ - "HandyControl 3.5.1"
+ - "HandyControl 3.5.0"
- "HandyControl 3.4.0"
- "HandyControl 3.3.0"
- "HandyControl 3.2.0"
@@ -58,10 +60,14 @@ body:
description: please specify for which framework type you have encountered the issue.
multiple: true
options:
+ - ".Net 9.0"
+ - ".Net 8.0"
+ - ".Net 7.0"
- ".Net 6.0"
- ".Net 5.0"
- ".Net Core 3.1"
- ".Net Core 3.0"
+ - ".Net Framework 4.8.1"
- ".Net Framework 4.8"
- ".Net Framework 4.7.2"
- ".Net Framework 4.7.1"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a12668cc..3f178b25 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '8.0.x'
+ dotnet-version: '9.0.x'
- name: Build
working-directory: ./build
diff --git a/.github/workflows/bump-up-version.yml b/.github/workflows/bump-up-version.yml
index 86bd55b6..ae75da5e 100644
--- a/.github/workflows/bump-up-version.yml
+++ b/.github/workflows/bump-up-version.yml
@@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '8.0.x'
+ dotnet-version: '9.0.x'
- name: Publish
working-directory: ./build
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
index 595bee2e..4f17a7e3 100644
--- a/.github/workflows/dotnet-format.yml
+++ b/.github/workflows/dotnet-format.yml
@@ -19,7 +19,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '8.0.x'
+ dotnet-version: '9.0.x'
# 代码文件编码规范机器人,详细请看 [dotnet 在 GitHub 的 Action 上部署自动代码编码规范机器人](https://blog.lindexi.com/post/dotnet-%E5%9C%A8-GitHub-%E7%9A%84-Action-%E4%B8%8A%E9%83%A8%E7%BD%B2%E8%87%AA%E5%8A%A8%E4%BB%A3%E7%A0%81%E7%BC%96%E7%A0%81%E8%A7%84%E8%8C%83%E6%9C%BA%E5%99%A8%E4%BA%BA.html)
- name: Install dotnetCampus.EncodingNormalior
diff --git a/.github/workflows/push-to-myget.yml b/.github/workflows/push-to-myget.yml
index d9bcbfa2..457fefda 100644
--- a/.github/workflows/push-to-myget.yml
+++ b/.github/workflows/push-to-myget.yml
@@ -14,7 +14,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '8.0.x'
+ dotnet-version: '9.0.x'
- name: setup nuget.exe
uses: NuGet/setup-nuget@v1.0.5
@@ -24,7 +24,7 @@ jobs:
run: |
cd build
.\build.ps1
- nuget pack build-for-myget.nuspec -version 3.5.0-beta.${env:GITHUB_RUN_NUMBER}
+ nuget pack build-for-myget.nuspec -version 3.7.0-beta.${env:GITHUB_RUN_NUMBER}
$nupkgName = @(gci *.nupkg)[0].Name
$mygetSourcePath = "https://www.myget.org/F/handycontrol"
nuget setApiKey ${{ secrets.MYGETTOKEN }} -Source $mygetSourcePath
diff --git a/LICENSE b/LICENSE
index 071f345a..9d68f92d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright © HandyOrg 2018-2024
+Copyright © HandyOrg 2018-2025
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/build/VisualStudioToolsManifest.xml b/build/VisualStudioToolsManifest.xml
index 217bf875..9fbea017 100644
--- a/build/VisualStudioToolsManifest.xml
+++ b/build/VisualStudioToolsManifest.xml
@@ -19,6 +19,7 @@
+
diff --git a/build/build.config.xml b/build/build.config.xml
index 62ed211a..15be80c8 100644
--- a/build/build.config.xml
+++ b/build/build.config.xml
@@ -2,7 +2,7 @@
outputs
-
+
+
diff --git a/src/.run/HandyControlDemo_Net_GE45.run.xml b/src/.run/HandyControlDemo_Net_GE45.run.xml
index 13897e3e..35805236 100644
--- a/src/.run/HandyControlDemo_Net_GE45.run.xml
+++ b/src/.run/HandyControlDemo_Net_GE45.run.xml
@@ -1,18 +1,23 @@
-
+
-
+
+
+
+
+
+
-
+
diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props
index f7b5575c..010b9827 100644
--- a/src/Directory.Build.Props
+++ b/src/Directory.Build.Props
@@ -5,7 +5,7 @@
3.5.2.0
3.5.2.0
latest
- Copyright © HandyOrg 2018-2024
+ Copyright © HandyOrg 2018-2025
HandyOrg
https://github.com/HandyOrg/HandyControl
https://handyorg.github.io/
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index ab2b902e..0704ed8c 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -3,7 +3,7 @@
WinExe
HandyControlDemo
HandyControlDemo
- netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows
+ netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows
..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico
0108;MSB3026;MSB3061;SYSLIB0014
NETSDK1138
@@ -170,7 +170,7 @@
Resources\Img\Flag\cn.png
-
+
Resources\Img\Flag\ca-Es.png
@@ -256,7 +256,7 @@
Properties\Langs\Lang.tr.resx
-
+
Properties\Langs\Lang.ca-ES.resx
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index 4a5ea08d..e388cf10 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -2,7 +2,7 @@
HandyControl
HandyControl
- netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows
+ netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows
Contains some simple and commonly used WPF controls
HandyControl
snupkg
@@ -35,7 +35,7 @@
Properties\Langs\Lang.tr.resx
-
+
Properties\Langs\Lang.ca-ES.resx
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index f2ad4ff4..ab5f95bb 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -3,7 +3,7 @@
true
HandyControlDemoCode
HandyControlDemoCode
- netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows
+ netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows
MSB3026;MSB3061
NETSDK1138
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
index 15740023..e05e4bb8 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
@@ -40,6 +40,8 @@ internal class VersionHelper
var netVersion = ".NET 7.0";
#elif NET8_0
var netVersion = ".NET 8.0";
+#elif NET9_0
+ var netVersion = ".NET 9.0";
#elif NETCOREAPP3_0
var netVersion = ".NET CORE 3.0";
#elif NETCOREAPP3_1