From edae732facddad296bc2957b70d69e109c8df0dc Mon Sep 17 00:00:00 2001
From: retr0volkov <68907954+retr0volkov@users.noreply.github.com>
Date: Wed, 16 Jul 2025 10:23:31 +0300
Subject: [PATCH] Bug fixes

---
 Utils/DataSerialization.cs                    |  19 +++++-
 ViewModels/MainWindowViewModel.cs             |  10 +--
 Views/EditEquipmentDialog.axaml               |   9 +--
 Views/EditEquipmentDialog.axaml.cs            |   6 --
 Views/EditPointDialog.axaml                   |   2 +-
 Views/EditPointDialog.axaml.cs                |  57 +++++++-----------
 Views/NewEquipmentDialog.axaml                |   2 +-
 Views/NewPointDialog.axaml                    |   2 +-
 Views/NewPointDialog.axaml.cs                 |   2 +-
 .../net8.0/Avalonia/Resources.Inputs.cache    |   2 +-
 obj/Debug/net8.0/Avalonia/resources           | Bin 473632 -> 473854 bytes
 obj/Debug/net8.0/GazpromApp.AssemblyInfo.cs   |   2 +-
 .../GazpromApp.AssemblyInfoInputs.cache       |   2 +-
 obj/Debug/net8.0/GazpromApp.assets.cache      | Bin 77739 -> 77739 bytes
 .../GazpromApp.csproj.AssemblyReference.cache | Bin 26563 -> 35117 bytes
 obj/GazpromApp.csproj.nuget.dgspec.json       |   4 +-
 obj/project.assets.json                       |   4 +-
 obj/project.nuget.cache                       |   2 +-
 obj/project.packagespec.json                  |   2 +-
 obj/rider.project.model.nuget.info            |   2 +-
 obj/rider.project.restore.info                |   2 +-
 21 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/Utils/DataSerialization.cs b/Utils/DataSerialization.cs
index bbfade0..e66489a 100644
--- a/Utils/DataSerialization.cs
+++ b/Utils/DataSerialization.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Text.Json;
 using GazpromApp.Models;
 
@@ -8,12 +9,26 @@ public static class DataSerialization
 {
     private static void SaveData(string path, string data)
     {
-        System.IO.File.WriteAllText(path, data);
+        if (!File.Exists(path))
+        {
+            File.WriteAllText(path, data);
+            return;
+        }
+
+        var dir = Path.GetDirectoryName(path) ?? "";
+        var fileName = Path.GetFileNameWithoutExtension(path);
+        var ext = Path.GetExtension(path);
+        var index = 1;
+    
+        while (File.Exists(Path.Combine(dir, $"{fileName} ({index}){ext}")))
+            index++;
+        
+        File.WriteAllText(Path.Combine(dir, $"{fileName} ({index}){ext}"), data);
     }
 
     private static string LoadData(string path)
     {
-        var text = System.IO.File.ReadAllText(path);
+        var text = File.ReadAllText(path);
         return text;
     }
 
diff --git a/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs
index d596a5e..33ec53a 100644
--- a/ViewModels/MainWindowViewModel.cs
+++ b/ViewModels/MainWindowViewModel.cs
@@ -82,12 +82,14 @@ public partial class MainWindowViewModel : ViewModelBase
                     Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
         });
         
+        if (files.Count < 1) return;
+        
         IsLoading = true;
         
         foreach (var file in files)
         {
             var url = file.Path.AbsolutePath;
-            var decoded = HttpUtility.HtmlDecode(url);
+            var decoded = HttpUtility.UrlDecode(url);
             var point = DataSerialization.LoadPoint(decoded);
             point?.SetPropertyParents();
 
@@ -113,11 +115,9 @@ public partial class MainWindowViewModel : ViewModelBase
                 await w.StorageProvider.TryGetFolderFromPathAsync(
                     Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
         });
+        if (folder.Count != 1) return;
         foreach (var point in Points)
-        {
-            DataSerialization.SavePoint(point.GetPoint(), Path.Combine(HttpUtility.HtmlDecode(folder[0].Path.AbsolutePath), point.Name + ".json") );
-        }
-        
+            DataSerialization.SavePoint(point.GetPoint(), Path.Combine(HttpUtility.UrlDecode(folder[0].Path.AbsolutePath), point.Name + ".json") );
     }
     
     // Visual and other properties
diff --git a/Views/EditEquipmentDialog.axaml b/Views/EditEquipmentDialog.axaml
index 7454a60..6077be6 100644
--- a/Views/EditEquipmentDialog.axaml
+++ b/Views/EditEquipmentDialog.axaml
@@ -49,7 +49,7 @@
     <TextBlock Grid.Column="0" Grid.Row="1" Margin="20,4,0,4" 
                Text="{Binding Description}"
                IsVisible="{Binding !IsDescriptionEditing}"/>
-    <TextBox Grid.Column="0" Grid.Row="1" Margin="12,4,0,4" 
+    <TextBox Grid.Column="0" Grid.Row="1" Margin="12,4,0,4" AcceptsReturn="True" TextWrapping="Wrap"
              Text="{Binding Description}"
              IsVisible="{Binding IsDescriptionEditing}"/>
     <Button Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" Margin="10"
@@ -73,12 +73,12 @@
                     <Image Stretch="Uniform" Width="200" Height="200" Grid.RowSpan="3" Grid.ColumnSpan="5" 
                            Source="{Binding FileName}" />
                     <Button Grid.Row="1" Grid.Column="1" Width="20" Height="20"
-                            Command="{Binding #Root.((vm:EditPointDialogViewModel)DataContext).ViewImageCommand}"
+                            Command="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).ViewImageCommand}"
                             CommandParameter="{Binding .}">
                       <Image Width="16" Height="16" Source="avares://GazpromApp/Assets/ic_fluent_eye_show_24_filled (Custom) 16.png"/>
                     </Button>
                     <Button Grid.Row="1" Grid.Column="3" Width="20" Height="20"
-                            Command="{Binding #Root.((vm:EditPointDialogViewModel)DataContext).DeleteImageCommand}"
+                            Command="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).DeleteImageCommand}"
                             CommandParameter="{Binding .}">
                       <Image Width="16" Height="16" Source="avares://GazpromApp/Assets/ic_fluent_delete_24_filled (Custom) 16.png"/>
                     </Button>
@@ -137,7 +137,8 @@
                     
                         <TextBlock Grid.Column="2" Margin="16,0,0,0" Text="Период: " FontSize="18" VerticalAlignment="Center"/>
                         <NumericUpDown Grid.Column="3" AllowSpin="True" Width="120" VerticalAlignment="Center"
-                                       Value="{Binding PeriodValue}"/>
+                                       Value="{Binding PeriodValue}"
+                                       Minimum="0"/>
                         <ComboBox Grid.Column="4" Width="100" VerticalAlignment="Center" Margin="4,0,0,0"
                                   ItemsSource="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).AllPeriods}"
                                   SelectedItem="{Binding PeriodType, Mode=TwoWay}"
diff --git a/Views/EditEquipmentDialog.axaml.cs b/Views/EditEquipmentDialog.axaml.cs
index 1557ed6..a7d7ff3 100644
--- a/Views/EditEquipmentDialog.axaml.cs
+++ b/Views/EditEquipmentDialog.axaml.cs
@@ -35,10 +35,6 @@ public partial class EditEquipmentDialog : Window
             m.Reply(dialog.ShowDialog<ErrorViewModel?>(w));
         });
         
-        // new property dialog
-        
-        // edit property dialog
-        
         // complete editing equipment
         WeakReferenceMessenger.Default.Register<EditEquipmentDialog, EditEquipmentDone>(this, static (w, m) =>
         {
@@ -56,8 +52,6 @@ public partial class EditEquipmentDialog : Window
     {
         WeakReferenceMessenger.Default.Unregister<ViewImageMessage>(this);
         WeakReferenceMessenger.Default.Unregister<ErrorMessage>(this);
-        //
-        //
         WeakReferenceMessenger.Default.Unregister<EditEquipmentDone>(this);
     }
 }
\ No newline at end of file
diff --git a/Views/EditPointDialog.axaml b/Views/EditPointDialog.axaml
index a7cf584..5084c78 100644
--- a/Views/EditPointDialog.axaml
+++ b/Views/EditPointDialog.axaml
@@ -47,7 +47,7 @@
     <TextBlock Grid.Column="0" Grid.Row="1" Margin="20,4,0,4" 
                Text="{Binding Description}"
                IsVisible="{Binding !IsDescriptionEditing}"/>
-    <TextBox Grid.Column="0"  Grid.Row="1" Margin="12,4,0,4" 
+    <TextBox Grid.Column="0"  Grid.Row="1" Margin="12,4,0,4" AcceptsReturn="True" TextWrapping="Wrap"
              Text="{Binding Description}"
              IsVisible="{Binding IsDescriptionEditing}"/>
     <Button Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" Margin="10"
diff --git a/Views/EditPointDialog.axaml.cs b/Views/EditPointDialog.axaml.cs
index ffe246e..6108110 100644
--- a/Views/EditPointDialog.axaml.cs
+++ b/Views/EditPointDialog.axaml.cs
@@ -61,30 +61,7 @@ public partial class EditPointDialog : Window
         // re registering error when new equipment done
         WeakReferenceMessenger.Default.Register<EditPointDialog, NewEquipmentDone>(this, (_, _) =>
         {
-            WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
-            {
-                var dialog = new ErrorView
-                {
-                    DataContext = m.Error
-                };
-                m.Reply(dialog.ShowDialog<ErrorViewModel?>(w));
-            });
-        });
-        
-        // re registering view image and error view
-        WeakReferenceMessenger.Default.Register<EditPointDialog, EditEquipmentDone>(this, (_, _) =>
-        {
-            WeakReferenceMessenger.Default.Register<EditPointDialog, ViewImageMessage>(this, static (w, m) =>
-            {
-                var dialog = new ImageView
-                {
-                    DataContext = m.Image
-                };
-                m.Reply(dialog.ShowDialog<ImageViewModel?>(w));
-            });
-
-            try
-            {
+            if (!WeakReferenceMessenger.Default.IsRegistered<ErrorMessage>(this))
                 WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
                 {
                     var dialog = new ErrorView
@@ -93,16 +70,30 @@ public partial class EditPointDialog : Window
                     };
                     m.Reply(dialog.ShowDialog<ErrorViewModel?>(w));
                 });
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
         });
         
-        // new property
-        
-        // edit property
+        // re registering view image and error view
+        WeakReferenceMessenger.Default.Register<EditPointDialog, EditEquipmentDone>(this, (_, _) =>
+        {
+            if (!WeakReferenceMessenger.Default.IsRegistered<ViewImageMessage>(this))
+                WeakReferenceMessenger.Default.Register<EditPointDialog, ViewImageMessage>(this, static (w, m) =>
+                {
+                    var dialog = new ImageView
+                    {
+                        DataContext = m.Image
+                    };
+                    m.Reply(dialog.ShowDialog<ImageViewModel?>(w));
+                });
+            if (!WeakReferenceMessenger.Default.IsRegistered<ErrorMessage>(this))
+                WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
+                {
+                    var dialog = new ErrorView
+                    {
+                        DataContext = m.Error
+                    };
+                    m.Reply(dialog.ShowDialog<ErrorViewModel?>(w));
+                });
+        });
         
         // complete editing point
         WeakReferenceMessenger.Default.Register<EditPointDialog, EditPointDone>(this, static (w, m) =>
@@ -123,8 +114,6 @@ public partial class EditPointDialog : Window
         WeakReferenceMessenger.Default.Unregister<ErrorMessage>(this);
         WeakReferenceMessenger.Default.Unregister<NewEquipmentMessage>(this);
         WeakReferenceMessenger.Default.Unregister<EditEquipmentMessage>(this);
-        // new prop
-        // edit prop
         WeakReferenceMessenger.Default.Unregister<EditPointDone>(this);
     }
 }
\ No newline at end of file
diff --git a/Views/NewEquipmentDialog.axaml b/Views/NewEquipmentDialog.axaml
index 5886c05..647f83c 100644
--- a/Views/NewEquipmentDialog.axaml
+++ b/Views/NewEquipmentDialog.axaml
@@ -31,7 +31,7 @@
     <TextBlock Grid.Column="0" Grid.Row="2" Margin="8" Text="Изображение: "/>
     <TextBox Grid.Column="1" Grid.Row="0" Margin="8"
              Text="{Binding Name}"/>
-    <TextBox Grid.Column="1" Grid.Row="1" Margin="8"
+    <TextBox Grid.Column="1" Grid.Row="1" Margin="8" AcceptsReturn="True" TextWrapping="Wrap"
              Text="{Binding Description}"/>
     
     <Panel Grid.Column="1" Grid.Row="2" Margin="8" IsVisible="{Binding !IsImagesEmpty}">
diff --git a/Views/NewPointDialog.axaml b/Views/NewPointDialog.axaml
index db22666..5f851d3 100644
--- a/Views/NewPointDialog.axaml
+++ b/Views/NewPointDialog.axaml
@@ -31,7 +31,7 @@
     <TextBlock Grid.Column="0" Grid.Row="2" Margin="8" Text="Изображение: "/>
     <TextBox Grid.Column="1" Grid.Row="0" Margin="8"
              Text="{Binding Name}"/>
-    <TextBox Grid.Column="1" Grid.Row="1" Margin="8"
+    <TextBox Grid.Column="1" Grid.Row="1" Margin="8" AcceptsReturn="True" TextWrapping="Wrap"
              Text="{Binding Description}"/>
     <Panel Grid.Column="1" Grid.Row="2" Margin="8" IsVisible="{Binding !IsImagesEmpty}">
       <ScrollViewer>
diff --git a/Views/NewPointDialog.axaml.cs b/Views/NewPointDialog.axaml.cs
index eb72e86..deb150c 100644
--- a/Views/NewPointDialog.axaml.cs
+++ b/Views/NewPointDialog.axaml.cs
@@ -12,7 +12,7 @@ public partial class NewPointDialog : Window
     {
         InitializeComponent();
 
-        // done entering new point
+        // done entering a new point
         WeakReferenceMessenger.Default.Register<NewPointDialog, NewPointDone>(this, static (w, m) =>
         {
             w.Close(m.Point);
diff --git a/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
index e48d932..b15b07b 100644
--- a/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
+++ b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
@@ -1 +1 @@
-6ec01d8198a7aa89515263050c4105434cbcd2354fb50cf2ffbc3673c60121f8
+ce571eaa8794cd8018cfc316b7aa3a875ff0192541a3e5a99ac1c0b1fe0464bc
diff --git a/obj/Debug/net8.0/Avalonia/resources b/obj/Debug/net8.0/Avalonia/resources
index bcae832a093b9b8b734e6237ff87bc07a0c09b32..f03dac41d8cf95fae3855ec38759bd513e5906e5 100644
GIT binary patch
delta 356
zcmZ4RMdsgEnGN6A8IMl>&aS}9v5k!(ZL$o96jR=d$rc>4jB_W4amX`?eVJU&p~lI?
z!_Lsd&%hu(eU&A<G<TmgJHsad1_mj8#p(Sf>=H~3I?c~G+MjVS0x=U1GXpUT5VLN7
z#=$nVTi7u<IkljqI4HHGv?$M3DWs@0b^67dY@*W}rP$@B|CVCso&J9^8~^lsPuRq^
zpPs^&$vS<)8aB1<e&^WQ7(q<k?SId+ePr4GZ2_Au=k&)<*%YU5n9at)<(rw8nOmA`
zt7I^J;}SNx?GCHhjO9qSPMc@@yDMz(T}2e|I&?eGp?drT6oGsrx;;jV{Rlq*XP|<X

delta 191
zcmezORc65#nGN6A851XeXIEfdvXza&Zn6xA6w{;UlPx%883iYYamX`ueV$y-p{8HP
z&CZa_&%hw9AC{R~UaaqzS{{&}nOEYHnV6HGu9sMmn45D`ik;!400V=RzT)&;Q+5fa
zMcU2JING0aFaj|X5HkZY3lOtzf5yQ!wR`*j6KvHy+tn7b>2glLzJ*O<dckrw*6mAH
ju^G#O<g$XM^GdVJZQmfxuE!5%P6skYw_9nmAK?c8$j3oY

diff --git a/obj/Debug/net8.0/GazpromApp.AssemblyInfo.cs b/obj/Debug/net8.0/GazpromApp.AssemblyInfo.cs
index 1fbef8a..12cbd37 100644
--- a/obj/Debug/net8.0/GazpromApp.AssemblyInfo.cs
+++ b/obj/Debug/net8.0/GazpromApp.AssemblyInfo.cs
@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("GazpromApp")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7a34fc2dbb087fdbf1bea9de2367b1627dbfd934")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d8cb1c0597162160d03e7987cc85991c880988b8")]
 [assembly: System.Reflection.AssemblyProductAttribute("GazpromApp")]
 [assembly: System.Reflection.AssemblyTitleAttribute("GazpromApp")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/net8.0/GazpromApp.AssemblyInfoInputs.cache b/obj/Debug/net8.0/GazpromApp.AssemblyInfoInputs.cache
index 50a2907..879cf21 100644
--- a/obj/Debug/net8.0/GazpromApp.AssemblyInfoInputs.cache
+++ b/obj/Debug/net8.0/GazpromApp.AssemblyInfoInputs.cache
@@ -1 +1 @@
-79ee0a1c89f7354058711501fd55995c28018c56cfa0b0de53a84dfaced70957
+77f531bfc5aeafe36631b408a11c11c294e011bb2a474f23c97785d02864a447
diff --git a/obj/Debug/net8.0/GazpromApp.assets.cache b/obj/Debug/net8.0/GazpromApp.assets.cache
index 7ad99843e1844145f4cbbb3e2b7cb272cc0b3847..ed4907724079c04dde274737ce7996db4b221b3e 100644
GIT binary patch
delta 54
zcmV-60LlNW-vq1Q1Sn8TM?nk#002)&9BbMTb&atNfGy6;>6W%~Vg4))yZWM4r@9_@
MR1bkDwI~6DFH6o9{{R30

delta 54
zcmV-60LlNW-vq1Q1Sn8TM?nk#007$FG#Vy2UaP|sXu~MRpC7zlA0HN7G0<4GzvbV*
MpL~HRwI~6DFFtq`{Qv*}

diff --git a/obj/Debug/net8.0/GazpromApp.csproj.AssemblyReference.cache b/obj/Debug/net8.0/GazpromApp.csproj.AssemblyReference.cache
index 775bba34242091924000b83b98256c54ec128bfa..0b5b0527852f63dddadaf30569d7eb2ab671a4c7 100644
GIT binary patch
literal 35117
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
LbjaXnc{b@ka^^ij

delta 156
zcmZ2GiRtip#tkPJCtr0JV2qgjQCwl7hUsQ2wg8BTH&DcRvmIv`<79tdfyssjE|cF_
za&E2>jD!euSZho^ZzQwXM4}8LAmk4bm@F3$60iWvE?3Eh$cCG^Y);dP0dp9Az-Dvm
RL5$jLXs`^S=(Ukk7yv}IHv|9x

diff --git a/obj/GazpromApp.csproj.nuget.dgspec.json b/obj/GazpromApp.csproj.nuget.dgspec.json
index 0960794..7c1e2cd 100644
--- a/obj/GazpromApp.csproj.nuget.dgspec.json
+++ b/obj/GazpromApp.csproj.nuget.dgspec.json
@@ -44,7 +44,7 @@
           "auditLevel": "low",
           "auditMode": "direct"
         },
-        "SdkAnalysisLevel": "9.0.200"
+        "SdkAnalysisLevel": "9.0.300"
       },
       "frameworks": {
         "net8.0": {
@@ -117,7 +117,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json"
         }
       }
     }
diff --git a/obj/project.assets.json b/obj/project.assets.json
index 20f27c8..ba04f12 100644
--- a/obj/project.assets.json
+++ b/obj/project.assets.json
@@ -4799,7 +4799,7 @@
         "auditLevel": "low",
         "auditMode": "direct"
       },
-      "SdkAnalysisLevel": "9.0.200"
+      "SdkAnalysisLevel": "9.0.300"
     },
     "frameworks": {
       "net8.0": {
@@ -4872,7 +4872,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json"
       }
     }
   }
diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache
index 3c05ff2..0128f97 100644
--- a/obj/project.nuget.cache
+++ b/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "hnfkdEFJuA8=",
+  "dgSpecHash": "tG1MV/2SQjY=",
   "success": true,
   "projectFilePath": "D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj",
   "expectedPackageFiles": [
diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json
index a0d8d9c..694713c 100644
--- a/obj/project.packagespec.json
+++ b/obj/project.packagespec.json
@@ -1 +1 @@
-"restore":{"projectUniqueName":"D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj","projectName":"GazpromApp","projectPath":"D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj","outputPath":"D:\\RiderProjects\\GazpromApp\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.200"}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"AnimatedImage.Avalonia":{"target":"Package","version":"[2.0.0, )"},"Avalonia":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Controls.ItemsRepeater":{"target":"Package","version":"[11.1.5, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.2, )"},"AvaloniaUI.DiagnosticsSupport":{"target":"Package","version":"[2.0.4, )"},"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.2.1, )"},"Microsoft.EntityFrameworkCore":{"target":"Package","version":"[9.0.6, )"},"Microsoft.EntityFrameworkCore.Design":{"include":"Runtime, Build, Native, ContentFiles, Analyzers, BuildTransitive","suppressParent":"All","target":"Package","version":"[9.0.6, )"},"Microsoft.EntityFrameworkCore.Sqlite":{"target":"Package","version":"[9.0.6, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json"}}
\ No newline at end of file
+"restore":{"projectUniqueName":"D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj","projectName":"GazpromApp","projectPath":"D:\\RiderProjects\\GazpromApp\\GazpromApp.csproj","outputPath":"D:\\RiderProjects\\GazpromApp\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.300"}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"AnimatedImage.Avalonia":{"target":"Package","version":"[2.0.0, )"},"Avalonia":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Controls.ItemsRepeater":{"target":"Package","version":"[11.1.5, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.2, )"},"AvaloniaUI.DiagnosticsSupport":{"target":"Package","version":"[2.0.4, )"},"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.2.1, )"},"Microsoft.EntityFrameworkCore":{"target":"Package","version":"[9.0.6, )"},"Microsoft.EntityFrameworkCore.Design":{"include":"Runtime, Build, Native, ContentFiles, Analyzers, BuildTransitive","suppressParent":"All","target":"Package","version":"[9.0.6, )"},"Microsoft.EntityFrameworkCore.Sqlite":{"target":"Package","version":"[9.0.6, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json"}}
\ No newline at end of file
diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info
index 6da9d2b..128aa41 100644
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17522225915601599
\ No newline at end of file
+17527364972202368
\ No newline at end of file
diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info
index 6da9d2b..128aa41 100644
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-17522225915601599
\ No newline at end of file
+17527364972202368
\ No newline at end of file