From 7dc9c11c3e868f86ca0ad9d2edf2ec002796a47a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 3 Apr 2019 23:40:54 +0800
Subject: [PATCH] support for .NET Core 3.0
---
HandyControl-Core3.0.sln | 31 +++
HandyControl/Controls/Other/NotifyIcon.cs | 2 +-
HandyControl/HandyControl-Core3.0.csproj | 15 ++
HandyControlDemo/App.xaml.cs | 2 +
.../HandyControlDemo-Core3.0.csproj | 215 ++++++++++++++++++
.../UserControl/Main/NoUserContent.xaml.cs | 2 +-
6 files changed, 265 insertions(+), 2 deletions(-)
create mode 100644 HandyControl-Core3.0.sln
create mode 100644 HandyControl/HandyControl-Core3.0.csproj
create mode 100644 HandyControlDemo/HandyControlDemo-Core3.0.csproj
diff --git a/HandyControl-Core3.0.sln b/HandyControl-Core3.0.sln
new file mode 100644
index 00000000..44947b64
--- /dev/null
+++ b/HandyControl-Core3.0.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl-Core3.0", "HandyControl\HandyControl-Core3.0.csproj", "{0233495D-82C7-486B-9B86-68BD75A24B7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo-Core3.0", "HandyControlDemo\HandyControlDemo-Core3.0.csproj", "{1D3A48E3-B998-4320-BB45-B94D4067E557}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0233495D-82C7-486B-9B86-68BD75A24B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0233495D-82C7-486B-9B86-68BD75A24B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0233495D-82C7-486B-9B86-68BD75A24B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0233495D-82C7-486B-9B86-68BD75A24B7A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1D3A48E3-B998-4320-BB45-B94D4067E557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1D3A48E3-B998-4320-BB45-B94D4067E557}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1D3A48E3-B998-4320-BB45-B94D4067E557}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1D3A48E3-B998-4320-BB45-B94D4067E557}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {6C8B9B9F-B396-4C31-BA28-11BCB1ED94C5}
+ EndGlobalSection
+EndGlobal
diff --git a/HandyControl/Controls/Other/NotifyIcon.cs b/HandyControl/Controls/Other/NotifyIcon.cs
index 080cc919..fa1598a5 100644
--- a/HandyControl/Controls/Other/NotifyIcon.cs
+++ b/HandyControl/Controls/Other/NotifyIcon.cs
@@ -277,7 +277,7 @@ namespace HandyControl.Controls
}
else
{
- switch (lparam.ToInt32())
+ switch (lparam.ToInt64())
{
case NativeMethods.WM_LBUTTONDBLCLK:
WmMouseDown(MouseButton.Left, 2);
diff --git a/HandyControl/HandyControl-Core3.0.csproj b/HandyControl/HandyControl-Core3.0.csproj
new file mode 100644
index 00000000..d5a328b8
--- /dev/null
+++ b/HandyControl/HandyControl-Core3.0.csproj
@@ -0,0 +1,15 @@
+
+
+ netcoreapp3.0
+ true
+ HandyControl
+ HandyControl
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControlDemo/App.xaml.cs b/HandyControlDemo/App.xaml.cs
index 4be12a85..493daf1e 100644
--- a/HandyControlDemo/App.xaml.cs
+++ b/HandyControlDemo/App.xaml.cs
@@ -27,7 +27,9 @@ namespace HandyControlDemo
UpdateSkin(GlobalData.Config.Skin);
}
+#if !Core
BlurWindow.SystemVersionInfo = CommonHelper.GetSystemVersionInfo();
+#endif
}
protected override void OnExit(ExitEventArgs e)
diff --git a/HandyControlDemo/HandyControlDemo-Core3.0.csproj b/HandyControlDemo/HandyControlDemo-Core3.0.csproj
new file mode 100644
index 00000000..ff67f4b0
--- /dev/null
+++ b/HandyControlDemo/HandyControlDemo-Core3.0.csproj
@@ -0,0 +1,215 @@
+
+
+ WinExe
+ netcoreapp3.0
+ true
+ HandyControlDemo
+ HandyControlDemo
+ Resources\Img\icon.ico
+
+
+ TRACE;Core
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs b/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
index acb4e8b4..8815da97 100644
--- a/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
+++ b/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
@@ -30,7 +30,7 @@ namespace HandyControlDemo.UserControl
if (!b) return true;
GlobalData.Config.Lang = tag;
GlobalData.Save();
- Process.Start(Assembly.GetExecutingAssembly().Location);
+ Process.Start(Process.GetCurrentProcess().MainModule.FileName);
Application.Current.Shutdown();
return true;
});