From 8df42f1477263bed194d6ed18ba676680a2fb90b Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 12 Nov 2022 13:39:35 +0800
Subject: [PATCH] chore: support for .net 7.0.
---
build/build-for-myget.nuspec | 15 ++++++++++
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 | 2 ++
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 | 9 +++---
build/build.nuspec | 11 ++++++-
.../HandyControlDemo_Net_GE45.csproj | 2 +-
.../HandyControl_Net_GE45.csproj | 2 +-
.../HandyControlDemo_Code.csproj | 2 +-
.../Tools/Helper/VersionHelper.cs | 30 ++++++++++---------
.../UserControl/Main/MainContent.xaml | 4 +--
19 files changed, 83 insertions(+), 34 deletions(-)
diff --git a/build/build-for-myget.nuspec b/build/build-for-myget.nuspec
index f97f12c9..cdb1d2cd 100644
--- a/build/build-for-myget.nuspec
+++ b/build/build-for-myget.nuspec
@@ -29,6 +29,7 @@
+
@@ -216,6 +217,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/build.Lang.ca-ES.nuspec b/build/build.Lang.ca-ES.nuspec
index b72b15c6..a4f659a3 100644
--- a/build/build.Lang.ca-ES.nuspec
+++ b/build/build.Lang.ca-ES.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.en.nuspec b/build/build.Lang.en.nuspec
index 0a904843..de9539ce 100644
--- a/build/build.Lang.en.nuspec
+++ b/build/build.Lang.en.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.es.nuspec b/build/build.Lang.es.nuspec
index 554606a2..404c5927 100644
--- a/build/build.Lang.es.nuspec
+++ b/build/build.Lang.es.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.fa.nuspec b/build/build.Lang.fa.nuspec
index 27929726..904206f6 100644
--- a/build/build.Lang.fa.nuspec
+++ b/build/build.Lang.fa.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.fr.nuspec b/build/build.Lang.fr.nuspec
index e80d20a9..40a1ad6b 100644
--- a/build/build.Lang.fr.nuspec
+++ b/build/build.Lang.fr.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.ja.nuspec b/build/build.Lang.ja.nuspec
index fcc354d1..1873721e 100644
--- a/build/build.Lang.ja.nuspec
+++ b/build/build.Lang.ja.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,6 +50,7 @@
+
diff --git a/build/build.Lang.ko-KR.nuspec b/build/build.Lang.ko-KR.nuspec
index 969d477b..e42fcde3 100644
--- a/build/build.Lang.ko-KR.nuspec
+++ b/build/build.Lang.ko-KR.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.pl.nuspec b/build/build.Lang.pl.nuspec
index 174cd8bd..38b16c39 100644
--- a/build/build.Lang.pl.nuspec
+++ b/build/build.Lang.pl.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.pt-BR.nuspec b/build/build.Lang.pt-BR.nuspec
index 696423f5..fb4a6e3b 100644
--- a/build/build.Lang.pt-BR.nuspec
+++ b/build/build.Lang.pt-BR.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.ru.nuspec b/build/build.Lang.ru.nuspec
index 2921f248..f99f2d03 100644
--- a/build/build.Lang.ru.nuspec
+++ b/build/build.Lang.ru.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.Lang.tr.nuspec b/build/build.Lang.tr.nuspec
index 0116c7d4..6fc778a7 100644
--- a/build/build.Lang.tr.nuspec
+++ b/build/build.Lang.tr.nuspec
@@ -32,6 +32,7 @@
+
@@ -49,9 +50,10 @@
+
-
\ No newline at end of file
+
diff --git a/build/build.cake b/build/build.cake
index 78280471..c9c534c3 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -18,8 +18,8 @@ Task("Build")
DotNetCoreBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40);
- var frameworkList = new List
- {
+ var frameworkList = new List
+ {
"net45",
"net451",
"net452",
@@ -34,7 +34,8 @@ Task("Build")
"netcoreapp3.0",
"netcoreapp3.1",
"net5.0-windows",
- "net6.0-windows"
+ "net6.0-windows",
+ "net7.0-windows"
};
foreach (var framework in frameworkList)
@@ -50,4 +51,4 @@ Task("Build")
}
});
-RunTarget(target);
\ No newline at end of file
+RunTarget(target);
diff --git a/build/build.nuspec b/build/build.nuspec
index af115193..bbf4e13f 100644
--- a/build/build.nuspec
+++ b/build/build.nuspec
@@ -31,6 +31,7 @@
+
@@ -67,6 +68,9 @@
+
+
+
@@ -77,6 +81,11 @@
+
+
+
+
+
@@ -89,4 +98,4 @@
-
\ No newline at end of file
+
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 9b670497..5989532d 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
+ netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.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 ef122a5f..d830d03a 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
+ netcoreapp3.0;netcoreapp3.1;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.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 2c5b1120..0f4e36c4 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
+ 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
MSB3026;MSB3061
NETSDK1138
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
index 3ecfa0d8..955fba11 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
@@ -11,35 +11,37 @@ internal class VersionHelper
#if NET40
var netVersion = "NET 40";
#elif NET45
- var netVersion = "NET 45";
+ var netVersion = "NET 45";
#elif NET451
- var netVersion = "NET 451";
+ var netVersion = "NET 451";
#elif NET452
- var netVersion = "NET 452";
+ var netVersion = "NET 452";
#elif NET46
- var netVersion = "NET 46";
+ var netVersion = "NET 46";
#elif NET461
- var netVersion = "NET 461";
+ var netVersion = "NET 461";
#elif NET462
- var netVersion = "NET 462";
+ var netVersion = "NET 462";
#elif NET47
- var netVersion = "NET 47";
+ var netVersion = "NET 47";
#elif NET471
- var netVersion = "NET 471";
+ var netVersion = "NET 471";
#elif NET472
- var netVersion = "NET 472";
+ var netVersion = "NET 472";
#elif NET48
- var netVersion = "NET 48";
+ var netVersion = "NET 48";
#elif NET481
- var netVersion = "NET 481";
+ var netVersion = "NET 481";
#elif NET5_0
- var netVersion = "NET 50";
+ var netVersion = "NET 50";
#elif NET6_0
- var netVersion = "NET 60";
+ var netVersion = "NET 60";
+#elif NET7_0
+ var netVersion = "NET 70";
#elif NETCOREAPP3_0
var netVersion = "CORE 30";
#elif NETCOREAPP3_1
- var netVersion = "CORE 31";
+ var netVersion = "CORE 31";
#endif
return $"v {versionInfo.FileVersion} {netVersion}";
}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml
index 3cee8f76..51d2c257 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml
@@ -15,9 +15,9 @@
-
+
-
+