diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin index 08a66b6..6884c64 100644 Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin differ diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin index 232f70f..43a312d 100644 Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin differ diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin index f69feef..220ccc1 100644 Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin differ diff --git a/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 b/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 index b910426..556726f 100644 Binary files a/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 and b/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/189fb1df-5c43-4b05-9ead-099e62a5ca02.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/189fb1df-5c43-4b05-9ead-099e62a5ca02.vsidx new file mode 100644 index 0000000..5848865 Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/189fb1df-5c43-4b05-9ead-099e62a5ca02.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2c2befbc-0d40-497d-954c-e3d9179cbc36.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2c2befbc-0d40-497d-954c-e3d9179cbc36.vsidx new file mode 100644 index 0000000..a6a2e74 Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2c2befbc-0d40-497d-954c-e3d9179cbc36.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/7883fc26-7e6f-4732-80d9-b9acc1e3371f.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/7883fc26-7e6f-4732-80d9-b9acc1e3371f.vsidx new file mode 100644 index 0000000..8c99302 Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/7883fc26-7e6f-4732-80d9-b9acc1e3371f.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/1f18dded-6859-4580-8f0f-47f8b916cb02.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/888d96cf-9515-40d4-8fc7-7da0c500333c.vsidx similarity index 73% rename from demo_blagodat/.vs/demo_blagodat/FileContentIndex/1f18dded-6859-4580-8f0f-47f8b916cb02.vsidx rename to demo_blagodat/.vs/demo_blagodat/FileContentIndex/888d96cf-9515-40d4-8fc7-7da0c500333c.vsidx index 574eb2f..7848a63 100644 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/1f18dded-6859-4580-8f0f-47f8b916cb02.vsidx and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/888d96cf-9515-40d4-8fc7-7da0c500333c.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/a232597f-5d2b-4c36-bd2d-f564a0b6b1ee.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/a232597f-5d2b-4c36-bd2d-f564a0b6b1ee.vsidx new file mode 100644 index 0000000..82ab0e0 Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/a232597f-5d2b-4c36-bd2d-f564a0b6b1ee.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/d1d2489d-fede-4787-9814-bdd93312a938.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/aaf018a0-d59a-4b01-b1f4-cc3159e5f84e.vsidx similarity index 57% rename from demo_blagodat/.vs/demo_blagodat/FileContentIndex/d1d2489d-fede-4787-9814-bdd93312a938.vsidx rename to demo_blagodat/.vs/demo_blagodat/FileContentIndex/aaf018a0-d59a-4b01-b1f4-cc3159e5f84e.vsidx index 8cce581..05d1df0 100644 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/d1d2489d-fede-4787-9814-bdd93312a938.vsidx and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/aaf018a0-d59a-4b01-b1f4-cc3159e5f84e.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/b92c50d9-e379-4528-9c10-1dffad60b15e.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/b92c50d9-e379-4528-9c10-1dffad60b15e.vsidx deleted file mode 100644 index 2aa3c62..0000000 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/b92c50d9-e379-4528-9c10-1dffad60b15e.vsidx and /dev/null differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/bfb5942e-088e-4759-8bf6-20aa63497761.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/bfb5942e-088e-4759-8bf6-20aa63497761.vsidx deleted file mode 100644 index 7f2f8d2..0000000 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/bfb5942e-088e-4759-8bf6-20aa63497761.vsidx and /dev/null differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/cec6b7bf-48de-443b-b05c-ffe6888169bb.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/cec6b7bf-48de-443b-b05c-ffe6888169bb.vsidx deleted file mode 100644 index 5c88e10..0000000 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/cec6b7bf-48de-443b-b05c-ffe6888169bb.vsidx and /dev/null differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a7cde9-6574-4924-a0fb-5ac8f44a939b.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a7cde9-6574-4924-a0fb-5ac8f44a939b.vsidx deleted file mode 100644 index 9060d03..0000000 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a7cde9-6574-4924-a0fb-5ac8f44a939b.vsidx and /dev/null differ diff --git a/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 b/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 index 7c1eb33..a30fa45 100644 Binary files a/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 and b/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 differ diff --git a/demo_blagodat/.vs/demo_blagodat/v17/.suo b/demo_blagodat/.vs/demo_blagodat/v17/.suo index d0cbf9b..d5abe64 100644 Binary files a/demo_blagodat/.vs/demo_blagodat/v17/.suo and b/demo_blagodat/.vs/demo_blagodat/v17/.suo differ diff --git a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json index 1b91d20..6638e32 100644 --- a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json +++ b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json @@ -3,8 +3,8 @@ "WorkspaceRootPath": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\functions\\deleteorder.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\deleteorder.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\models\\client.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:models\\client.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -27,14 +27,14 @@ { "$type": "Document", "DocumentIndex": 0, - "Title": "DeleteOrder.axaml.cs", - "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\DeleteOrder.axaml.cs", - "RelativeDocumentMoniker": "Functions\\DeleteOrder.axaml.cs", - "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\DeleteOrder.axaml.cs", - "RelativeToolTip": "Functions\\DeleteOrder.axaml.cs", - "ViewState": "AgIAABwAAAAAAAAAAAAAACkAAAAtAAAAAAAAAA==", + "Title": "Client.cs", + "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Models\\Client.cs", + "RelativeDocumentMoniker": "Models\\Client.cs", + "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Models\\Client.cs", + "RelativeToolTip": "Models\\Client.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAcAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-01T21:26:02.846Z", + "WhenOpened": "2025-03-09T19:24:32.315Z", "EditorCaption": "" } ] diff --git a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.json b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.json index 38b022e..6638e32 100644 --- a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.json +++ b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.json @@ -1,7 +1,12 @@ { "Version": 1, "WorkspaceRootPath": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\", - "Documents": [], + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\models\\client.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:models\\client.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], "DocumentGroupContainers": [ { "Orientation": 0, @@ -9,7 +14,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": -1, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -18,6 +23,19 @@ { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Client.cs", + "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Models\\Client.cs", + "RelativeDocumentMoniker": "Models\\Client.cs", + "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Models\\Client.cs", + "RelativeToolTip": "Models\\Client.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAcAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-09T19:24:32.315Z", + "EditorCaption": "" } ] } diff --git a/demo_blagodat/Functions/AddOrder.axaml b/demo_blagodat/Functions/AddOrder.axaml index 3482587..9ff5ee4 100644 --- a/demo_blagodat/Functions/AddOrder.axaml +++ b/demo_blagodat/Functions/AddOrder.axaml @@ -4,15 +4,30 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="demo_blagodat.CreateOrder" + xmlns:vm="using:demo_blagodat.Models" Title="Создание заказа"> - + - - - - + + + + + + + + + + + + + diff --git a/demo_blagodat/Functions/AddOrder.axaml.cs b/demo_blagodat/Functions/AddOrder.axaml.cs index 3880f67..78e6f97 100644 --- a/demo_blagodat/Functions/AddOrder.axaml.cs +++ b/demo_blagodat/Functions/AddOrder.axaml.cs @@ -4,6 +4,7 @@ using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using demo_blagodat.Models; using System; +using System.Collections.ObjectModel; using System.Linq; namespace demo_blagodat; @@ -12,62 +13,56 @@ public partial class CreateOrder : Window { public Order NewOrder = null; public Employee User; + static User11Context db = new User11Context(); + ObservableCollection ClientitemSource = new ObservableCollection(db.Clients); + public CreateOrder(Employee user) { InitializeComponent(); User = user; + ListCliets.ItemsSource = ClientitemSource; + + } + + private void ListBox_SelectionChanged(object? sender, Avalonia.Controls.SelectionChangedEventArgs e) + { + if (sender != null) + { + + } } private void createOrder(object sender, RoutedEventArgs e) { try { - string NameClient = TextNameClient.Text; + Client client = db.Clients.Where(it => it == sender).FirstOrDefault(); + int order_rental_time = int.Parse(TextOrderRentalTime.Text); DateOnly? order_closing_date = DateOnly.TryParse(TextOrderClosingDate.Text, out var Date) ? Date : null; - if (TextNameClient.Text != "") + if (TextOrderRentalTime.Text != "") { - if(TextOrderRentalTime.Text != "") + Order newOrder = new Order() { - using (User11Context db = new User11Context()) - { - Client? client = db.Clients.Where(it => it.ClientName == NameClient).FirstOrDefault(); - if (client != null) - { - Order newOrder = new Order() - { - OrderId = db.Orders.Max(o => o.OrderId) + 1, - OrderDate = DateOnly.FromDateTime(DateTime.Now), - OrderTime = TimeOnly.FromDateTime(DateTime.Now), - OrderClient = client.ClientCode, - OrderRentalTime = order_rental_time, - OrderClosingDate = order_closing_date, - OrderStatus = "", - }; - db.Orders.Add(newOrder); - db.SaveChanges(); + OrderId = db.Orders.Max(o => o.OrderId) + 1, + OrderDate = DateOnly.FromDateTime(DateTime.Now), + OrderTime = TimeOnly.FromDateTime(DateTime.Now), + OrderClient = client.ClientCode, + OrderRentalTime = order_rental_time, + OrderClosingDate = order_closing_date, + OrderStatus = "", + }; + db.Orders.Add(newOrder); + db.SaveChanges(); - NewOrder = newOrder; - MesAdd.Text = " "; - MesAddError.Text = ""; - } - else - { - MesAddError.Text = " "; - MesAdd.Text = ""; - } - } - } - else - { - MesAddError.Text = " "; - MesAdd.Text = ""; - } + NewOrder = newOrder; + MesAdd.Text = " "; + MesAddError.Text = ""; } else { - MesAddError.Text = " "; + MesAddError.Text = " "; MesAdd.Text = ""; } diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll index bede26a..9e183a5 100644 Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll differ diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe index 3e06df2..b1a52d9 100644 Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe differ diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb index dd87eb6..8bafa42 100644 Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb differ diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index ed99c6c..459dd7e 100644 --- a/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -ab5ec113c47cd0ed26726b590fad36b7976ff45256224af52e4ecd17831cc634 +7c092f63670d2db338546de4e905b570a22d6e6f19ed1870f85fe324f50fa70f diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll index bede26a..9e183a5 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll differ diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb index dd87eb6..8bafa42 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb and b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb differ diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/resources b/demo_blagodat/obj/Debug/net8.0/Avalonia/resources index c45bd95..c5cc53c 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/resources and b/demo_blagodat/obj/Debug/net8.0/Avalonia/resources differ diff --git a/demo_blagodat/obj/Debug/net8.0/apphost.exe b/demo_blagodat/obj/Debug/net8.0/apphost.exe index 3e06df2..b1a52d9 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/apphost.exe and b/demo_blagodat/obj/Debug/net8.0/apphost.exe differ diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs index d1fc15b..0182cbd 100644 --- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs +++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("demo_blagodat")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e1a0c1864ae93b140382bb5253f30e14f658b6bb")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00ae76a0ab3d956dbf5f59daa534e063baa7213b")] [assembly: System.Reflection.AssemblyProductAttribute("demo_blagodat")] [assembly: System.Reflection.AssemblyTitleAttribute("demo_blagodat")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache index c5a7df6..efdf2ce 100644 --- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache +++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache @@ -1 +1 @@ -60e5bbf7d18ab8cc5ef27cc140454e6bbb540cd3aab7e9ed7c9eb5da0fe665a0 +df5338b29169336180b002de0b7cc972e3611af3b3c1f8aff16ee2a8a3a2faa9 diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.assets.cache b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.assets.cache index f12f0f4..39b313b 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.assets.cache and b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.assets.cache differ diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache index 08010de..728111a 100644 --- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache +++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6ba8676dd6ba41f96d33829d1624eddf4ac85ba70d5c98b0486290d37753fec9 +d99fcffecf2b311dfd8f27035da74520f0f3b412bad16ca51a0dfe6598a4e02d diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll index 63e7d2d..5b40cf3 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll differ diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb index 80ddb1f..eef9607 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb and b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb differ diff --git a/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll index 17cfb34..ae48292 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll differ diff --git a/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll index 17cfb34..ae48292 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll differ diff --git a/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll index c43c71d..034c169 100644 Binary files a/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll differ diff --git a/demo_blagodat/obj/demo_blagodat.csproj.nuget.dgspec.json b/demo_blagodat/obj/demo_blagodat.csproj.nuget.dgspec.json index 6a1a9cd..45bc6ee 100644 --- a/demo_blagodat/obj/demo_blagodat.csproj.nuget.dgspec.json +++ b/demo_blagodat/obj/demo_blagodat.csproj.nuget.dgspec.json @@ -44,7 +44,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.100" + "SdkAnalysisLevel": "9.0.200" }, "frameworks": { "net8.0": { @@ -101,7 +101,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.103/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200/PortableRuntimeIdentifierGraph.json" } } } diff --git a/demo_blagodat/obj/demo_blagodat.csproj.nuget.g.props b/demo_blagodat/obj/demo_blagodat.csproj.nuget.g.props index b632d10..d7c1249 100644 --- a/demo_blagodat/obj/demo_blagodat.csproj.nuget.g.props +++ b/demo_blagodat/obj/demo_blagodat.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\VivoBook 15X\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.12.3 + 6.13.2 diff --git a/demo_blagodat/obj/project.assets.json b/demo_blagodat/obj/project.assets.json index cead143..0749b3a 100644 --- a/demo_blagodat/obj/project.assets.json +++ b/demo_blagodat/obj/project.assets.json @@ -3527,7 +3527,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.100" + "SdkAnalysisLevel": "9.0.200" }, "frameworks": { "net8.0": { @@ -3584,7 +3584,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.103/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200/PortableRuntimeIdentifierGraph.json" } } } diff --git a/demo_blagodat/obj/project.nuget.cache b/demo_blagodat/obj/project.nuget.cache index fb6c3be..b23e75e 100644 --- a/demo_blagodat/obj/project.nuget.cache +++ b/demo_blagodat/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "/zQed7nVKhU=", + "dgSpecHash": "bjbTStQJmbs=", "success": true, "projectFilePath": "C:\\Users\\VivoBook 15X\\Desktop\\программные модули\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\demo_blagodat.csproj", "expectedPackageFiles": [