Skip to content

Commit

Permalink
feat: Maintain.
Browse files Browse the repository at this point in the history
  • Loading branch information
HavenDV committed Jul 10, 2024
1 parent b888dfa commit f582b4c
Show file tree
Hide file tree
Showing 22 changed files with 74 additions and 72 deletions.
22 changes: 0 additions & 22 deletions H.NotifyIcon.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"rollForward": "latestMajor",
"allowPrerelease": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

<ItemGroup>
<Using Remove="System.Net.Http" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
<PackageReference Include="H.Resources.Generator" Version="1.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="5.2.108" />
<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" Version="5.0.48" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="5.2.175" />
<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" Version="5.2.175" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.175" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
</ItemGroup>

Expand Down
6 changes: 4 additions & 2 deletions src/apps/H.NotifyIcon.Apps.Uno.Skia.Wpf/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
namespace H.NotifyIcon.Apps.Skia;
using Uno.UI.Runtime.Skia.Wpf;

namespace H.NotifyIcon.Apps.Skia;

public partial class MainWindow : System.Windows.Window
{
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());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions src/apps/TrimmingHelper/TrimmingHelper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@

<ItemGroup>
<ProjectReference Include="..\..\libs\H.NotifyIcon\H.NotifyIcon.csproj" />
<ProjectReference Include="..\..\libs\H.NotifyIcon.Uno.WinUI\H.NotifyIcon.Uno.WinUI.csproj" />
</ItemGroup>

<ItemGroup>
<TrimmerRootAssembly Include="H.NotifyIcon" />
<TrimmerRootAssembly Include="H.NotifyIcon.Uno.WinUI" />
</ItemGroup>

<PropertyGroup Label="Publish">
Expand Down
2 changes: 1 addition & 1 deletion src/libs/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</ItemGroup>

<ItemGroup Label="Source Link">
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net4.6.2;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net4.6.2;netstandard2.0;net6.0;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<Using Remove="System.Net.Http" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.6" />
<PackageReference Include="SkiaSharp" Version="2.88.8" />
</ItemGroup>

<PropertyGroup Label="NuGet">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net4.6.2;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net4.6.2;netstandard2.0;net6.0;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup Label="Usings">
<Using Remove="System.Net.Http" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net4.6.2'">
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
</ItemGroup>

<PropertyGroup Label="NuGet">
Expand Down
4 changes: 2 additions & 2 deletions src/libs/H.NotifyIcon.Maui/H.NotifyIcon.Maui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks>
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
<UseMaui>true</UseMaui>
<DefineConstants>$(DefineConstants);HAS_PLATFORM_CODE;HAS_MAUI</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041.0'">$(DefineConstants);HAS_MAUI_WINUI</DefineConstants>
Expand Down Expand Up @@ -44,7 +44,7 @@ popups, context menus, and balloon messages. It can be used directly in code or
</ItemGroup>

<ItemGroup>
<PackageReference Include="DependencyPropertyGenerator" Version="1.3.3">
<PackageReference Include="DependencyPropertyGenerator" Version="1.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
8 changes: 7 additions & 1 deletion src/libs/H.NotifyIcon.Shared/TaskbarIcon.Properties.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

#if !MACOS
[DependencyProperty<Guid>("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<string>("CustomName",
Description = "Gets or sets the TrayIcon Name. Use this for second TrayIcon in same app.", Category = CategoryName)]
#endif
Expand Down Expand Up @@ -32,6 +37,7 @@ partial void OnIdChanged(Guid newValue)
partial void OnCustomNameChanged(string? newValue)
{
TrayIcon.UpdateName(newValue ?? string.Empty);
Id = TrayIcon.Id;
}
#endif

Expand Down
12 changes: 1 addition & 11 deletions src/libs/H.NotifyIcon.Shared/TaskbarIcon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,6 @@ public partial class TaskbarIcon : FrameworkElement
[SupportedOSPlatform("windows5.1.2600")]
public bool IsCreated => TrayIcon.IsCreated;

/// <summary>
/// Unique ID. <br/>
/// 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.
/// </summary>
/// <remarks>
/// Note: Windows associates a Guid with the path of the binary, so you must use the new Guid when you change the path.
/// </remarks>
[SupportedOSPlatform("windows5.1.2600")]
public Guid? Id => IsCreated ? TrayIcon.Id : null;

#endregion

#region Constructors
Expand All @@ -63,6 +52,7 @@ public TaskbarIcon()
#endif

TrayIcon = new TrayIcon();
Id = TrayIcon.Id;
Loaded += (_, _) =>
{
try
Expand Down
8 changes: 4 additions & 4 deletions src/libs/H.NotifyIcon.Uno.WinUI/H.NotifyIcon.Uno.WinUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<DefineConstants>$(DefineConstants);HAS_WINUI;IS_PACKABLE;HAS_PLATFORM_CODE</DefineConstants>
<DefineConstants Condition=" '$(TargetFramework)' != 'net8.0-windows10.0.19041' ">$(DefineConstants);HAS_UNO</DefineConstants>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);Uno0001;CA1010;CA1031;CS8002;CS0114;CS3009;CA1063;CA1513;CA2000;CA1416;NETSDK1206</NoWarn>
<NoWarn>$(NoWarn);Uno0001;Uno0002;CA1010;CA1031;CS8002;CS0114;CS3009;CA1063;CA1513;CA2000;CA1416;NETSDK1206</NoWarn>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<EnableMsixTooling>true</EnableMsixTooling>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'net8.0-windows10.0.19041' ">
<PackageReference Include="Uno.WinUI" Version="5.0.48" />
<PackageReference Include="Uno.WinUI" Version="5.2.175" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows10.0.19041' ">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
</ItemGroup>

<PropertyGroup Label="NuGet">
Expand All @@ -29,7 +29,7 @@ popups, context menus, and balloon messages. It can be used directly in code or
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DependencyPropertyGenerator" Version="1.3.3">
<PackageReference Include="DependencyPropertyGenerator" Version="1.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions src/libs/H.NotifyIcon.Uno/H.NotifyIcon.Uno.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<SignAssembly>false</SignAssembly>
<DefineConstants>$(DefineConstants);HAS_UNO;IS_PACKABLE;HAS_PLATFORM_CODE</DefineConstants>
<NoWarn>$(NoWarn);Uno0001;CA1010;CA1031;CS8002;CA1416;CA1063;CA1513;CA2000;CS0114;CS3009</NoWarn>
<NoWarn>$(NoWarn);Uno0001;Uno0002;CA1010;CA1031;CS8002;CA1416;CA1063;CA1513;CA2000;CS0114;CS3009</NoWarn>
<Nullable>enable</Nullable>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.UI" Version="5.0.48" />
<PackageReference Include="Uno.UI" Version="5.2.175" />
</ItemGroup>

<PropertyGroup Label="NuGet">
Expand All @@ -23,7 +23,7 @@ popups, context menus, and balloon messages. It can be used directly in code or
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DependencyPropertyGenerator" Version="1.3.3">
<PackageReference Include="DependencyPropertyGenerator" Version="1.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/libs/H.NotifyIcon.WinUI/H.NotifyIcon.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
<UseWinUI>true</UseWinUI>
<DefineConstants>$(DefineConstants);HAS_WINUI;IS_PACKABLE;HAS_PLATFORM_CODE</DefineConstants>
<NoWarn>$(NoWarn);CS3021;CA1031;CS8002;CA1513;NETSDK1206</NoWarn>
Expand All @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
</ItemGroup>

<PropertyGroup Label="NuGet">
Expand Down
2 changes: 1 addition & 1 deletion src/libs/H.NotifyIcon.Wpf/H.NotifyIcon.Wpf.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net4.6.2;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net4.6.2;net8.0-windows</TargetFrameworks>

This comment has been minimized.

Copy link
@WilliamBrain

WilliamBrain Jul 17, 2024

why net6.0 and net7.0 was removed again?

This comment has been minimized.

Copy link
@HavenDV

HavenDV Jul 17, 2024

Author Owner

net6.0-windows It was clearly removed by mistake, but net7 has been out of support for 2 months now and I don’t see the point in it

This comment has been minimized.

Copy link
@WilliamBrain

WilliamBrain Jul 17, 2024

yes, but .net6.0 end of support is November 12, 2024, so still supported.

This comment has been minimized.

Copy link
@HavenDV

HavenDV Jul 17, 2024

Author Owner

Yes, I revert this in latest commit

<UseWPF>true</UseWPF>
<DefineConstants>$(DefineConstants);HAS_WPF;HAS_PLATFORM_CODE</DefineConstants>
<RootNamespace>Hardcodet.Wpf.TaskbarNotification</RootNamespace>
Expand Down
Loading

0 comments on commit f582b4c

Please sign in to comment.