Update project to .NET 8

reagcz · Oct 12, 2024 · 02f23a9 · 02f23a9
1 parent 6f84426
commit 02f23a9
Show file tree

Hide file tree

Showing 32 changed files with 35 additions and 206 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -14,7 +14,7 @@ jobs:
     env:
       App_Packages_Archive: IdeapadToolkit.zip
       License_Path: IdeapadToolkit\Properties\PublishProfiles\3RD_PARTY_LICENSES.txt
-      App_Publish_Directory: bin\Release\net6.0-windows\publish\win-x64
+      App_Publish_Directory: bin\Release\net8.0-windows\publish\win-x64
       App_Project_Directory: IdeapadToolkit\
       Solution_Path: IdeapadToolkit.sln
       Project_Path: IdeapadToolkit\IdeapadToolkit.csproj
@@ -29,10 +29,10 @@ jobs:
         fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
 
     # Install the .NET Core workload
-    - name: Install .NET Core
+    - name: Install .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '8.0.x'
 
     # Add  MsBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe

diff --git a/IdeapadToolkit/App.xaml.cs b/IdeapadToolkit/App.xaml.cs
@@ -1,18 +1,11 @@
-using Hardcodet.Wpf.TaskbarNotification;
-using IdeapadToolkit.Models;
-using IdeapadToolkit.Services;
+using IdeapadToolkit.Services;
 using IdeapadToolkit.ViewModels;
 using IdeapadToolkit.Views;
 using SimpleInjector;
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
 using Serilog;
 using System.Windows;
 using Serilog.Core;

diff --git a/IdeapadToolkit/Helpers/BooleanToVisibilityConverter.cs b/IdeapadToolkit/Helpers/BooleanToVisibilityConverter.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows;
 using System.Globalization;

diff --git a/IdeapadToolkit/Helpers/Win32.cs b/IdeapadToolkit/Helpers/Win32.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 using static IdeapadToolkit.Services.UEFISettingsService;
 
 namespace IdeapadToolkitService.Helpers

diff --git a/IdeapadToolkit/IdeapadToolkit.csproj b/IdeapadToolkit/IdeapadToolkit.csproj
@@ -2,23 +2,22 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
     <AnalysisLevel>latest-recommended</AnalysisLevel>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Common" Version="8.0.0" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
+    <PackageReference Include="CommunityToolkit.Common" Version="8.3.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.0" />
     <PackageReference Include="ModernWpfUI" Version="0.9.7-preview.2" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="SimpleInjector" Version="5.4.1" />
+    <PackageReference Include="Serilog" Version="4.0.2" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="SimpleInjector" Version="5.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IdeapadToolkit/MainWindow.xaml.cs b/IdeapadToolkit/MainWindow.xaml.cs
@@ -1,19 +1,7 @@
 using IdeapadToolkit.Services;
 using IdeapadToolkit.Views;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace IdeapadToolkit
 {

diff --git a/IdeapadToolkit/Models/CChargingMode.cs b/IdeapadToolkit/Models/CChargingMode.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IdeapadToolkit.Models
 {

diff --git a/IdeapadToolkit/Models/CIntelligentCooling.cs b/IdeapadToolkit/Models/CIntelligentCooling.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IdeapadToolkit.Models
 {

diff --git a/IdeapadToolkit/Models/CUSBBatteryCharger.cs b/IdeapadToolkit/Models/CUSBBatteryCharger.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IdeapadToolkit.Models
 {

diff --git a/IdeapadToolkit/Models/CUSBCharger.cs b/IdeapadToolkit/Models/CUSBCharger.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IdeapadToolkit.Models
 {

diff --git a/IdeapadToolkit/Models/ChargingMode.cs b/IdeapadToolkit/Models/ChargingMode.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IdeapadToolkit.Models
+namespace IdeapadToolkit.Models
 {
     public enum ChargingMode
     {

diff --git a/IdeapadToolkit/Models/PowerPlanEnum.cs b/IdeapadToolkit/Models/PowerPlanEnum.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IdeapadToolkit.Models
+namespace IdeapadToolkit.Models
 {
     public enum PowerPlan
     {

diff --git a/IdeapadToolkit/Properties/PublishProfiles/FolderProfile.pubxml b/IdeapadToolkit/Properties/PublishProfiles/FolderProfile.pubxml
@@ -6,10 +6,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net6.0-windows\publish\win-x64\</PublishDir>
+    <PublishDir>bin\Release\net8.0-windows\publish\win-x64\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>

diff --git a/IdeapadToolkit/Services/AdministratorPermissionService.cs b/IdeapadToolkit/Services/AdministratorPermissionService.cs
@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
 using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IdeapadToolkit.Services
 {

diff --git a/IdeapadToolkit/Services/IAdministratorPermissionService.cs b/IdeapadToolkit/Services/IAdministratorPermissionService.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IdeapadToolkit.Services
+namespace IdeapadToolkit.Services
 {
     public interface IAdministratorPermissionService
     {

diff --git a/IdeapadToolkit/Services/ILenovoPowerSettingsService.cs b/IdeapadToolkit/Services/ILenovoPowerSettingsService.cs
@@ -1,9 +1,4 @@
 using IdeapadToolkit.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IdeapadToolkit.Services
 {

diff --git a/IdeapadToolkit/Services/INavigationService.cs b/IdeapadToolkit/Services/INavigationService.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows;
 

diff --git a/IdeapadToolkit/Services/IRunOnStartupService.cs b/IdeapadToolkit/Services/IRunOnStartupService.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IdeapadToolkit.Services
+namespace IdeapadToolkit.Services
 {
     public interface IRunOnStartupService
     {

diff --git a/IdeapadToolkit/Services/IUEFISettingsService.cs b/IdeapadToolkit/Services/IUEFISettingsService.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IdeapadToolkit.Services
+namespace IdeapadToolkit.Services
 {
     public interface IUEFISettingsService
     {

diff --git a/IdeapadToolkit/Services/LenovoPowerSettingsService.cs b/IdeapadToolkit/Services/LenovoPowerSettingsService.cs
@@ -1,13 +1,6 @@
 using IdeapadToolkit.Models;
-using Microsoft.VisualBasic;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace IdeapadToolkit.Services
 {

diff --git a/IdeapadToolkit/Services/NavigationService.cs b/IdeapadToolkit/Services/NavigationService.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows;
 using SimpleInjector;

diff --git a/IdeapadToolkit/Services/RunOnStartupService.cs b/IdeapadToolkit/Services/RunOnStartupService.cs
@@ -1,10 +1,5 @@
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IdeapadToolkit.Services
 {

diff --git a/IdeapadToolkit/Services/UEFISettingsService.cs b/IdeapadToolkit/Services/UEFISettingsService.cs
@@ -1,12 +1,7 @@
 using IdeapadToolkitService.Helpers;
 using Serilog;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Documents;
 
 namespace IdeapadToolkit.Services
 {

diff --git a/IdeapadToolkit/ViewModels/LenovoSettingsViewModel.cs b/IdeapadToolkit/ViewModels/LenovoSettingsViewModel.cs
@@ -5,9 +5,6 @@
 using ModernWpf.Controls;
 using Serilog;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace IdeapadToolkit.ViewModels

diff --git a/IdeapadToolkit/ViewModels/SettingsViewModel.cs b/IdeapadToolkit/ViewModels/SettingsViewModel.cs
@@ -2,10 +2,6 @@
 using IdeapadToolkit.Services;
 using ModernWpf.Controls;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IdeapadToolkit.ViewModels
 {

diff --git a/IdeapadToolkit/Views/MainPage.xaml.cs b/IdeapadToolkit/Views/MainPage.xaml.cs
@@ -1,19 +1,5 @@
 using IdeapadToolkit.ViewModels;
-using ModernWpf.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace IdeapadToolkit.Views
 {

diff --git a/IdeapadToolkit/Views/SettingsPage.xaml.cs b/IdeapadToolkit/Views/SettingsPage.xaml.cs
@@ -1,18 +1,4 @@
 using IdeapadToolkit.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace IdeapadToolkit.Views
 {

diff --git a/IdeapadToolkit/Views/TrayIconView.xaml.cs b/IdeapadToolkit/Views/TrayIconView.xaml.cs
@@ -1,19 +1,7 @@
-using Hardcodet.Wpf.TaskbarNotification;
-using IdeapadToolkit.ViewModels;
+using IdeapadToolkit.ViewModels;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace IdeapadToolkit.Views
 {