feat: net8

minkostaev · Mar 21, 2024 · 11e2de6 · 11e2de6
1 parent de208d0
commit 11e2de6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 42 deletions.
diff --git a/ShortcutsGrid.Tests/ShortcutsGrid.Tests.csproj b/ShortcutsGrid.Tests/ShortcutsGrid.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
@@ -16,12 +16,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JustMock" Version="2022.3.1109.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="Moq" Version="4.18.3" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="JustMock" Version="2024.1.124.247" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/ShortcutsGrid/MainWindow.xaml.cs b/ShortcutsGrid/MainWindow.xaml.cs
@@ -26,7 +26,7 @@ public MainWindow()
         {
             ///endTimer.Stop();
             ///var elapsedMs = endTimer.ElapsedMilliseconds;
-            AppValues.MongoShortcutsGrid.MachineAdded();
+            ///AppValues.MongoShortcutsGrid.MachineAdded();
         };
 
         AppValues.MainWin = this;

diff --git a/ShortcutsGrid/Models/AppValues.cs b/ShortcutsGrid/Models/AppValues.cs
@@ -1,6 +1,5 @@
 namespace ShortcutsGrid.Models;
 
-using Extended.DB;
 using System;
 using System.IO;
 using System.Reflection;
@@ -54,17 +53,4 @@ public static void Exit()
         Application.Current.Shutdown();
     }
 
-    private static MongoShortcutsGrid? _mongoShortcutsGrid;
-    public static MongoShortcutsGrid MongoShortcutsGrid
-    {
-        get
-        {
-            if (_mongoShortcutsGrid == null)
-            {
-                _mongoShortcutsGrid = new MongoShortcutsGrid();
-            }
-            return _mongoShortcutsGrid;
-        }
-    }
-
 }
diff --git a/ShortcutsGrid/Models/Shortcut.cs b/ShortcutsGrid/Models/Shortcut.cs
@@ -3,11 +3,11 @@
 using Services.Image;
 using System.Windows.Media;
 
-public class Shortcut : Extended.Models.Shortcut
+public class Shortcut
 {
-    ///public string ExePath { get; set; } = string.Empty;
-    ///public string AppName { get; set; } = string.Empty;
-    ///public string? ImgPath { get; set; } = string.Empty;//ImgPath or Base64String
+    public string ExePath { get; set; } = string.Empty;
+    public string AppName { get; set; } = string.Empty;
+    public string? ImgPath { get; set; } = string.Empty;//ImgPath or Base64String
     public object? Tag { get; set; }//Helper property
 
     private ImageSource? _image;

diff --git a/ShortcutsGrid/ShortcutsGrid.csproj b/ShortcutsGrid/ShortcutsGrid.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <ApplicationIcon>Resources\web-browser-128.ico</ApplicationIcon>
-    <AssemblyVersion>1.2.4.0</AssemblyVersion>
-    <FileVersion>1.2.4.0</FileVersion>
-    <VersionPrefix>1.2.4</VersionPrefix>
+    <AssemblyVersion>1.3.1.0</AssemblyVersion>
+    <FileVersion>1.3.1.0</FileVersion>
+    <VersionPrefix>1.3.1</VersionPrefix>
     <VersionSuffix>$([System.DateTime]::UtcNow.ToString(yyyy-MM-dd))</VersionSuffix>
   </PropertyGroup>
 
@@ -18,17 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="[2.15.1]" />
-    <PackageReference Include="System.Drawing.Common" Version="[6.0.0]" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="ShortcutsGrid.Extended">
-      <HintPath>..\Resources\ShortcutsGrid.Extended.dll</HintPath>
-    </Reference>
-    <Reference Include="ShortcutsGrid.Nexum">
-      <HintPath>..\Resources\ShortcutsGrid.Nexum.dll</HintPath>
-    </Reference>
+    <PackageReference Include="System.Drawing.Common" Version="8.0.3" />
   </ItemGroup>
 
 </Project>