From 37ba3accd8825c07e46443b739ff25f384161cf9 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Thu, 18 Jun 2020 00:53:34 +0800 Subject: [PATCH] support for net 5.0 --- .../HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj | 2 +- src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj | 2 +- src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj | 2 +- src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) 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 a4a7980a..36014284 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;net462;net47;net48 + netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net50 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico 0108 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 936ec214..fdd498c7 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;net462;net47;net48 + netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net50 Contains some commonly used simple WPF controls HandyControl true diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj index 06779b68..ef64a679 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;net462;net47;net48 + netcoreapp3.0;netcoreapp3.1;net40;net45;net462;net47;net48;net50 diff --git a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs index a8ed5d5e..80dec631 100644 --- a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs @@ -28,6 +28,8 @@ namespace HandyControlDemo.Window var netVersion = "CORE 30"; #elif NETCOREAPP3_1 var netVersion = "CORE 31"; +#else + var netVersion = "NET 50"; #endif Version = $"v {versionInfo.FileVersion} {netVersion}"; }