diff --git a/.vs/DemoService/DesignTimeBuild/.dtbcache.v2 b/.vs/DemoService/DesignTimeBuild/.dtbcache.v2 index 07b9ca2..d18f300 100644 Binary files a/.vs/DemoService/DesignTimeBuild/.dtbcache.v2 and b/.vs/DemoService/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/DemoService/FileContentIndex/58d4fc1e-eeca-4068-8de1-29ea71a2e32f.vsidx b/.vs/DemoService/FileContentIndex/58d4fc1e-eeca-4068-8de1-29ea71a2e32f.vsidx new file mode 100644 index 0000000..37d0227 Binary files /dev/null and b/.vs/DemoService/FileContentIndex/58d4fc1e-eeca-4068-8de1-29ea71a2e32f.vsidx differ diff --git a/.vs/DemoService/FileContentIndex/b1b258fe-552b-4804-b2c6-5e0684a3a76f.vsidx b/.vs/DemoService/FileContentIndex/b1b258fe-552b-4804-b2c6-5e0684a3a76f.vsidx new file mode 100644 index 0000000..ba80a2c Binary files /dev/null and b/.vs/DemoService/FileContentIndex/b1b258fe-552b-4804-b2c6-5e0684a3a76f.vsidx differ diff --git a/.vs/DemoService/FileContentIndex/cdf14467-f67a-479c-be65-672defd0d1c8.vsidx b/.vs/DemoService/FileContentIndex/cdf14467-f67a-479c-be65-672defd0d1c8.vsidx deleted file mode 100644 index c1758fb..0000000 Binary files a/.vs/DemoService/FileContentIndex/cdf14467-f67a-479c-be65-672defd0d1c8.vsidx and /dev/null differ diff --git a/.vs/DemoService/FileContentIndex/ef67d9fd-d015-45a6-9648-be3d801858cd.vsidx b/.vs/DemoService/FileContentIndex/ef67d9fd-d015-45a6-9648-be3d801858cd.vsidx new file mode 100644 index 0000000..210fe2a Binary files /dev/null and b/.vs/DemoService/FileContentIndex/ef67d9fd-d015-45a6-9648-be3d801858cd.vsidx differ diff --git a/.vs/DemoService/v17/.futdcache.v2 b/.vs/DemoService/v17/.futdcache.v2 index 68f3265..41a6d33 100644 Binary files a/.vs/DemoService/v17/.futdcache.v2 and b/.vs/DemoService/v17/.futdcache.v2 differ diff --git a/.vs/DemoService/v17/.suo b/.vs/DemoService/v17/.suo index 6bf7c64..c9b12af 100644 Binary files a/.vs/DemoService/v17/.suo and b/.vs/DemoService/v17/.suo differ diff --git a/.vs/DemoService/v17/DocumentLayout.backup.json b/.vs/DemoService/v17/DocumentLayout.backup.json index f13d4d0..3f55c3d 100644 --- a/.vs/DemoService/v17/DocumentLayout.backup.json +++ b/.vs/DemoService/v17/DocumentLayout.backup.json @@ -3,12 +3,24 @@ "WorkspaceRootPath": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -23,6 +35,52 @@ { "$type": "Document", "DocumentIndex": 0, + "Title": "ServiceWindow.axaml", + "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", + "RelativeDocumentMoniker": "ServiceWindow.axaml", + "ToolTip": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", + "RelativeToolTip": "ServiceWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-09-04T09:01:06.796Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "ServiceWindow.axaml.cs", + "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml.cs", + "RelativeDocumentMoniker": "ServiceWindow.axaml.cs", + "ToolTip": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml.cs", + "RelativeToolTip": "ServiceWindow.axaml.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-09-04T09:01:06.344Z", + "EditorCaption": "" + } + ] + } + ] + }, + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "FloatingWindowState": { + "Id": "5d89f0c1-b63e-4cca-bbc9-915882977650", + "Display": 1, + "X": -8, + "Y": 331, + "Width": 1907, + "Height": 727, + "WindowState": 2 + }, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 1, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 3, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", @@ -34,16 +92,29 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", "ToolTip": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAABAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-04T07:02:41.443Z", "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Colors.cs", + "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\Colors.cs", + "RelativeDocumentMoniker": "Colors.cs", + "ToolTip": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\Colors.cs", + "RelativeToolTip": "Colors.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-09-04T07:42:06.694Z", + "EditorCaption": "" } ] } diff --git a/.vs/DemoService/v17/DocumentLayout.json b/.vs/DemoService/v17/DocumentLayout.json index f13d4d0..3f55c3d 100644 --- a/.vs/DemoService/v17/DocumentLayout.json +++ b/.vs/DemoService/v17/DocumentLayout.json @@ -3,12 +3,24 @@ "WorkspaceRootPath": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\profi\\desktop\\xofei\\demoservice\\colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -23,6 +35,52 @@ { "$type": "Document", "DocumentIndex": 0, + "Title": "ServiceWindow.axaml", + "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", + "RelativeDocumentMoniker": "ServiceWindow.axaml", + "ToolTip": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", + "RelativeToolTip": "ServiceWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-09-04T09:01:06.796Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "ServiceWindow.axaml.cs", + "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml.cs", + "RelativeDocumentMoniker": "ServiceWindow.axaml.cs", + "ToolTip": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml.cs", + "RelativeToolTip": "ServiceWindow.axaml.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-09-04T09:01:06.344Z", + "EditorCaption": "" + } + ] + } + ] + }, + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "FloatingWindowState": { + "Id": "5d89f0c1-b63e-4cca-bbc9-915882977650", + "Display": 1, + "X": -8, + "Y": 331, + "Width": 1907, + "Height": 727, + "WindowState": 2 + }, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 1, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 3, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", @@ -34,16 +92,29 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", "ToolTip": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAABAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-04T07:02:41.443Z", "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Colors.cs", + "DocumentMoniker": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\Colors.cs", + "RelativeDocumentMoniker": "Colors.cs", + "ToolTip": "C:\\Users\\PROFI\\Desktop\\Xofei\\DemoService\\Colors.cs", + "RelativeToolTip": "Colors.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-09-04T07:42:06.694Z", + "EditorCaption": "" } ] } diff --git a/.vs/ProjectEvaluation/demoservice.metadata.v9.bin b/.vs/ProjectEvaluation/demoservice.metadata.v9.bin index 11fc24a..6ff748a 100644 Binary files a/.vs/ProjectEvaluation/demoservice.metadata.v9.bin and b/.vs/ProjectEvaluation/demoservice.metadata.v9.bin differ diff --git a/.vs/ProjectEvaluation/demoservice.projects.v9.bin b/.vs/ProjectEvaluation/demoservice.projects.v9.bin index dc2eebe..18650c4 100644 Binary files a/.vs/ProjectEvaluation/demoservice.projects.v9.bin and b/.vs/ProjectEvaluation/demoservice.projects.v9.bin differ diff --git a/.vs/ProjectEvaluation/demoservice.strings.v9.bin b/.vs/ProjectEvaluation/demoservice.strings.v9.bin index ca32aba..e1f1333 100644 Binary files a/.vs/ProjectEvaluation/demoservice.strings.v9.bin and b/.vs/ProjectEvaluation/demoservice.strings.v9.bin differ diff --git a/Colors.cs b/Colors.cs new file mode 100644 index 0000000..2bed708 --- /dev/null +++ b/Colors.cs @@ -0,0 +1,17 @@ +using Avalonia.Media; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DemoService +{ + internal class Colors + { + public static SolidColorBrush white = new(Color.FromRgb(255, 255, 255)); + public static SolidColorBrush lightYellow = new(Color.FromRgb(255, 255, 225)); + public static SolidColorBrush orange = new(Color.FromRgb(255, 156, 26)); + public static SolidColorBrush red = new(Color.FromRgb(255, 0, 0)); + } +} diff --git a/MainWindow.axaml b/MainWindow.axaml index e16d82f..4040b0a 100644 --- a/MainWindow.axaml +++ b/MainWindow.axaml @@ -2,7 +2,48 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600" x:Class="DemoService.MainWindow" - Title="DemoService"> + Title="Сервис «Подай на 16»" + WindowStartupLocation="CenterScreen" + Width="800" Height="600"> + + + Подай на 16 + + + + Неверный код + + + + diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs index c485884..cfcad55 100644 --- a/MainWindow.axaml.cs +++ b/MainWindow.axaml.cs @@ -1,12 +1,48 @@ using Avalonia.Controls; +using Avalonia.Interactivity; namespace DemoService { public partial class MainWindow : Window { + private readonly string adminCode = "0000"; public MainWindow() { InitializeComponent(); + Background = Colors.white; + UserButton.Background = Colors.orange; + PasswordError.Foreground = Colors.white; + AdminButton.Background = Colors.orange; + } + public void UserLogIn(object sender, RoutedEventArgs args) + { + ServiceWindow serviceWindow = new(false); + serviceWindow.Show(); + Close(); + } + public void AdminLogIn(object sender, RoutedEventArgs args) + { + if (PasswordCheck(Password.Text)) + { + ServiceWindow serviceWindow = new(true); + serviceWindow.Show(); + Close(); + } + else + { + PasswordError.Foreground = Colors.red; + } + } + public bool PasswordCheck(string? password) + { + if (password == adminCode) + { + return true; + } + else + { + return false; + } } } } \ No newline at end of file diff --git a/ServiceWindow.axaml b/ServiceWindow.axaml new file mode 100644 index 0000000..6fcaf90 --- /dev/null +++ b/ServiceWindow.axaml @@ -0,0 +1,8 @@ + + diff --git a/ServiceWindow.axaml.cs b/ServiceWindow.axaml.cs new file mode 100644 index 0000000..57df663 --- /dev/null +++ b/ServiceWindow.axaml.cs @@ -0,0 +1,19 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace DemoService; + +public partial class ServiceWindow : Window +{ + private readonly bool Admin; + public ServiceWindow() + { + InitializeComponent(); + } + public ServiceWindow(bool admin) + { + InitializeComponent(); + Admin = admin; + } +} \ No newline at end of file diff --git a/bin/Debug/net8.0/DemoService.dll b/bin/Debug/net8.0/DemoService.dll index 569a182..9dcd48c 100644 Binary files a/bin/Debug/net8.0/DemoService.dll and b/bin/Debug/net8.0/DemoService.dll differ diff --git a/bin/Debug/net8.0/DemoService.exe b/bin/Debug/net8.0/DemoService.exe index 2248f32..b069df0 100644 Binary files a/bin/Debug/net8.0/DemoService.exe and b/bin/Debug/net8.0/DemoService.exe differ diff --git a/bin/Debug/net8.0/DemoService.pdb b/bin/Debug/net8.0/DemoService.pdb index ec954c7..57a54ee 100644 Binary files a/bin/Debug/net8.0/DemoService.pdb and b/bin/Debug/net8.0/DemoService.pdb differ diff --git a/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 1364cf9..5e3923d 100644 --- a/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -57eedc95c6453df5d1b12bd930aca2e8960a0eb9374f8b26f19d6568102b733f +ebdbd69ee71690d5a277b51907ba79d1895737938826127021d29991e44d9527 diff --git a/obj/Debug/net8.0/Avalonia/original.dll b/obj/Debug/net8.0/Avalonia/original.dll index 413712c..0ed29fc 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.dll and b/obj/Debug/net8.0/Avalonia/original.dll differ diff --git a/obj/Debug/net8.0/Avalonia/original.pdb b/obj/Debug/net8.0/Avalonia/original.pdb index 2f13d33..9d1e224 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.pdb and b/obj/Debug/net8.0/Avalonia/original.pdb differ diff --git a/obj/Debug/net8.0/Avalonia/original.ref.dll b/obj/Debug/net8.0/Avalonia/original.ref.dll index 2d7278c..729cc72 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.ref.dll and b/obj/Debug/net8.0/Avalonia/original.ref.dll differ diff --git a/obj/Debug/net8.0/Avalonia/resources b/obj/Debug/net8.0/Avalonia/resources index d22b528..b997e2b 100644 Binary files a/obj/Debug/net8.0/Avalonia/resources and b/obj/Debug/net8.0/Avalonia/resources differ diff --git a/obj/Debug/net8.0/DemoService.AssemblyInfo.cs b/obj/Debug/net8.0/DemoService.AssemblyInfo.cs index e6fbc35..8cabdb2 100644 --- a/obj/Debug/net8.0/DemoService.AssemblyInfo.cs +++ b/obj/Debug/net8.0/DemoService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("DemoService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c7dc215c06b81b8f6e9383caa0145ec960da3502")] [assembly: System.Reflection.AssemblyProductAttribute("DemoService")] [assembly: System.Reflection.AssemblyTitleAttribute("DemoService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache b/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache index e8af5d8..53e9b36 100644 --- a/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache @@ -1 +1 @@ -51fb3378f50b1d2b1f909024dfc809a62aebd19b981c2c861e85b7d931cbad48 +0ae32d03b87404d9214960bbb1dd3f16ad12a69a40c7fef303822a2df8feff01 diff --git a/obj/Debug/net8.0/DemoService.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net8.0/DemoService.GeneratedMSBuildEditorConfig.editorconfig index b628a76..8e13ed3 100644 --- a/obj/Debug/net8.0/DemoService.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net8.0/DemoService.GeneratedMSBuildEditorConfig.editorconfig @@ -22,3 +22,6 @@ build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml [C:/Users/PROFI/Desktop/Xofei/DemoService/MainWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml + +[C:/Users/PROFI/Desktop/Xofei/DemoService/ServiceWindow.axaml] +build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml diff --git a/obj/Debug/net8.0/DemoService.csproj.BuildWithSkipAnalyzers b/obj/Debug/net8.0/DemoService.csproj.BuildWithSkipAnalyzers new file mode 100644 index 0000000..e69de29 diff --git a/obj/Debug/net8.0/DemoService.csproj.CoreCompileInputs.cache b/obj/Debug/net8.0/DemoService.csproj.CoreCompileInputs.cache index f72f55e..f2411ff 100644 --- a/obj/Debug/net8.0/DemoService.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net8.0/DemoService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -bf56d1d2d7cb66d6fd79bdd3ff466fbb2ab50a87f55f354382d5187f6a479661 +8e205a12ad6329e0398b6b1e069d72a39bb88a3e3f86e0e4a758440e4838af65 diff --git a/obj/Debug/net8.0/DemoService.dll b/obj/Debug/net8.0/DemoService.dll index 569a182..9dcd48c 100644 Binary files a/obj/Debug/net8.0/DemoService.dll and b/obj/Debug/net8.0/DemoService.dll differ diff --git a/obj/Debug/net8.0/DemoService.pdb b/obj/Debug/net8.0/DemoService.pdb index ec954c7..57a54ee 100644 Binary files a/obj/Debug/net8.0/DemoService.pdb and b/obj/Debug/net8.0/DemoService.pdb differ diff --git a/obj/Debug/net8.0/apphost.exe b/obj/Debug/net8.0/apphost.exe index 2248f32..b069df0 100644 Binary files a/obj/Debug/net8.0/apphost.exe and b/obj/Debug/net8.0/apphost.exe differ diff --git a/obj/Debug/net8.0/ref/DemoService.dll b/obj/Debug/net8.0/ref/DemoService.dll index 2472bc0..b826cc2 100644 Binary files a/obj/Debug/net8.0/ref/DemoService.dll and b/obj/Debug/net8.0/ref/DemoService.dll differ diff --git a/obj/Debug/net8.0/refint/DemoService.dll b/obj/Debug/net8.0/refint/DemoService.dll index 2472bc0..b826cc2 100644 Binary files a/obj/Debug/net8.0/refint/DemoService.dll and b/obj/Debug/net8.0/refint/DemoService.dll differ