From 0e1fefa143587d3c00644120471545da0a3dec6e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 14 Sep 2022 22:25:24 +0800
Subject: [PATCH] chore: support for .net 481.
---
README-cn.md | 4 ++--
README.md | 4 ++--
build/build-for-myget.nuspec | 16 +++++++++++++++-
build/build.Lang.ca-ES.nuspec | 4 +++-
build/build.Lang.en.nuspec | 4 +++-
build/build.Lang.es.nuspec | 4 +++-
build/build.Lang.fa.nuspec | 4 +++-
build/build.Lang.fr.nuspec | 4 +++-
build/build.Lang.ja.nuspec | 4 +++-
build/build.Lang.ko-KR.nuspec | 4 +++-
build/build.Lang.pl.nuspec | 4 +++-
build/build.Lang.pt-BR.nuspec | 4 +++-
build/build.Lang.ru.nuspec | 4 +++-
build/build.Lang.tr.nuspec | 4 +++-
build/build.cake | 1 +
build/build.nuspec | 2 +-
.../HandyControlDemo_Net_GE45.csproj | 2 +-
.../HandyControl_Net_GE45.csproj | 2 +-
.../HandyControlDemo_Code.csproj | 2 +-
.../Tools/Helper/VersionHelper.cs | 2 ++
20 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/README-cn.md b/README-cn.md
index b650aa0da..a1ffbab80 100644
--- a/README-cn.md
+++ b/README-cn.md
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/README.md b/README.md
index fe4ecc534..023714ebb 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec
index 1a2ff3824..f97f12c93 100644
--- a/build/build-for-myget.nuspec
+++ b/build/build-for-myget.nuspec
@@ -10,7 +10,7 @@
https://raw.githubusercontent.com/HandyOrg/HandyControl/master/LICENSE
https://github.com/NaBian/HandyControl
Contains some simple and commonly used WPF controls
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -24,6 +24,7 @@
+
@@ -174,6 +175,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/build.Lang.ca-ES.nuspec b/build/build.Lang.ca-ES.nuspec
index 1a5dc5fc5..b72b15c6a 100644
--- a/build/build.Lang.ca-ES.nuspec
+++ b/build/build.Lang.ca-ES.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.en.nuspec b/build/build.Lang.en.nuspec
index 6e5b3a3ac..0a904843e 100644
--- a/build/build.Lang.en.nuspec
+++ b/build/build.Lang.en.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.es.nuspec b/build/build.Lang.es.nuspec
index 5c1bd8c8f..554606a2d 100644
--- a/build/build.Lang.es.nuspec
+++ b/build/build.Lang.es.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.fa.nuspec b/build/build.Lang.fa.nuspec
index 9f0674e0a..279297265 100644
--- a/build/build.Lang.fa.nuspec
+++ b/build/build.Lang.fa.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.fr.nuspec b/build/build.Lang.fr.nuspec
index 95a33014a..e80d20a90 100644
--- a/build/build.Lang.fr.nuspec
+++ b/build/build.Lang.fr.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.ja.nuspec b/build/build.Lang.ja.nuspec
index 08ca8ff80..fcc354d11 100644
--- a/build/build.Lang.ja.nuspec
+++ b/build/build.Lang.ja.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.ko-KR.nuspec b/build/build.Lang.ko-KR.nuspec
index e27c55814..969d477b2 100644
--- a/build/build.Lang.ko-KR.nuspec
+++ b/build/build.Lang.ko-KR.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.pl.nuspec b/build/build.Lang.pl.nuspec
index 8966ad9d0..174cd8bd5 100644
--- a/build/build.Lang.pl.nuspec
+++ b/build/build.Lang.pl.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.pt-BR.nuspec b/build/build.Lang.pt-BR.nuspec
index c5bb8b709..696423f51 100644
--- a/build/build.Lang.pt-BR.nuspec
+++ b/build/build.Lang.pt-BR.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.ru.nuspec b/build/build.Lang.ru.nuspec
index 55daa195f..2921f248d 100644
--- a/build/build.Lang.ru.nuspec
+++ b/build/build.Lang.ru.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.Lang.tr.nuspec b/build/build.Lang.tr.nuspec
index 5c021a799..0116c7d40 100644
--- a/build/build.Lang.tr.nuspec
+++ b/build/build.Lang.tr.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
@@ -27,6 +27,7 @@
+
@@ -45,6 +46,7 @@
+
diff --git a/build/build.cake b/build/build.cake
index 1dbec8964..78280471a 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -30,6 +30,7 @@ Task("Build")
"net471",
"net472",
"net48",
+ "net481",
"netcoreapp3.0",
"netcoreapp3.1",
"net5.0-windows",
diff --git a/build/build.nuspec b/build/build.nuspec
index 2c8b28f2b..af1151930 100644
--- a/build/build.nuspec
+++ b/build/build.nuspec
@@ -12,7 +12,7 @@
https://github.com/HandyOrg/HandyControl
Contains some simple and commonly used WPF controls
Changes are detailed at https://github.com/HandyOrg/HandyControl/releases
- Copyright © HandyOrg 2018-2021
+ Copyright © HandyOrg 2018-2022
WPF C# Control
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 0f40d28a8..d13eb321f 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;net5.0-windows;net6.0-windows
+ netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows
..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico
0108;MSB3026;MSB3061
NETSDK1138
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 eaaa44cdb..ef122a5fa 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;net5.0-windows;net6.0-windows
+ netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows
Contains some simple and commonly used WPF controls
HandyControl
snupkg
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index ba9826f55..0e15006fb 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;net5.0-windows;net6.0-windows
+ netcoreapp3.0;netcoreapp3.1;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.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 062e601c8..3ecfa0d89 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
@@ -30,6 +30,8 @@ internal static string GetVersion()
var netVersion = "NET 472";
#elif NET48
var netVersion = "NET 48";
+#elif NET481
+ var netVersion = "NET 481";
#elif NET5_0
var netVersion = "NET 50";
#elif NET6_0