feat: v1.3.7 change request header

minkostaev · May 28, 2024 · 31ee049 · 31ee049
1 parent 9dc4369
commit 31ee049
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 19 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -86,13 +86,11 @@ jobs:
         cd ${{ env.Proj_Name }}
         #dotnet publish ShortcutsGrid.csproj /p:PublishProfile="Win System"
         #copy "bin\Win System\net8.0-windows\publish\win-x64\Win System.exe" ..\\${{ env.Test_Proj_Dir }}\\TestResults
-        copy "Resources\ListCsv\Win Admin.csv" ..\\${{ env.Test_Proj_Dir }}\\TestResults
-        copy "Resources\ListCsv\Win System.csv" ..\\${{ env.Test_Proj_Dir }}\\TestResults
-        copy "Resources\ListCsv\Virtual Machines.csv" ..\\${{ env.Test_Proj_Dir }}\\TestResults
         $exes = "Win System","Win Admin","Office","Utils","Browsers","Connections","Disk Tools","Audio","Image","Video","Hardware","Virtual Machines","Programming","Games"
         foreach ($name in $exes)
         { dotnet publish ShortcutsGrid.csproj /p:PublishProfile="$name"
-        copy "bin\$name\net8.0-windows\publish\win-x64\$name.exe" ..\\${{ env.Test_Proj_Dir }}\\TestResults }
+        copy "bin\$name\net8.0-windows\publish\win-x64\$name.exe" ..\\${{ env.Test_Proj_Dir }}\\TestResults
+        copy "Resources\ListCsv\$name.csv" ..\\${{ env.Test_Proj_Dir }}\\TestResults }
 
     # Upload artifacts in the ations section
     - name: Upload artifacts

diff --git a/ShortcutsGrid/Models/AppValues.cs b/ShortcutsGrid/Models/AppValues.cs
@@ -12,8 +12,6 @@ internal static class AppValues
     public static string? ExeDir => Environment.CurrentDirectory;
     public static string? ExeName => Path.GetFileNameWithoutExtension(ExePath);
 
-    public static string? ProjectName => AppDomain.CurrentDomain.FriendlyName;//"ShortcutsGrid";
-
     public static string? AppVersion
     {
         get

diff --git a/ShortcutsGrid/Models/Shortcut.cs b/ShortcutsGrid/Models/Shortcut.cs
@@ -15,10 +15,7 @@ public ImageSource? Image
     {
         get
         {
-            if (_image == null)
-            {
-                _image = ImageUtilities.GetImageFromPaths(ImgPath, ExePath);
-            }
+            _image ??= ImageUtilities.GetImageFromPaths(ImgPath, ExePath);
             return _image;
         }
     }

diff --git a/ShortcutsGrid/Resources/ListCsv/Audio.csv b/ShortcutsGrid/Resources/ListCsv/Audio.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Browsers.csv b/ShortcutsGrid/Resources/ListCsv/Browsers.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Connections.csv b/ShortcutsGrid/Resources/ListCsv/Connections.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Disk Tools.csv b/ShortcutsGrid/Resources/ListCsv/Disk Tools.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Games.csv b/ShortcutsGrid/Resources/ListCsv/Games.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Hardware.csv b/ShortcutsGrid/Resources/ListCsv/Hardware.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Image.csv b/ShortcutsGrid/Resources/ListCsv/Image.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Office.csv b/ShortcutsGrid/Resources/ListCsv/Office.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Programming.csv b/ShortcutsGrid/Resources/ListCsv/Programming.csv
diff --git a/ShortcutsGrid/Resources/ListCsv/Video.csv b/ShortcutsGrid/Resources/ListCsv/Video.csv
diff --git a/ShortcutsGrid/Services/ShowShortcuts.cs b/ShortcutsGrid/Services/ShowShortcuts.cs
@@ -51,7 +51,7 @@ public static void WaitForResponseOnClose(MainWindow window)
         {
             { exitRequest ? "null" : "Desktop-Machine", machine.Hash },
             { "Desktop-Value", AppValues.LastExecuted },
-            { "Desktop-Version", $"{AppValues.ProjectName}|{AppValues.AppVersion}" }
+            { "Desktop-Version", $"ShortcutsGrid|{AppValues.AppVersion}" }
         };
         var requestManager = new RequestManager(headers!);
         string jsonString = JsonSerializer.Serialize(machine);
@@ -67,7 +67,7 @@ public static void Load(MainWindow window)
 
         var shortcuts = ReadShortcuts.FileToShortcuts();
 
-        shortcuts.Add(new Shortcut() { AppName = "Drag or Close", ImgPath = AppValues.CloseDragImage, Tag = AppValues.CloseDragId });
+        shortcuts.Add(new Models.Shortcut() { AppName = "Drag or Close", ImgPath = AppValues.CloseDragImage, Tag = AppValues.CloseDragId });
 
         foreach (var shortcut in shortcuts)
         {

diff --git a/ShortcutsGrid/ShortcutsGrid.csproj b/ShortcutsGrid/ShortcutsGrid.csproj
@@ -7,9 +7,9 @@
     <UseWPF>true</UseWPF>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <ApplicationIcon>Resources\web-browser-128.ico</ApplicationIcon>
-    <AssemblyVersion>1.3.6.0</AssemblyVersion>
-    <FileVersion>1.3.6.0</FileVersion>
-    <VersionPrefix>1.3.6</VersionPrefix>
+    <AssemblyVersion>1.3.7.0</AssemblyVersion>
+    <FileVersion>1.3.7.0</FileVersion>
+    <VersionPrefix>1.3.7</VersionPrefix>
     <VersionSuffix>$([System.DateTime]::UtcNow.ToString(yyyy-MM-dd))</VersionSuffix>
   </PropertyGroup>
 
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Forms.Wpf.Mls.Tools" Version="1.0.10" />
+    <PackageReference Include="Forms.Wpf.Mls.Tools" Version="1.0.11" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.5" />
   </ItemGroup>