From 19be9982c250d85c62467cd88da4d45bac884afe Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 14 Nov 2020 22:51:14 +0800
Subject: [PATCH] add versioninfo in nonclientarea

---
 .../HandyControlDemo_Net_GE45.csproj          |  2 +-
 .../HandyControl_Net_GE45.csproj              |  2 +-
 .../HandyControlDemo_Code.csproj              |  4 +--
 .../HandyControlDemo_Shared.projitems         |  9 ++---
 .../MainWindow.xaml.cs                        |  2 +-
 .../Tools/Helper/VersionHelper.cs             | 34 +++++++++++++++++++
 ...ontent.xaml.cs => NonClientAreaContent.cs} |  7 ++--
 ...Content.xaml => NonClientAreaContent.xaml} |  5 ++-
 ...ViewModel.cs => NonClientAreaViewModel.cs} | 19 ++++++++++-
 .../ViewModel/ViewModelLocator.cs             |  4 +--
 .../Window/AboutWindow.xaml.cs                | 28 +++------------
 11 files changed, 76 insertions(+), 40 deletions(-)
 create mode 100644 src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
 rename src/Shared/HandyControlDemo_Shared/UserControl/Main/{NoUserContent.xaml.cs => NonClientAreaContent.cs} (93%)
 rename src/Shared/HandyControlDemo_Shared/UserControl/Main/{NoUserContent.xaml => NonClientAreaContent.xaml} (96%)
 rename src/Shared/HandyControlDemo_Shared/ViewModel/Main/{NoUserViewModel.cs => NonClientAreaViewModel.cs} (62%)

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 1f1b29c2..6ae41d8c 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 @@
     <OutputType>WinExe</OutputType>
     <AssemblyName>HandyControlDemo</AssemblyName>
     <RootNamespace>HandyControlDemo</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net5.0-windows</TargetFrameworks>
     <ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
     <NoWarn>0108</NoWarn>
     <UseWPF>true</UseWPF>
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 1e6202dc..a9d4eeae 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 @@
   <PropertyGroup>
     <AssemblyName>HandyControl</AssemblyName>
     <RootNamespace>HandyControl</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net5.0-windows</TargetFrameworks>
     <Description>Contains some commonly used simple WPF controls</Description>
     <PackageId>HandyControl</PackageId>
     <IncludeSymbols>true</IncludeSymbols>
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index ab2501be..7757b408 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -3,7 +3,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>HandyControlDemoCode</AssemblyName>
     <RootNamespace>HandyControlDemoCode</RootNamespace>
-    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net462;net47;net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net40;net45;net462;net47;net48;net5.0-windows</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\Window\AboutWindow.xaml">
@@ -888,7 +888,7 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Main\MainViewModel.cs">
       <Link>ViewModel\MainViewModel.cs</Link>
     </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Main\NoUserViewModel.cs">
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Main\NonClientAreaViewModel.cs">
       <Link>ViewModel\NoUserViewModel.cs</Link>
     </Resource>
   </ItemGroup>
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index eec0f4b5..89e561b3 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -38,6 +38,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\StringRepeatConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\LangExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\AssemblyHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\VersionHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\Win32Helper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\Avatar.xaml.cs">
       <DependentUpon>Avatar.xaml</DependentUpon>
@@ -268,8 +269,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\MainWindowContent.xaml.cs">
       <DependentUpon>MainWindowContent.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\NoUserContent.xaml.cs">
-      <DependentUpon>NoUserContent.xaml</DependentUpon>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\NonClientAreaContent.cs">
+      <DependentUpon>NonClientAreaContent.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\ProjectsView.xaml.cs">
       <DependentUpon>ProjectsView.xaml</DependentUpon>
@@ -422,7 +423,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\DemoViewModelBase!1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\ItemsDisplayViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\MainViewModel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\NoUserViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\NonClientAreaViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\ViewModelLocator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Window\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
@@ -811,7 +812,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\NoUserContent.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\NonClientAreaContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
index 59baef02..4fc8144c 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
@@ -21,7 +21,7 @@ namespace HandyControlDemo
             base.OnContentRendered(e);
 
             DataContext = ViewModelLocator.Instance.Main;
-            NonClientAreaContent = new NoUserContent();
+            NonClientAreaContent = new NonClientAreaContent();
             ControlMain.Content = new MainWindowContent();
 
             GlobalShortcut.Init(new List<KeyBinding>
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
new file mode 100644
index 00000000..5d64565c
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
@@ -0,0 +1,34 @@
+using System.Diagnostics;
+using System.Reflection;
+
+namespace HandyControlDemo.Tools
+{
+    internal class VersionHelper
+    {
+        internal static string GetVersion()
+        {
+            var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location);
+#if NET40
+            var netVersion = "NET 40";
+#elif NET45
+            var netVersion = "NET 45";
+#elif NET462
+            var netVersion = "NET 462";
+#elif NET47
+            var netVersion = "NET 47";
+#elif NET48
+            var netVersion = "NET 48";
+#elif NET5_0
+            var netVersion = "NET 50";
+#elif NETCOREAPP3_0
+            var netVersion = "CORE 30";
+#elif NETCOREAPP3_1
+            var netVersion = "CORE 31";
+#endif
+            return $"v {versionInfo.FileVersion} {netVersion}";
+        }
+
+        internal static string GetCopyright() =>
+            FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).LegalCopyright;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
similarity index 93%
rename from src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml.cs
rename to src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
index d439d97c..58b56ea0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
@@ -1,4 +1,5 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using GalaSoft.MvvmLight.Messaging;
@@ -10,9 +11,9 @@ using HandyControlDemo.Window;
 
 namespace HandyControlDemo.UserControl
 {
-    public partial class NoUserContent
+    public partial class NonClientAreaContent
     {
-        public NoUserContent()
+        public NonClientAreaContent()
         {
             InitializeComponent();
         }
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml
similarity index 96%
rename from src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml
rename to src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml
index 39028576..134ac7ba 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml
@@ -1,4 +1,4 @@
-<Grid x:Class="HandyControlDemo.UserControl.NoUserContent"
+<Grid x:Class="HandyControlDemo.UserControl.NonClientAreaContent"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
@@ -110,6 +110,9 @@
                 </MenuItem>
             </MenuItem>
         </Menu>
+        <Border Margin="10,0,0,0" VerticalAlignment="Center" CornerRadius="2" Padding="10,4" Background="{DynamicResource SecondaryRegionBrush}">
+            <TextBlock FontWeight="Bold" Text="{Binding VersionInfo}" VerticalAlignment="Center" Foreground="{DynamicResource PrimaryTextBrush}"/>
+        </Border>
     </StackPanel>
     <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" hc:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
     <Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonConfig}" HorizontalOffset="-28" Name="PopupConfig" VerticalOffset="6" StaysOpen="False">
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
similarity index 62%
rename from src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs
rename to src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
index 977ddc7b..6bce0358 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NoUserViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
@@ -7,8 +7,13 @@ using HandyControlDemo.Tools;
 
 namespace HandyControlDemo.ViewModel
 {
-    public class NoUserViewModel : ViewModelBase
+    public class NonClientAreaViewModel : ViewModelBase
     {
+        public NonClientAreaViewModel()
+        {
+            VersionInfo = VersionHelper.GetVersion();
+        }
+
         public RelayCommand<string> OpenViewCmd => new Lazy<RelayCommand<string>>(() =>
             new RelayCommand<string>(OpenView)).Value;
 
@@ -18,5 +23,17 @@ namespace HandyControlDemo.ViewModel
             Messenger.Default.Send(true, MessageToken.FullSwitch);
             Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{viewName}"), MessageToken.LoadShowContent);
         }
+
+        private string _versionInfo;
+
+        public string VersionInfo
+        {
+            get => _versionInfo;
+#if NET40
+            set => Set(nameof(VersionInfo), ref _versionInfo, value);
+#else
+            set => Set(ref _versionInfo, value);
+#endif
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
index e1c1c49c..6c1ba828 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
@@ -33,7 +33,7 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<BadgeDemoViewModel>();
             SimpleIoc.Default.Register<SideMenuDemoViewModel>();
             SimpleIoc.Default.Register<TabControlDemoViewModel>();
-            SimpleIoc.Default.Register<NoUserViewModel>();
+            SimpleIoc.Default.Register<NonClientAreaViewModel>();
             SimpleIoc.Default.Register<CardDemoViewModel>();
             SimpleIoc.Default.Register<SpriteDemoViewModel>();
             SimpleIoc.Default.Register<NotificationDemoViewModel>();
@@ -87,7 +87,7 @@ namespace HandyControlDemo.ViewModel
 
         public TabControlDemoViewModel TabControlDemo => new TabControlDemoViewModel(SimpleIoc.Default.GetInstance<DataService>());
 
-        public NoUserViewModel NoUser => SimpleIoc.Default.GetInstance<NoUserViewModel>();
+        public NonClientAreaViewModel NoUser => SimpleIoc.Default.GetInstance<NonClientAreaViewModel>();
 
         public CardDemoViewModel CardDemo => new CardDemoViewModel(SimpleIoc.Default.GetInstance<DataService>());
 
diff --git a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
index 4e80379a..1cefe8ee 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
@@ -1,6 +1,5 @@
-using System.Diagnostics;
-using System.Reflection;
-using System.Windows;
+using System.Windows;
+using HandyControlDemo.Tools;
 
 namespace HandyControlDemo.Window
 {
@@ -11,27 +10,8 @@ namespace HandyControlDemo.Window
             InitializeComponent();
 
             DataContext = this;
-
-            var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location);
-            CopyRight = versionInfo.LegalCopyright;
-#if NET40
-            var netVersion = "NET 40";
-#elif NET45
-            var netVersion = "NET 45";
-#elif NET462
-            var netVersion = "NET 462";
-#elif NET47
-            var netVersion = "NET 47";
-#elif NET48
-            var netVersion = "NET 48";
-#elif NET5_0
-            var netVersion = "NET 50";
-#elif NETCOREAPP3_0
-            var netVersion = "CORE 30";
-#elif NETCOREAPP3_1
-            var netVersion = "CORE 31";
-#endif
-            Version = $"v {versionInfo.FileVersion} {netVersion}";
+            CopyRight = VersionHelper.GetCopyright();
+            Version = VersionHelper.GetVersion();
         }
 
         public static readonly DependencyProperty CopyRightProperty = DependencyProperty.Register(