diff --git a/H.NotifyIcon.sln b/H.NotifyIcon.sln
index f83c61b..b47d475 100644
--- a/H.NotifyIcon.sln
+++ b/H.NotifyIcon.sln
@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.NotifyIcon.Uno", "src\lib
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.NotifyIcon.Uno.WinUI", "src\libs\H.NotifyIcon.Uno.WinUI\H.NotifyIcon.Uno.WinUI.csproj", "{81360AA9-0DD6-4A49-8D6E-05AD3160391E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.NotifyIcon.Apps.Uno.Skia.Wpf", "src\apps\H.NotifyIcon.Apps.Uno.Skia.Wpf\H.NotifyIcon.Apps.Uno.Skia.Wpf.csproj", "{ABD64093-CFBC-4561-83FC-595DD16EF742}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{40478FA5-043C-415E-984B-2DBACCBB97A6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.NotifyIcon.IntegrationTests", "src\tests\H.NotifyIcon.IntegrationTests\H.NotifyIcon.IntegrationTests.csproj", "{EE945F20-366B-4273-878F-F8969992B8CC}"
@@ -50,8 +48,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.NotifyIcon.Apps.Wpf.Windo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.NotifyIcon.Apps.WinUI.Windowless", "src\apps\H.NotifyIcon.Apps.WinUI.Windowless\H.NotifyIcon.Apps.WinUI.Windowless.csproj", "{73850D1A-5384-49EC-8115-6FA27E6423D0}"
EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "H.NotifyIcon.Apps.Uno.Shared", "src\apps\H.NotifyIcon.Apps.Uno.Shared\H.NotifyIcon.Apps.Uno.Shared.shproj", "{418D1399-62C8-481B-A954-517B189ECA70}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrimmingHelper", "src\apps\TrimmingHelper\TrimmingHelper.csproj", "{A04E983D-5631-4C68-B34A-796970E060C0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.GeneratedIcons.System.Drawing", "src\libs\H.GeneratedIcons.System.Drawing\H.GeneratedIcons.System.Drawing.csproj", "{A4A97F4E-71C1-42FA-84DC-7D4A41079A13}"
@@ -178,22 +174,6 @@ Global
{81360AA9-0DD6-4A49-8D6E-05AD3160391E}.Release|x64.Build.0 = Release|Any CPU
{81360AA9-0DD6-4A49-8D6E-05AD3160391E}.Release|x86.ActiveCfg = Release|Any CPU
{81360AA9-0DD6-4A49-8D6E-05AD3160391E}.Release|x86.Build.0 = Release|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Debug|arm64.ActiveCfg = Debug|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Debug|arm64.Build.0 = Debug|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Debug|x64.ActiveCfg = Debug|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Debug|x64.Build.0 = Debug|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Debug|x86.ActiveCfg = Debug|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Debug|x86.Build.0 = Debug|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Release|Any CPU.Build.0 = Release|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Release|arm64.ActiveCfg = Release|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Release|arm64.Build.0 = Release|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Release|x64.ActiveCfg = Release|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Release|x64.Build.0 = Release|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Release|x86.ActiveCfg = Release|Any CPU
- {ABD64093-CFBC-4561-83FC-595DD16EF742}.Release|x86.Build.0 = Release|Any CPU
{EE945F20-366B-4273-878F-F8969992B8CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE945F20-366B-4273-878F-F8969992B8CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE945F20-366B-4273-878F-F8969992B8CC}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -374,13 +354,11 @@ Global
{665598EE-10CA-4842-B169-F5A6EF483C7F} = {52FA15AF-CAE7-4822-9975-F5E812EDEF33}
{85B419CD-F64D-459E-A287-2C4775E75FD6} = {FCF55611-6E25-4F1E-8E88-705896171E71}
{81360AA9-0DD6-4A49-8D6E-05AD3160391E} = {FCF55611-6E25-4F1E-8E88-705896171E71}
- {ABD64093-CFBC-4561-83FC-595DD16EF742} = {52FA15AF-CAE7-4822-9975-F5E812EDEF33}
{EE945F20-366B-4273-878F-F8969992B8CC} = {40478FA5-043C-415E-984B-2DBACCBB97A6}
{DC947B8B-E363-4104-A38A-0C3D08047D82} = {52FA15AF-CAE7-4822-9975-F5E812EDEF33}
{B95580F0-895E-499B-BBE6-78258069DE02} = {52FA15AF-CAE7-4822-9975-F5E812EDEF33}
{50653194-B56C-4270-85FD-9FF0A2C331AD} = {52FA15AF-CAE7-4822-9975-F5E812EDEF33}
{73850D1A-5384-49EC-8115-6FA27E6423D0} = {52FA15AF-CAE7-4822-9975-F5E812EDEF33}
- {418D1399-62C8-481B-A954-517B189ECA70} = {52FA15AF-CAE7-4822-9975-F5E812EDEF33}
{A04E983D-5631-4C68-B34A-796970E060C0} = {52FA15AF-CAE7-4822-9975-F5E812EDEF33}
{A4A97F4E-71C1-42FA-84DC-7D4A41079A13} = {FCF55611-6E25-4F1E-8E88-705896171E71}
{EECF393D-0F55-4BFE-AEA8-7FD90383C05D} = {FCF55611-6E25-4F1E-8E88-705896171E71}
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..eafb435
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+ "sdk": {
+ "rollForward": "latestMajor",
+ "allowPrerelease": false
+ }
+}
\ No newline at end of file
diff --git a/src/apps/H.NotifyIcon.Apps.Console/H.NotifyIcon.Apps.Console.csproj b/src/apps/H.NotifyIcon.Apps.Console/H.NotifyIcon.Apps.Console.csproj
index 54021e1..1eb39af 100644
--- a/src/apps/H.NotifyIcon.Apps.Console/H.NotifyIcon.Apps.Console.csproj
+++ b/src/apps/H.NotifyIcon.Apps.Console/H.NotifyIcon.Apps.Console.csproj
@@ -6,6 +6,7 @@
preview
enable
enable
+ true
@@ -13,7 +14,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/apps/H.NotifyIcon.Apps.Maui/H.NotifyIcon.Apps.Maui.csproj b/src/apps/H.NotifyIcon.Apps.Maui/H.NotifyIcon.Apps.Maui.csproj
index 4bc3c9a..9763023 100644
--- a/src/apps/H.NotifyIcon.Apps.Maui/H.NotifyIcon.Apps.Maui.csproj
+++ b/src/apps/H.NotifyIcon.Apps.Maui/H.NotifyIcon.Apps.Maui.csproj
@@ -62,7 +62,7 @@
-
+
diff --git a/src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/H.NotifyIcon.Apps.Uno.Skia.Wpf.csproj b/src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/H.NotifyIcon.Apps.Uno.Skia.Wpf.csproj
index 525e409..c346ee0 100644
--- a/src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/H.NotifyIcon.Apps.Uno.Skia.Wpf.csproj
+++ b/src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/H.NotifyIcon.Apps.Uno.Skia.Wpf.csproj
@@ -28,9 +28,9 @@
-
-
-
+
+
+
diff --git a/src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/MainWindow.xaml.cs b/src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/MainWindow.xaml.cs
index cb50e16..2e5a725 100644
--- a/src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/MainWindow.xaml.cs
+++ b/src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/MainWindow.xaml.cs
@@ -1,4 +1,6 @@
-namespace H.NotifyIcon.Apps.Skia;
+using Uno.UI.Runtime.Skia.Wpf;
+
+namespace H.NotifyIcon.Apps.Skia;
public partial class MainWindow : System.Windows.Window
{
@@ -6,6 +8,6 @@ public MainWindow()
{
InitializeComponent();
- Root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new global::H.NotifyIcon.Apps.App());
+ Root.Content = new WpfHost(Dispatcher, () => new global::H.NotifyIcon.Apps.App());
}
}
diff --git a/src/apps/H.NotifyIcon.Apps.WinUI.Windowless/H.NotifyIcon.Apps.WinUI.Windowless.csproj b/src/apps/H.NotifyIcon.Apps.WinUI.Windowless/H.NotifyIcon.Apps.WinUI.Windowless.csproj
index c28f78c..e39edf4 100644
--- a/src/apps/H.NotifyIcon.Apps.WinUI.Windowless/H.NotifyIcon.Apps.WinUI.Windowless.csproj
+++ b/src/apps/H.NotifyIcon.Apps.WinUI.Windowless/H.NotifyIcon.Apps.WinUI.Windowless.csproj
@@ -23,11 +23,11 @@
-
+
-
+
diff --git a/src/apps/H.NotifyIcon.Apps.WinUI/H.NotifyIcon.Apps.WinUI.csproj b/src/apps/H.NotifyIcon.Apps.WinUI/H.NotifyIcon.Apps.WinUI.csproj
index e47b214..553310f 100644
--- a/src/apps/H.NotifyIcon.Apps.WinUI/H.NotifyIcon.Apps.WinUI.csproj
+++ b/src/apps/H.NotifyIcon.Apps.WinUI/H.NotifyIcon.Apps.WinUI.csproj
@@ -24,11 +24,11 @@
-
+
-
+
diff --git a/src/apps/H.NotifyIcon.Apps.Wpf/H.NotifyIcon.Apps.Wpf.csproj b/src/apps/H.NotifyIcon.Apps.Wpf/H.NotifyIcon.Apps.Wpf.csproj
index 397bd46..6eb3999 100644
--- a/src/apps/H.NotifyIcon.Apps.Wpf/H.NotifyIcon.Apps.Wpf.csproj
+++ b/src/apps/H.NotifyIcon.Apps.Wpf/H.NotifyIcon.Apps.Wpf.csproj
@@ -25,7 +25,7 @@
all
compile; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/apps/TrimmingHelper/TrimmingHelper.csproj b/src/apps/TrimmingHelper/TrimmingHelper.csproj
index b2156c7..c7c89ce 100644
--- a/src/apps/TrimmingHelper/TrimmingHelper.csproj
+++ b/src/apps/TrimmingHelper/TrimmingHelper.csproj
@@ -11,12 +11,10 @@
-
-
diff --git a/src/libs/Directory.Build.props b/src/libs/Directory.Build.props
index 83dc754..7c5534c 100644
--- a/src/libs/Directory.Build.props
+++ b/src/libs/Directory.Build.props
@@ -39,7 +39,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/libs/H.GeneratedIcons.SkiaSharp/H.GeneratedIcons.SkiaSharp.csproj b/src/libs/H.GeneratedIcons.SkiaSharp/H.GeneratedIcons.SkiaSharp.csproj
index 19d917d..fffd002 100644
--- a/src/libs/H.GeneratedIcons.SkiaSharp/H.GeneratedIcons.SkiaSharp.csproj
+++ b/src/libs/H.GeneratedIcons.SkiaSharp/H.GeneratedIcons.SkiaSharp.csproj
@@ -1,7 +1,7 @@
- net4.6.2;netstandard2.0;net6.0;net7.0;net8.0
+ net4.6.2;netstandard2.0;net6.0;net8.0
@@ -9,7 +9,7 @@
-
+
diff --git a/src/libs/H.GeneratedIcons.System.Drawing/H.GeneratedIcons.System.Drawing.csproj b/src/libs/H.GeneratedIcons.System.Drawing/H.GeneratedIcons.System.Drawing.csproj
index 90b4152..a748f68 100644
--- a/src/libs/H.GeneratedIcons.System.Drawing/H.GeneratedIcons.System.Drawing.csproj
+++ b/src/libs/H.GeneratedIcons.System.Drawing/H.GeneratedIcons.System.Drawing.csproj
@@ -1,15 +1,27 @@
- net4.6.2;netstandard2.0;net6.0;net7.0;net8.0
+ net4.6.2;netstandard2.0;net6.0;net8.0
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libs/H.NotifyIcon.Maui/H.NotifyIcon.Maui.csproj b/src/libs/H.NotifyIcon.Maui/H.NotifyIcon.Maui.csproj
index 1d13a8e..3869c1c 100644
--- a/src/libs/H.NotifyIcon.Maui/H.NotifyIcon.Maui.csproj
+++ b/src/libs/H.NotifyIcon.Maui/H.NotifyIcon.Maui.csproj
@@ -3,7 +3,7 @@
net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0
- $(TargetFrameworks);net8.0-tizen
+
true
$(DefineConstants);HAS_PLATFORM_CODE;HAS_MAUI
$(DefineConstants);HAS_MAUI_WINUI
@@ -44,7 +44,7 @@ popups, context menus, and balloon messages. It can be used directly in code or
-
+
all
compile; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/libs/H.NotifyIcon.Shared/TaskbarIcon.Properties.cs b/src/libs/H.NotifyIcon.Shared/TaskbarIcon.Properties.cs
index 0b567cc..fb5af54 100644
--- a/src/libs/H.NotifyIcon.Shared/TaskbarIcon.Properties.cs
+++ b/src/libs/H.NotifyIcon.Shared/TaskbarIcon.Properties.cs
@@ -2,7 +2,12 @@
#if !MACOS
[DependencyProperty("Id",
- Description = "Gets or sets the TrayIcon Id. Use this for second TrayIcon in same app.", Category = CategoryName)]
+ Description = "Unique ID." +
+ "Gets or sets the TrayIcon Id." +
+ "Use this for second TrayIcon in same app." +
+ "It will be used by the system to store your TrayIcon settings," +
+ "so it is recommended to make it fixed and unique for each application TrayIcon, not random." +
+ "Note: Windows associates a Guid with the path of the binary, so you must use the new Guid when you change the path.", Category = CategoryName)]
[DependencyProperty("CustomName",
Description = "Gets or sets the TrayIcon Name. Use this for second TrayIcon in same app.", Category = CategoryName)]
#endif
@@ -32,6 +37,7 @@ partial void OnIdChanged(Guid newValue)
partial void OnCustomNameChanged(string? newValue)
{
TrayIcon.UpdateName(newValue ?? string.Empty);
+ Id = TrayIcon.Id;
}
#endif
diff --git a/src/libs/H.NotifyIcon.Shared/TaskbarIcon.cs b/src/libs/H.NotifyIcon.Shared/TaskbarIcon.cs
index c2e930a..a266db0 100644
--- a/src/libs/H.NotifyIcon.Shared/TaskbarIcon.cs
+++ b/src/libs/H.NotifyIcon.Shared/TaskbarIcon.cs
@@ -36,17 +36,6 @@ public partial class TaskbarIcon : FrameworkElement
[SupportedOSPlatform("windows5.1.2600")]
public bool IsCreated => TrayIcon.IsCreated;
- ///
- /// Unique ID.
- /// It will be used by the system to store your TrayIcon settings,
- /// so it is recommended to make it fixed and unique for each application TrayIcon, not random.
- ///
- ///
- /// Note: Windows associates a Guid with the path of the binary, so you must use the new Guid when you change the path.
- ///
- [SupportedOSPlatform("windows5.1.2600")]
- public Guid? Id => IsCreated ? TrayIcon.Id : null;
-
#endregion
#region Constructors
@@ -63,6 +52,7 @@ public TaskbarIcon()
#endif
TrayIcon = new TrayIcon();
+ Id = TrayIcon.Id;
Loaded += (_, _) =>
{
try
diff --git a/src/libs/H.NotifyIcon.Uno.WinUI/H.NotifyIcon.Uno.WinUI.csproj b/src/libs/H.NotifyIcon.Uno.WinUI/H.NotifyIcon.Uno.WinUI.csproj
index 79f0ba9..d8ae07a 100644
--- a/src/libs/H.NotifyIcon.Uno.WinUI/H.NotifyIcon.Uno.WinUI.csproj
+++ b/src/libs/H.NotifyIcon.Uno.WinUI/H.NotifyIcon.Uno.WinUI.csproj
@@ -6,17 +6,17 @@
$(DefineConstants);HAS_WINUI;IS_PACKABLE;HAS_PLATFORM_CODE
$(DefineConstants);HAS_UNO
enable
- $(NoWarn);Uno0001;CA1010;CA1031;CS8002;CS0114;CS3009;CA1063;CA1513;CA2000;CA1416;NETSDK1206
+ $(NoWarn);Uno0001;Uno0002;CA1010;CA1031;CS8002;CS0114;CS3009;CA1063;CA1513;CA2000;CA1416;NETSDK1206
true
true
-
+
-
+
@@ -29,7 +29,7 @@ popups, context menus, and balloon messages. It can be used directly in code or
-
+
all
compile; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/libs/H.NotifyIcon.Uno/H.NotifyIcon.Uno.csproj b/src/libs/H.NotifyIcon.Uno/H.NotifyIcon.Uno.csproj
index 2292f2e..76b46b0 100644
--- a/src/libs/H.NotifyIcon.Uno/H.NotifyIcon.Uno.csproj
+++ b/src/libs/H.NotifyIcon.Uno/H.NotifyIcon.Uno.csproj
@@ -4,13 +4,13 @@
net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst
false
$(DefineConstants);HAS_UNO;IS_PACKABLE;HAS_PLATFORM_CODE
- $(NoWarn);Uno0001;CA1010;CA1031;CS8002;CA1416;CA1063;CA1513;CA2000;CS0114;CS3009
+ $(NoWarn);Uno0001;Uno0002;CA1010;CA1031;CS8002;CA1416;CA1063;CA1513;CA2000;CS0114;CS3009
enable
true
-
+
@@ -23,7 +23,7 @@ popups, context menus, and balloon messages. It can be used directly in code or
-
+
all
compile; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/libs/H.NotifyIcon.WinUI/H.NotifyIcon.WinUI.csproj b/src/libs/H.NotifyIcon.WinUI/H.NotifyIcon.WinUI.csproj
index 8c5ad40..b25e3f6 100644
--- a/src/libs/H.NotifyIcon.WinUI/H.NotifyIcon.WinUI.csproj
+++ b/src/libs/H.NotifyIcon.WinUI/H.NotifyIcon.WinUI.csproj
@@ -1,7 +1,7 @@
- net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0
+ net8.0-windows10.0.17763.0
true
$(DefineConstants);HAS_WINUI;IS_PACKABLE;HAS_PLATFORM_CODE
$(NoWarn);CS3021;CA1031;CS8002;CA1513;NETSDK1206
@@ -11,7 +11,7 @@
-
+
diff --git a/src/libs/H.NotifyIcon.Wpf/H.NotifyIcon.Wpf.csproj b/src/libs/H.NotifyIcon.Wpf/H.NotifyIcon.Wpf.csproj
index bc9af58..94028b6 100644
--- a/src/libs/H.NotifyIcon.Wpf/H.NotifyIcon.Wpf.csproj
+++ b/src/libs/H.NotifyIcon.Wpf/H.NotifyIcon.Wpf.csproj
@@ -1,7 +1,7 @@
- net4.6.2;net6.0-windows;net7.0-windows;net8.0-windows
+ net4.6.2;net8.0-windows
true
$(DefineConstants);HAS_WPF;HAS_PLATFORM_CODE
Hardcodet.Wpf.TaskbarNotification
diff --git a/src/libs/H.NotifyIcon/H.NotifyIcon.csproj b/src/libs/H.NotifyIcon/H.NotifyIcon.csproj
index fab5976..0c9202c 100644
--- a/src/libs/H.NotifyIcon/H.NotifyIcon.csproj
+++ b/src/libs/H.NotifyIcon/H.NotifyIcon.csproj
@@ -1,7 +1,7 @@
- net4.6.2;netstandard2.0;net6.0;net7.0;net8.0
+ net4.6.2;netstandard2.0;net6.0;net8.0
$(NoWarn);CA1031;CA1003;CA1502;CS3016;CS8981;CA1513
@@ -30,11 +30,19 @@
all
compile; build; native; contentfiles; analyzers; buildtransitive
-
+
all
+
+
+
+
+
+
+
+
diff --git a/src/tests/H.NotifyIcon.IntegrationTests/H.NotifyIcon.IntegrationTests.csproj b/src/tests/H.NotifyIcon.IntegrationTests/H.NotifyIcon.IntegrationTests.csproj
index 89f549c..0a22b18 100644
--- a/src/tests/H.NotifyIcon.IntegrationTests/H.NotifyIcon.IntegrationTests.csproj
+++ b/src/tests/H.NotifyIcon.IntegrationTests/H.NotifyIcon.IntegrationTests.csproj
@@ -2,12 +2,13 @@
net4.8;net8.0-windows
+ true
-
-
-
+
+
+
@@ -21,7 +22,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+