diff --git a/.vs/ProjectEvaluation/zurnal_vizual.metadata.v9.bin b/.vs/ProjectEvaluation/zurnal_vizual.metadata.v9.bin index b4e20df..dc364b6 100644 Binary files a/.vs/ProjectEvaluation/zurnal_vizual.metadata.v9.bin and b/.vs/ProjectEvaluation/zurnal_vizual.metadata.v9.bin differ diff --git a/.vs/ProjectEvaluation/zurnal_vizual.projects.v9.bin b/.vs/ProjectEvaluation/zurnal_vizual.projects.v9.bin index 04d009d..0bc439b 100644 Binary files a/.vs/ProjectEvaluation/zurnal_vizual.projects.v9.bin and b/.vs/ProjectEvaluation/zurnal_vizual.projects.v9.bin differ diff --git a/.vs/ProjectEvaluation/zurnal_vizual.strings.v9.bin b/.vs/ProjectEvaluation/zurnal_vizual.strings.v9.bin index 088b036..8838ed5 100644 Binary files a/.vs/ProjectEvaluation/zurnal_vizual.strings.v9.bin and b/.vs/ProjectEvaluation/zurnal_vizual.strings.v9.bin differ diff --git a/.vs/Zurnal_Vizual/DesignTimeBuild/.dtbcache.v2 b/.vs/Zurnal_Vizual/DesignTimeBuild/.dtbcache.v2 index ddea35b..7be4d25 100644 Binary files a/.vs/Zurnal_Vizual/DesignTimeBuild/.dtbcache.v2 and b/.vs/Zurnal_Vizual/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/2473343f-081c-4cd5-bd9d-b82826d5999d.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/2473343f-081c-4cd5-bd9d-b82826d5999d.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/Zurnal_Vizual/FileContentIndex/2473343f-081c-4cd5-bd9d-b82826d5999d.vsidx differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/37113a9c-a936-4788-a662-bacc48f5a799.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/37113a9c-a936-4788-a662-bacc48f5a799.vsidx new file mode 100644 index 0000000..e570630 Binary files /dev/null and b/.vs/Zurnal_Vizual/FileContentIndex/37113a9c-a936-4788-a662-bacc48f5a799.vsidx differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/45c9a4d6-0421-451f-b475-d320ac1960cb.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/45c9a4d6-0421-451f-b475-d320ac1960cb.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/Zurnal_Vizual/FileContentIndex/45c9a4d6-0421-451f-b475-d320ac1960cb.vsidx differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/588b3d53-ada9-4923-91b6-3371f49b36d1.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/588b3d53-ada9-4923-91b6-3371f49b36d1.vsidx deleted file mode 100644 index 37f1f95..0000000 Binary files a/.vs/Zurnal_Vizual/FileContentIndex/588b3d53-ada9-4923-91b6-3371f49b36d1.vsidx and /dev/null differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/64cbe140-02cd-49fe-863f-44dd458881f6.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/64cbe140-02cd-49fe-863f-44dd458881f6.vsidx new file mode 100644 index 0000000..e73ea33 Binary files /dev/null and b/.vs/Zurnal_Vizual/FileContentIndex/64cbe140-02cd-49fe-863f-44dd458881f6.vsidx differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/c19f591a-ef1d-436e-b42b-1ef3ff890484.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/c19f591a-ef1d-436e-b42b-1ef3ff890484.vsidx new file mode 100644 index 0000000..a1e1e04 Binary files /dev/null and b/.vs/Zurnal_Vizual/FileContentIndex/c19f591a-ef1d-436e-b42b-1ef3ff890484.vsidx differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/c72c9345-0979-4fe8-bb3c-db61757c8593.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/c72c9345-0979-4fe8-bb3c-db61757c8593.vsidx deleted file mode 100644 index b748788..0000000 Binary files a/.vs/Zurnal_Vizual/FileContentIndex/c72c9345-0979-4fe8-bb3c-db61757c8593.vsidx and /dev/null differ diff --git a/.vs/Zurnal_Vizual/v17/.futdcache.v2 b/.vs/Zurnal_Vizual/v17/.futdcache.v2 index 05db463..d4adbba 100644 Binary files a/.vs/Zurnal_Vizual/v17/.futdcache.v2 and b/.vs/Zurnal_Vizual/v17/.futdcache.v2 differ diff --git a/.vs/Zurnal_Vizual/v17/.suo b/.vs/Zurnal_Vizual/v17/.suo index 3402483..c0932d9 100644 Binary files a/.vs/Zurnal_Vizual/v17/.suo and b/.vs/Zurnal_Vizual/v17/.suo differ diff --git a/.vs/Zurnal_Vizual/v17/DocumentLayout.backup.json b/.vs/Zurnal_Vizual/v17/DocumentLayout.backup.json index 767d2c9..3bfba65 100644 --- a/.vs/Zurnal_Vizual/v17/DocumentLayout.backup.json +++ b/.vs/Zurnal_Vizual/v17/DocumentLayout.backup.json @@ -3,20 +3,63 @@ "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\zurnal_vizual.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\zurnal_vizual.csproj||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|" }, { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\di\\servicecolletionextensions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\di\\servicecolletionextensions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\data\\repository\\sqlgrouprepositoryimpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\data\\repository\\sqlgrouprepositoryimpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\data\\repository\\grouprepositoryimpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\data\\repository\\grouprepositoryimpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\domain\\usecase\\groupusecase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\domain\\usecase\\groupusecase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewlocator.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewlocator.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewmodels\\groupviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewmodels\\groupviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\domain\\service\\groupservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\domain\\service\\groupservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\presence_api\\programapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\presence_api\\programapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -30,7 +73,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 6, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -40,9 +83,152 @@ "$type": "Bookmark", "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}" }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Zurnal_Vizual", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Zurnal_Vizual.csproj", + "RelativeDocumentMoniker": "Zurnal_Vizual\\Zurnal_Vizual.csproj", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Zurnal_Vizual.csproj", + "RelativeToolTip": "Zurnal_Vizual\\Zurnal_Vizual.csproj", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2024-12-09T10:01:14.921Z" + }, { "$type": "Document", "DocumentIndex": 2, + "Title": "Microsoft.NET.Sdk.DefaultItems.targets", + "DocumentMoniker": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "ToolTip": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "RelativeToolTip": "..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "ViewState": "AgIAAIAAAAAAAAAAAAAiwIwAAAAEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003801|", + "WhenOpened": "2024-12-09T09:58:19.813Z" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "App.axaml.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml.cs", + "RelativeDocumentMoniker": "Zurnal_Vizual\\App.axaml.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml.cs", + "RelativeToolTip": "Zurnal_Vizual\\App.axaml.cs", + "ViewState": "AgIAACMAAAAAAAAAAAAAADEAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:55:02.223Z" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Zurnal.AssemblyInfo.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs", + "RelativeDocumentMoniker": "Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs", + "RelativeToolTip": "Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:47:56.305Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "ServiceColletionExtensions.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\DI\\ServiceColletionExtensions.cs", + "RelativeDocumentMoniker": "Zurnal_Vizual\\DI\\ServiceColletionExtensions.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\DI\\ServiceColletionExtensions.cs", + "RelativeToolTip": "Zurnal_Vizual\\DI\\ServiceColletionExtensions.cs", + "ViewState": "AgIAAAIAAAAAAAAAAAAIwA8AAAAnAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:47:20.986Z" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "SQLGroupRepositoryImpl.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\data\\Repository\\SQLGroupRepositoryImpl.cs", + "RelativeDocumentMoniker": "Zurnal\\data\\Repository\\SQLGroupRepositoryImpl.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\data\\Repository\\SQLGroupRepositoryImpl.cs", + "RelativeToolTip": "Zurnal\\data\\Repository\\SQLGroupRepositoryImpl.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAA2AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:47:01.905Z" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "GroupRepositoryImpl.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\data\\Repository\\GroupRepositoryImpl.cs", + "RelativeDocumentMoniker": "Zurnal\\data\\Repository\\GroupRepositoryImpl.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\data\\Repository\\GroupRepositoryImpl.cs", + "RelativeToolTip": "Zurnal\\data\\Repository\\GroupRepositoryImpl.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAMAAAAjAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:46:46.909Z" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "ViewLocator.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewLocator.cs", + "RelativeDocumentMoniker": "Zurnal_Vizual\\ViewLocator.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewLocator.cs", + "RelativeToolTip": "Zurnal_Vizual\\ViewLocator.cs", + "ViewState": "AgIAABEAAAAAAAAAAAAcwBwAAAAoAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:26:00.348Z" + }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "GroupViewModel.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\GroupViewModel.cs", + "RelativeDocumentMoniker": "Zurnal_Vizual\\ViewModels\\GroupViewModel.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\GroupViewModel.cs", + "RelativeToolTip": "Zurnal_Vizual\\ViewModels\\GroupViewModel.cs", + "ViewState": "AgIAAC0AAAAAAAAAAAAcwD8AAAAZAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:21:53.232Z" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "GroupUseCase.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\domain\\UseCase\\GroupUseCase.cs", + "RelativeDocumentMoniker": "Zurnal\\domain\\UseCase\\GroupUseCase.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\domain\\UseCase\\GroupUseCase.cs", + "RelativeToolTip": "Zurnal\\domain\\UseCase\\GroupUseCase.cs", + "ViewState": "AgIAAGoAAAAAAAAAAAAAAH0AAAAJAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T08:28:10.333Z" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "GroupService.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\domain\\Service\\GroupService.cs", + "RelativeDocumentMoniker": "Zurnal\\domain\\Service\\GroupService.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\domain\\Service\\GroupService.cs", + "RelativeToolTip": "Zurnal\\domain\\Service\\GroupService.cs", + "ViewState": "AgIAACQAAAAAAAAAAADwvyYAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T08:10:35.74Z" + }, + { + "$type": "Document", + "DocumentIndex": 13, + "Title": "ProgramApi.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\presence_api\\ProgramApi.cs", + "RelativeDocumentMoniker": "Zurnal\\presence_api\\ProgramApi.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\presence_api\\ProgramApi.cs", + "RelativeToolTip": "Zurnal\\presence_api\\ProgramApi.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T07:55:01.451Z" + }, + { + "$type": "Document", + "DocumentIndex": 12, "Title": "MainWindowViewModel.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", @@ -50,58 +236,41 @@ "RelativeToolTip": "Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-05T10:58:36.906Z", - "EditorCaption": "" + "WhenOpened": "2024-12-05T10:58:36.906Z" }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "MainWindow.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\MainWindow.cs", - "RelativeDocumentMoniker": "Zurnal_Vizual\\MainWindow.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\MainWindow.cs", - "RelativeToolTip": "Zurnal_Vizual\\MainWindow.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-05T08:51:28.615Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 15, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml", "RelativeDocumentMoniker": "Zurnal_Vizual\\App.axaml", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml", "RelativeToolTip": "Zurnal_Vizual\\App.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-12-05T08:02:13.018Z", - "EditorCaption": "" + "WhenOpened": "2024-12-05T08:02:13.018Z" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 1, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "RelativeToolTip": "Zurnal_Vizual\\Views\\MainWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAAMAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-02T10:46:34.635Z", - "EditorCaption": "" + "WhenOpened": "2024-12-02T10:46:34.635Z" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 14, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml", "RelativeDocumentMoniker": "Zurnal_Vizual\\Views\\MainWindow.axaml", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml", "RelativeToolTip": "Zurnal_Vizual\\Views\\MainWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-12-02T10:44:27.193Z", - "EditorCaption": "" + "WhenOpened": "2024-12-02T10:44:27.193Z" } ] } diff --git a/.vs/Zurnal_Vizual/v17/DocumentLayout.json b/.vs/Zurnal_Vizual/v17/DocumentLayout.json index 767d2c9..a2f8e53 100644 --- a/.vs/Zurnal_Vizual/v17/DocumentLayout.json +++ b/.vs/Zurnal_Vizual/v17/DocumentLayout.json @@ -3,20 +3,56 @@ "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\domain\\usecase\\groupusecase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\domain\\usecase\\groupusecase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\di\\servicecolletionextensions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\di\\servicecolletionextensions.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\data\\repository\\sqlgrouprepositoryimpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\data\\repository\\sqlgrouprepositoryimpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\data\\repository\\grouprepositoryimpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\data\\repository\\grouprepositoryimpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewlocator.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewlocator.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewmodels\\groupviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewmodels\\groupviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\domain\\service\\groupservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\domain\\service\\groupservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal\\presence_api\\programapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C46B521B-A271-43B9-AC19-9641BEBC01B4}|Zurnal\\Zurnal.csproj|solutionrelative:zurnal\\presence_api\\programapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -30,7 +66,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 6, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -40,9 +76,139 @@ "$type": "Bookmark", "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}" }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "App.axaml.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml.cs", + "RelativeDocumentMoniker": "Zurnal_Vizual\\App.axaml.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml.cs", + "RelativeToolTip": "Zurnal_Vizual\\App.axaml.cs", + "ViewState": "AgIAABEAAAAAAAAAAAArwB0AAAAUAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:55:02.223Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 2, + "Title": "Zurnal.AssemblyInfo.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs", + "RelativeDocumentMoniker": "Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs", + "RelativeToolTip": "Zurnal\\obj\\Debug\\net8.0\\Zurnal.AssemblyInfo.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:47:56.305Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "ServiceColletionExtensions.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\DI\\ServiceColletionExtensions.cs", + "RelativeDocumentMoniker": "Zurnal_Vizual\\DI\\ServiceColletionExtensions.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\DI\\ServiceColletionExtensions.cs", + "RelativeToolTip": "Zurnal_Vizual\\DI\\ServiceColletionExtensions.cs", + "ViewState": "AgIAAAIAAAAAAAAAAAAIwA8AAAAnAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:47:20.986Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "SQLGroupRepositoryImpl.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\data\\Repository\\SQLGroupRepositoryImpl.cs", + "RelativeDocumentMoniker": "Zurnal\\data\\Repository\\SQLGroupRepositoryImpl.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\data\\Repository\\SQLGroupRepositoryImpl.cs", + "RelativeToolTip": "Zurnal\\data\\Repository\\SQLGroupRepositoryImpl.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAA2AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:47:01.905Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "GroupRepositoryImpl.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\data\\Repository\\GroupRepositoryImpl.cs", + "RelativeDocumentMoniker": "Zurnal\\data\\Repository\\GroupRepositoryImpl.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\data\\Repository\\GroupRepositoryImpl.cs", + "RelativeToolTip": "Zurnal\\data\\Repository\\GroupRepositoryImpl.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAMAAAAjAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:46:46.909Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "ViewLocator.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewLocator.cs", + "RelativeDocumentMoniker": "Zurnal_Vizual\\ViewLocator.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewLocator.cs", + "RelativeToolTip": "Zurnal_Vizual\\ViewLocator.cs", + "ViewState": "AgIAABEAAAAAAAAAAAAcwBwAAAAoAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:26:00.348Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "GroupViewModel.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\GroupViewModel.cs", + "RelativeDocumentMoniker": "Zurnal_Vizual\\ViewModels\\GroupViewModel.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\GroupViewModel.cs", + "RelativeToolTip": "Zurnal_Vizual\\ViewModels\\GroupViewModel.cs", + "ViewState": "AgIAAC0AAAAAAAAAAAAcwD8AAAAZAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T09:21:53.232Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "GroupUseCase.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\domain\\UseCase\\GroupUseCase.cs", + "RelativeDocumentMoniker": "Zurnal\\domain\\UseCase\\GroupUseCase.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\domain\\UseCase\\GroupUseCase.cs", + "RelativeToolTip": "Zurnal\\domain\\UseCase\\GroupUseCase.cs", + "ViewState": "AgIAAGoAAAAAAAAAAAAAAH0AAAAJAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T08:28:10.333Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "GroupService.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\domain\\Service\\GroupService.cs", + "RelativeDocumentMoniker": "Zurnal\\domain\\Service\\GroupService.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\domain\\Service\\GroupService.cs", + "RelativeToolTip": "Zurnal\\domain\\Service\\GroupService.cs", + "ViewState": "AgIAACQAAAAAAAAAAADwvyYAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T08:10:35.74Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "ProgramApi.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\presence_api\\ProgramApi.cs", + "RelativeDocumentMoniker": "Zurnal\\presence_api\\ProgramApi.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\presence_api\\ProgramApi.cs", + "RelativeToolTip": "Zurnal\\presence_api\\ProgramApi.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-09T07:55:01.451Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 10, "Title": "MainWindowViewModel.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", @@ -55,20 +221,7 @@ }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "MainWindow.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\MainWindow.cs", - "RelativeDocumentMoniker": "Zurnal_Vizual\\MainWindow.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\MainWindow.cs", - "RelativeToolTip": "Zurnal_Vizual\\MainWindow.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-05T08:51:28.615Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 13, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml", "RelativeDocumentMoniker": "Zurnal_Vizual\\App.axaml", @@ -80,20 +233,20 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 1, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "RelativeToolTip": "Zurnal_Vizual\\Views\\MainWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAA0AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-02T10:46:34.635Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 12, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml", "RelativeDocumentMoniker": "Zurnal_Vizual\\Views\\MainWindow.axaml", diff --git a/Zurnal/Zurnal.csproj b/Zurnal/Zurnal.csproj index eb4ae9f..76d5b21 100644 --- a/Zurnal/Zurnal.csproj +++ b/Zurnal/Zurnal.csproj @@ -8,6 +8,8 @@ + + @@ -18,7 +20,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - diff --git a/Zurnal/bin/Debug/net8.0/Zurnal.dll b/Zurnal/bin/Debug/net8.0/Zurnal.dll index 87ed287..8aa3bd6 100644 Binary files a/Zurnal/bin/Debug/net8.0/Zurnal.dll and b/Zurnal/bin/Debug/net8.0/Zurnal.dll differ diff --git a/Zurnal/bin/Debug/net8.0/Zurnal.pdb b/Zurnal/bin/Debug/net8.0/Zurnal.pdb index 8366eec..399fe78 100644 Binary files a/Zurnal/bin/Debug/net8.0/Zurnal.pdb and b/Zurnal/bin/Debug/net8.0/Zurnal.pdb differ diff --git a/Zurnal/data/Repository/GroupRepositoryImpl.cs b/Zurnal/data/Repository/GroupRepositoryImpl.cs index 5d736c5..356c30c 100644 --- a/Zurnal/data/Repository/GroupRepositoryImpl.cs +++ b/Zurnal/data/Repository/GroupRepositoryImpl.cs @@ -1,6 +1,5 @@ using data.RemoteData.RemoteDataBase.DAO; using data.Repository; -using domain.Models; public class GroupRepositoryImpl : IGroupRepository { @@ -46,4 +45,9 @@ public class GroupRepositoryImpl : IGroupRepository _groups.Remove(existingGroup); return true; } + + public IEnumerable GetGroupsWithStudents() + { + throw new NotImplementedException(); + } } diff --git a/Zurnal/data/Repository/IGroupRepository.cs b/Zurnal/data/Repository/IGroupRepository.cs index e8a320d..c27e937 100644 --- a/Zurnal/data/Repository/IGroupRepository.cs +++ b/Zurnal/data/Repository/IGroupRepository.cs @@ -1,5 +1,4 @@ using data.RemoteData.RemoteDataBase.DAO; -using domain.Models; namespace data.Repository { @@ -10,6 +9,7 @@ namespace data.Repository bool UpdateGroupById(int groupID, GroupDao updatedGroup); GroupDao GetGroupById(int groupID); bool AddGroup(GroupDao newGroup); + public IEnumerable GetGroupsWithStudents(); } } \ No newline at end of file diff --git a/Zurnal/data/Repository/IPresenceRepository.cs b/Zurnal/data/Repository/IPresenceRepository.cs index b66e210..2e30209 100644 --- a/Zurnal/data/Repository/IPresenceRepository.cs +++ b/Zurnal/data/Repository/IPresenceRepository.cs @@ -1,5 +1,4 @@ using data.RemoteData.RemoteDataBase.DAO; -using domain.Models; namespace data.Repository { diff --git a/Zurnal/data/Repository/IUserRepository.cs b/Zurnal/data/Repository/IUserRepository.cs index 045da38..3773bd5 100644 --- a/Zurnal/data/Repository/IUserRepository.cs +++ b/Zurnal/data/Repository/IUserRepository.cs @@ -1,6 +1,4 @@ -using data.RemoteData.RemoteDataBase.DAO; -using domain.Models; -using User = data.RemoteData.RemoteDataBase.DAO.UserDao; +using User = data.RemoteData.RemoteDataBase.DAO.UserDao; namespace data.Repository { diff --git a/Zurnal/data/Repository/PresenceRepositoryImpl.cs b/Zurnal/data/Repository/PresenceRepositoryImpl.cs index 62adccd..619dc3d 100644 --- a/Zurnal/data/Repository/PresenceRepositoryImpl.cs +++ b/Zurnal/data/Repository/PresenceRepositoryImpl.cs @@ -1,5 +1,4 @@ using data.RemoteData.RemoteDataBase.DAO; -using domain.Models; namespace data.Repository { diff --git a/Zurnal/data/Repository/SQLGroupRepositoryImpl.cs b/Zurnal/data/Repository/SQLGroupRepositoryImpl.cs index cf69e15..ae395b2 100644 --- a/Zurnal/data/Repository/SQLGroupRepositoryImpl.cs +++ b/Zurnal/data/Repository/SQLGroupRepositoryImpl.cs @@ -14,8 +14,8 @@ public class SQLGroupRepositoryImpl : IGroupRepository public GroupDao? GetGroupById(int groupId) { - var groupDao = _remoteDatabaseContext.groups.FirstOrDefault(g => g.Id == groupId); - return groupDao != null ? new GroupDao { Id = groupDao.Id, Name = groupDao.Name } : null; + var GroupDao = _remoteDatabaseContext.groups.FirstOrDefault(g => g.Id == groupId); + return GroupDao != null ? new GroupDao { Id = GroupDao.Id, Name = GroupDao.Name } : null; } @@ -32,8 +32,8 @@ public class SQLGroupRepositoryImpl : IGroupRepository if (_remoteDatabaseContext.groups.Any(g => g.Id == group.Id)) return false; - var groupDao = new GroupDao { Id = group.Id, Name = group.Name }; - _remoteDatabaseContext.groups.Add(groupDao); + var GroupDao = new GroupDao { Id = group.Id, Name = group.Name }; + _remoteDatabaseContext.groups.Add(GroupDao); _remoteDatabaseContext.SaveChanges(); return true; } @@ -61,4 +61,9 @@ public class SQLGroupRepositoryImpl : IGroupRepository _remoteDatabaseContext.SaveChanges(); return true; } + + public IEnumerable GetGroupsWithStudents() + { + throw new NotImplementedException(); + } } diff --git a/Zurnal/data/Repository/SQLPresenceRepositoryImpl.cs b/Zurnal/data/Repository/SQLPresenceRepositoryImpl.cs index ff3e89d..fea52ae 100644 --- a/Zurnal/data/Repository/SQLPresenceRepositoryImpl.cs +++ b/Zurnal/data/Repository/SQLPresenceRepositoryImpl.cs @@ -1,5 +1,4 @@ using data.RemoteData.RemoteDataBase.DAO; -using domain.Models; using Microsoft.EntityFrameworkCore; using remoteData.RemoteDataBase; diff --git a/Zurnal/data/Repository/UserRepositoryImpl.cs b/Zurnal/data/Repository/UserRepositoryImpl.cs index fc69c83..ce43edc 100644 --- a/Zurnal/data/Repository/UserRepositoryImpl.cs +++ b/Zurnal/data/Repository/UserRepositoryImpl.cs @@ -1,6 +1,4 @@ using data.Exception; -using data.RemoteData.RemoteDataBase.DAO; -using domain.Models; using User = data.RemoteData.RemoteDataBase.DAO.UserDao; namespace data.Repository diff --git a/Zurnal/domain/Request/AddGroupRequest.cs b/Zurnal/domain/Request/AddGroupRequest.cs new file mode 100644 index 0000000..8dc9b5d --- /dev/null +++ b/Zurnal/domain/Request/AddGroupRequest.cs @@ -0,0 +1,7 @@ +namespace domain.Request +{ + public class AddGroupRequest + { + public string Name { get; set; } + } +} diff --git a/Zurnal/domain/Request/AddGroupWithStudent.cs b/Zurnal/domain/Request/AddGroupWithStudent.cs new file mode 100644 index 0000000..f6dacb9 --- /dev/null +++ b/Zurnal/domain/Request/AddGroupWithStudent.cs @@ -0,0 +1,8 @@ +namespace domain.Request +{ + public class AddGroupWithStudentsRequest + { + public AddGroupRequest addGroupRequest { get; set; } + public IEnumerable AddStudentRequests { get; set; } + } +} diff --git a/Zurnal/domain/Request/AddStudentRequest.cs b/Zurnal/domain/Request/AddStudentRequest.cs new file mode 100644 index 0000000..ba63be8 --- /dev/null +++ b/Zurnal/domain/Request/AddStudentRequest.cs @@ -0,0 +1,7 @@ +namespace domain.Request +{ + public class AddStudentRequest + { + public string StudentName { get; set; } + } +} diff --git a/Zurnal/domain/Service/GroupService.cs b/Zurnal/domain/Service/GroupService.cs new file mode 100644 index 0000000..dc06db2 --- /dev/null +++ b/Zurnal/domain/Service/GroupService.cs @@ -0,0 +1,40 @@ +using data.RemoteData.RemoteDataBase.DAO; +using data.Repository; +using domain.Request; +using domain.UseCase; + +namespace domain.Service +{ + public class GroupService : GroupUseCase + { + private readonly IGroupRepository _groupRepository; + public GroupService(IGroupRepository groupRepository): base(groupRepository) + { + _groupRepository = groupRepository; + } + public void AddGroup(AddGroupRequest addGroupRequest) + { + _groupRepository.AddGroup(new GroupDao { Name = addGroupRequest.Name }); + } + public IEnumerable GetGroupsWithStudents() + { + return _groupRepository.GetAllGroup().Select( + group => new GroupDao + { + Id = group.Id, + Name = group.Name, + Users = group.Users.Select( + user => new UserDao + { + Guid = user.Guid, + FIO = user.FIO, + Group = new GroupDao + { + Id = group.Id, + Name = group.Name, + } + }).ToList() + }).ToList(); + } + } +} diff --git a/Zurnal/domain/UseCase/GroupUseCase.cs b/Zurnal/domain/UseCase/GroupUseCase.cs index 20911b1..870e850 100644 --- a/Zurnal/domain/UseCase/GroupUseCase.cs +++ b/Zurnal/domain/UseCase/GroupUseCase.cs @@ -1,6 +1,7 @@ using data.RemoteData.RemoteDataBase.DAO; using data.Repository; using domain.Models; +using UserDao = data.RemoteData.RemoteDataBase.DAO.UserDao; @@ -15,7 +16,6 @@ namespace domain.UseCase _repositoryGroupImpl = repositoryGroupImpl; } - private GroupDao ValidateGroupExistence(int groupId) { var existingGroup = _repositoryGroupImpl.GetAllGroup() @@ -89,9 +89,6 @@ namespace domain.UseCase throw new ArgumentException("Группа не найдена."); } } - - - // Метод для изменения названия группы public bool UpdateGroup(int groupId, string newGroupName) { var existingGroup = _repositoryGroupImpl.GetAllGroup() @@ -99,12 +96,33 @@ namespace domain.UseCase if (existingGroup == null) { - return false; // Группа с таким ID не найдена + return false; } existingGroup.Name = newGroupName; _repositoryGroupImpl.UpdateGroupById(existingGroup.Id, existingGroup); - return true; // Успешное обновление + return true; + } + + public IEnumerable GetGroupsWithStudents() + { + return _repositoryGroupImpl.GetAllGroup().Select( + group => new GroupDao + { + Id = group.Id, + Name = group.Name, + Users = group.Users.Select( + user => new UserDao + { + Guid = user.Guid, + FIO = user.FIO, + Group = new GroupDao + { + Id = group.Id, + Name = group.Name, + } + }).ToList() + }).ToList(); } } diff --git a/Zurnal/domain/UseCase/UseCaseGeneratePresence.cs b/Zurnal/domain/UseCase/UseCaseGeneratePresence.cs index 0e71619..aaffb5a 100644 --- a/Zurnal/domain/UseCase/UseCaseGeneratePresence.cs +++ b/Zurnal/domain/UseCase/UseCaseGeneratePresence.cs @@ -1,7 +1,6 @@ using ClosedXML.Excel; using data.RemoteData.RemoteDataBase.DAO; using data.Repository; -using domain.Models; namespace domain.UseCase { diff --git a/Zurnal/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/Zurnal/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..5f7ed2b --- /dev/null +++ b/Zurnal/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +20a78fbbf94e0a07f25382f0bc961f4472bdf824d8686cb292214e2e3257307b diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache b/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache index 76ec17c..5279253 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache +++ b/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache @@ -1 +1 @@ -c5502f7c89d530558f505dccc9e3a90a66adde1b9ee387e1332c24a922915912 +ed248c4bf6b50af09016ef39fb318ae8ce184200d31ce6db78028272722d2934 diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.GeneratedMSBuildEditorConfig.editorconfig b/Zurnal/obj/Debug/net8.0/Zurnal.GeneratedMSBuildEditorConfig.editorconfig index a02265a..9d94e23 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.GeneratedMSBuildEditorConfig.editorconfig +++ b/Zurnal/obj/Debug/net8.0/Zurnal.GeneratedMSBuildEditorConfig.editorconfig @@ -1,4 +1,11 @@ is_global = true +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true build_property.TargetFramework = net8.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.assets.cache b/Zurnal/obj/Debug/net8.0/Zurnal.assets.cache index 554c65b..dc42464 100644 Binary files a/Zurnal/obj/Debug/net8.0/Zurnal.assets.cache and b/Zurnal/obj/Debug/net8.0/Zurnal.assets.cache differ diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.csproj.AssemblyReference.cache b/Zurnal/obj/Debug/net8.0/Zurnal.csproj.AssemblyReference.cache index c072918..0c24c42 100644 Binary files a/Zurnal/obj/Debug/net8.0/Zurnal.csproj.AssemblyReference.cache and b/Zurnal/obj/Debug/net8.0/Zurnal.csproj.AssemblyReference.cache differ diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.csproj.CoreCompileInputs.cache b/Zurnal/obj/Debug/net8.0/Zurnal.csproj.CoreCompileInputs.cache index 3d6e7b5..9c9ce64 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.csproj.CoreCompileInputs.cache +++ b/Zurnal/obj/Debug/net8.0/Zurnal.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -71f4c5f4512ef8a4e29be8d7d5eca046cd8ca55f841f1872e8259e3493b7af7a +c84aa5a429638dee680eb366a511b2a900d37c9ddb4b0319298fcd2322dd2a7b diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.dll b/Zurnal/obj/Debug/net8.0/Zurnal.dll index 87ed287..8aa3bd6 100644 Binary files a/Zurnal/obj/Debug/net8.0/Zurnal.dll and b/Zurnal/obj/Debug/net8.0/Zurnal.dll differ diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.pdb b/Zurnal/obj/Debug/net8.0/Zurnal.pdb index 8366eec..399fe78 100644 Binary files a/Zurnal/obj/Debug/net8.0/Zurnal.pdb and b/Zurnal/obj/Debug/net8.0/Zurnal.pdb differ diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.sourcelink.json b/Zurnal/obj/Debug/net8.0/Zurnal.sourcelink.json index 45c2372..7e272fa 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.sourcelink.json +++ b/Zurnal/obj/Debug/net8.0/Zurnal.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\*":"https://raw.githubusercontent.com/NuclierOwl/Jornal/8e78b129eaddfab72461facfad823b5dae9d0c3c/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\*":"https://raw.githubusercontent.com/NuclierOwl/Jornal/9644a4176c58e47c87596bcab2afbb9d6784b6be/*"}} \ No newline at end of file diff --git a/Zurnal/obj/Debug/net8.0/ref/Zurnal.dll b/Zurnal/obj/Debug/net8.0/ref/Zurnal.dll index 7bf7751..111f929 100644 Binary files a/Zurnal/obj/Debug/net8.0/ref/Zurnal.dll and b/Zurnal/obj/Debug/net8.0/ref/Zurnal.dll differ diff --git a/Zurnal/obj/Debug/net8.0/refint/Zurnal.dll b/Zurnal/obj/Debug/net8.0/refint/Zurnal.dll index 7bf7751..111f929 100644 Binary files a/Zurnal/obj/Debug/net8.0/refint/Zurnal.dll and b/Zurnal/obj/Debug/net8.0/refint/Zurnal.dll differ diff --git a/Zurnal/obj/Zurnal.csproj.nuget.dgspec.json b/Zurnal/obj/Zurnal.csproj.nuget.dgspec.json index fb33a6f..6e516ff 100644 --- a/Zurnal/obj/Zurnal.csproj.nuget.dgspec.json +++ b/Zurnal/obj/Zurnal.csproj.nuget.dgspec.json @@ -50,6 +50,14 @@ "net8.0": { "targetAlias": "net8.0", "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.2.2, )" + }, + "Avalonia.ReactiveUI": { + "target": "Package", + "version": "[11.2.2, )" + }, "ClosedXML": { "target": "Package", "version": "[0.104.2, )" @@ -80,10 +88,6 @@ "target": "Package", "version": "[8.0.10, )" }, - "Microsoft.Extensions.DependencyInjection": { - "target": "Package", - "version": "[8.0.1, )" - }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "target": "Package", "version": "[8.0.2, )" diff --git a/Zurnal/obj/Zurnal.csproj.nuget.g.props b/Zurnal/obj/Zurnal.csproj.nuget.g.props index a949e31..05b50bb 100644 --- a/Zurnal/obj/Zurnal.csproj.nuget.g.props +++ b/Zurnal/obj/Zurnal.csproj.nuget.g.props @@ -18,9 +18,12 @@ + C:\Users\PC\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5 C:\Users\PC\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.3 + C:\Users\PC\.nuget\packages\avalonia.buildservices\0.0.29 + C:\Users\PC\.nuget\packages\avalonia\11.2.2 \ No newline at end of file diff --git a/Zurnal/obj/Zurnal.csproj.nuget.g.targets b/Zurnal/obj/Zurnal.csproj.nuget.g.targets index 98d037e..bab6773 100644 --- a/Zurnal/obj/Zurnal.csproj.nuget.g.targets +++ b/Zurnal/obj/Zurnal.csproj.nuget.g.targets @@ -5,5 +5,7 @@ + + \ No newline at end of file diff --git a/Zurnal/obj/project.assets.json b/Zurnal/obj/project.assets.json index 1cc15d4..d5b1014 100644 --- a/Zurnal/obj/project.assets.json +++ b/Zurnal/obj/project.assets.json @@ -2,6 +2,125 @@ "version": 3, "targets": { "net8.0": { + "Avalonia/11.2.2": { + "type": "package", + "dependencies": { + "Avalonia.BuildServices": "0.0.29", + "Avalonia.Remote.Protocol": "11.2.2", + "MicroCom.Runtime": "0.11.0" + }, + "compile": { + "ref/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "ref/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "build": { + "buildTransitive/Avalonia.props": {}, + "buildTransitive/Avalonia.targets": {} + } + }, + "Avalonia.BuildServices/0.0.29": { + "type": "package", + "build": { + "buildTransitive/Avalonia.BuildServices.targets": {} + } + }, + "Avalonia.ReactiveUI/11.2.2": { + "type": "package", + "dependencies": { + "Avalonia": "11.2.2", + "ReactiveUI": "20.1.1", + "System.Reactive": "6.0.1" + }, + "compile": { + "lib/net8.0/Avalonia.ReactiveUI.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.ReactiveUI.dll": { + "related": ".xml" + } + } + }, + "Avalonia.Remote.Protocol/11.2.2": { + "type": "package", + "compile": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + } + }, "Azure.Core/1.43.0": { "type": "package", "dependencies": { @@ -314,6 +433,15 @@ } } }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "compile": { + "lib/net5.0/MicroCom.Runtime.dll": {} + }, + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": {} + } + }, "Microsoft.AspNetCore.OpenApi/8.0.11": { "type": "package", "dependencies": { @@ -3222,6 +3350,228 @@ } }, "libraries": { + "Avalonia/11.2.2": { + "sha512": "gycD/+pjaNh6288vEGDOcgks3Gz/dhZaZu6VSao6wMBXAQpBMEFlU4gW1dXXH2N0zdOlv3Jo1PgmH2megCe2yw==", + "type": "package", + "path": "avalonia/11.2.2", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "analyzers/dotnet/cs/Avalonia.Analyzers.dll", + "analyzers/dotnet/cs/Avalonia.Generators.dll", + "avalonia.11.2.2.nupkg.sha512", + "avalonia.nuspec", + "build/Avalonia.Generators.props", + "build/Avalonia.props", + "build/Avalonia.targets", + "build/AvaloniaBuildTasks.props", + "build/AvaloniaBuildTasks.targets", + "build/AvaloniaItemSchema.xaml", + "build/AvaloniaPrivateApis.targets", + "build/AvaloniaRules.Project.xml", + "build/AvaloniaSingleProject.targets", + "build/AvaloniaVersion.props", + "buildTransitive/Avalonia.Generators.props", + "buildTransitive/Avalonia.props", + "buildTransitive/Avalonia.targets", + "buildTransitive/AvaloniaBuildTasks.props", + "buildTransitive/AvaloniaBuildTasks.targets", + "buildTransitive/AvaloniaItemSchema.xaml", + "buildTransitive/AvaloniaPrivateApis.targets", + "buildTransitive/AvaloniaRules.Project.xml", + "buildTransitive/AvaloniaSingleProject.targets", + "lib/net6.0/Avalonia.Base.dll", + "lib/net6.0/Avalonia.Base.xml", + "lib/net6.0/Avalonia.Controls.dll", + "lib/net6.0/Avalonia.Controls.xml", + "lib/net6.0/Avalonia.DesignerSupport.dll", + "lib/net6.0/Avalonia.DesignerSupport.xml", + "lib/net6.0/Avalonia.Dialogs.dll", + "lib/net6.0/Avalonia.Dialogs.xml", + "lib/net6.0/Avalonia.Markup.Xaml.dll", + "lib/net6.0/Avalonia.Markup.Xaml.xml", + "lib/net6.0/Avalonia.Markup.dll", + "lib/net6.0/Avalonia.Markup.xml", + "lib/net6.0/Avalonia.Metal.dll", + "lib/net6.0/Avalonia.Metal.xml", + "lib/net6.0/Avalonia.MicroCom.dll", + "lib/net6.0/Avalonia.MicroCom.xml", + "lib/net6.0/Avalonia.OpenGL.dll", + "lib/net6.0/Avalonia.OpenGL.xml", + "lib/net6.0/Avalonia.Vulkan.dll", + "lib/net6.0/Avalonia.Vulkan.xml", + "lib/net6.0/Avalonia.dll", + "lib/net6.0/Avalonia.xml", + "lib/net8.0/Avalonia.Base.dll", + "lib/net8.0/Avalonia.Base.xml", + "lib/net8.0/Avalonia.Controls.dll", + "lib/net8.0/Avalonia.Controls.xml", + "lib/net8.0/Avalonia.DesignerSupport.dll", + "lib/net8.0/Avalonia.DesignerSupport.xml", + "lib/net8.0/Avalonia.Dialogs.dll", + "lib/net8.0/Avalonia.Dialogs.xml", + "lib/net8.0/Avalonia.Markup.Xaml.dll", + "lib/net8.0/Avalonia.Markup.Xaml.xml", + "lib/net8.0/Avalonia.Markup.dll", + "lib/net8.0/Avalonia.Markup.xml", + "lib/net8.0/Avalonia.Metal.dll", + "lib/net8.0/Avalonia.Metal.xml", + "lib/net8.0/Avalonia.MicroCom.dll", + "lib/net8.0/Avalonia.MicroCom.xml", + "lib/net8.0/Avalonia.OpenGL.dll", + "lib/net8.0/Avalonia.OpenGL.xml", + "lib/net8.0/Avalonia.Vulkan.dll", + "lib/net8.0/Avalonia.Vulkan.xml", + "lib/net8.0/Avalonia.dll", + "lib/net8.0/Avalonia.xml", + "lib/netstandard2.0/Avalonia.Base.dll", + "lib/netstandard2.0/Avalonia.Base.xml", + "lib/netstandard2.0/Avalonia.Controls.dll", + "lib/netstandard2.0/Avalonia.Controls.xml", + "lib/netstandard2.0/Avalonia.DesignerSupport.dll", + "lib/netstandard2.0/Avalonia.DesignerSupport.xml", + "lib/netstandard2.0/Avalonia.Dialogs.dll", + "lib/netstandard2.0/Avalonia.Dialogs.xml", + "lib/netstandard2.0/Avalonia.Markup.Xaml.dll", + "lib/netstandard2.0/Avalonia.Markup.Xaml.xml", + "lib/netstandard2.0/Avalonia.Markup.dll", + "lib/netstandard2.0/Avalonia.Markup.xml", + "lib/netstandard2.0/Avalonia.Metal.dll", + "lib/netstandard2.0/Avalonia.Metal.xml", + "lib/netstandard2.0/Avalonia.MicroCom.dll", + "lib/netstandard2.0/Avalonia.MicroCom.xml", + "lib/netstandard2.0/Avalonia.OpenGL.dll", + "lib/netstandard2.0/Avalonia.OpenGL.xml", + "lib/netstandard2.0/Avalonia.Vulkan.dll", + "lib/netstandard2.0/Avalonia.Vulkan.xml", + "lib/netstandard2.0/Avalonia.dll", + "lib/netstandard2.0/Avalonia.xml", + "ref/net6.0/Avalonia.Base.dll", + "ref/net6.0/Avalonia.Base.xml", + "ref/net6.0/Avalonia.Controls.dll", + "ref/net6.0/Avalonia.Controls.xml", + "ref/net6.0/Avalonia.DesignerSupport.dll", + "ref/net6.0/Avalonia.DesignerSupport.xml", + "ref/net6.0/Avalonia.Dialogs.dll", + "ref/net6.0/Avalonia.Dialogs.xml", + "ref/net6.0/Avalonia.Markup.Xaml.dll", + "ref/net6.0/Avalonia.Markup.Xaml.xml", + "ref/net6.0/Avalonia.Markup.dll", + "ref/net6.0/Avalonia.Markup.xml", + "ref/net6.0/Avalonia.Metal.dll", + "ref/net6.0/Avalonia.Metal.xml", + "ref/net6.0/Avalonia.MicroCom.dll", + "ref/net6.0/Avalonia.MicroCom.xml", + "ref/net6.0/Avalonia.OpenGL.dll", + "ref/net6.0/Avalonia.OpenGL.xml", + "ref/net6.0/Avalonia.Vulkan.dll", + "ref/net6.0/Avalonia.Vulkan.xml", + "ref/net6.0/Avalonia.dll", + "ref/net6.0/Avalonia.xml", + "ref/net8.0/Avalonia.Base.dll", + "ref/net8.0/Avalonia.Base.xml", + "ref/net8.0/Avalonia.Controls.dll", + "ref/net8.0/Avalonia.Controls.xml", + "ref/net8.0/Avalonia.DesignerSupport.dll", + "ref/net8.0/Avalonia.DesignerSupport.xml", + "ref/net8.0/Avalonia.Dialogs.dll", + "ref/net8.0/Avalonia.Dialogs.xml", + "ref/net8.0/Avalonia.Markup.Xaml.dll", + "ref/net8.0/Avalonia.Markup.Xaml.xml", + "ref/net8.0/Avalonia.Markup.dll", + "ref/net8.0/Avalonia.Markup.xml", + "ref/net8.0/Avalonia.Metal.dll", + "ref/net8.0/Avalonia.Metal.xml", + "ref/net8.0/Avalonia.MicroCom.dll", + "ref/net8.0/Avalonia.MicroCom.xml", + "ref/net8.0/Avalonia.OpenGL.dll", + "ref/net8.0/Avalonia.OpenGL.xml", + "ref/net8.0/Avalonia.Vulkan.dll", + "ref/net8.0/Avalonia.Vulkan.xml", + "ref/net8.0/Avalonia.dll", + "ref/net8.0/Avalonia.xml", + "ref/netstandard2.0/Avalonia.Base.dll", + "ref/netstandard2.0/Avalonia.Base.xml", + "ref/netstandard2.0/Avalonia.Controls.dll", + "ref/netstandard2.0/Avalonia.Controls.xml", + "ref/netstandard2.0/Avalonia.DesignerSupport.dll", + "ref/netstandard2.0/Avalonia.DesignerSupport.xml", + "ref/netstandard2.0/Avalonia.Dialogs.dll", + "ref/netstandard2.0/Avalonia.Dialogs.xml", + "ref/netstandard2.0/Avalonia.Markup.Xaml.dll", + "ref/netstandard2.0/Avalonia.Markup.Xaml.xml", + "ref/netstandard2.0/Avalonia.Markup.dll", + "ref/netstandard2.0/Avalonia.Markup.xml", + "ref/netstandard2.0/Avalonia.Metal.dll", + "ref/netstandard2.0/Avalonia.Metal.xml", + "ref/netstandard2.0/Avalonia.MicroCom.dll", + "ref/netstandard2.0/Avalonia.MicroCom.xml", + "ref/netstandard2.0/Avalonia.OpenGL.dll", + "ref/netstandard2.0/Avalonia.OpenGL.xml", + "ref/netstandard2.0/Avalonia.Vulkan.dll", + "ref/netstandard2.0/Avalonia.Vulkan.xml", + "ref/netstandard2.0/Avalonia.dll", + "ref/netstandard2.0/Avalonia.xml", + "tools/net461/designer/Avalonia.Designer.HostApp.exe", + "tools/netstandard2.0/Avalonia.Build.Tasks.dll", + "tools/netstandard2.0/designer/Avalonia.Designer.HostApp.dll" + ] + }, + "Avalonia.BuildServices/0.0.29": { + "sha512": "U4eJLQdoDNHXtEba7MZUCwrBErBTxFp6sUewXBOdAhU0Kwzwaa/EKFcYm8kpcysjzKtfB4S0S9n0uxKZFz/ikw==", + "type": "package", + "path": "avalonia.buildservices/0.0.29", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "avalonia.buildservices.0.0.29.nupkg.sha512", + "avalonia.buildservices.nuspec", + "build/Avalonia.BuildServices.targets", + "buildTransitive/Avalonia.BuildServices.targets", + "tools/netstandard2.0/Avalonia.BuildServices.Collector.dll", + "tools/netstandard2.0/Avalonia.BuildServices.dll", + "tools/netstandard2.0/runtimeconfig.json" + ] + }, + "Avalonia.ReactiveUI/11.2.2": { + "sha512": "pRP+A0V67yp3ItigHvTt8YIPKRLIdPO6GxYxscr/Eb2+DwCu6DFJDScZrTzj4IubhJufyYYQDJWqMNK6B3lmfw==", + "type": "package", + "path": "avalonia.reactiveui/11.2.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "avalonia.reactiveui.11.2.2.nupkg.sha512", + "avalonia.reactiveui.nuspec", + "lib/net6.0/Avalonia.ReactiveUI.dll", + "lib/net6.0/Avalonia.ReactiveUI.xml", + "lib/net8.0/Avalonia.ReactiveUI.dll", + "lib/net8.0/Avalonia.ReactiveUI.xml", + "lib/netstandard2.0/Avalonia.ReactiveUI.dll", + "lib/netstandard2.0/Avalonia.ReactiveUI.xml" + ] + }, + "Avalonia.Remote.Protocol/11.2.2": { + "sha512": "76nQ2/TkJAmthHcCPoVznnCfsqhy+pDPFBhySoRv3ZIsj5q9jIgR0bi7rznIcFIKnfoXMEpB1uxMHbfeQ99OgQ==", + "type": "package", + "path": "avalonia.remote.protocol/11.2.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "avalonia.remote.protocol.11.2.2.nupkg.sha512", + "avalonia.remote.protocol.nuspec", + "lib/net6.0/Avalonia.Remote.Protocol.dll", + "lib/net6.0/Avalonia.Remote.Protocol.xml", + "lib/net8.0/Avalonia.Remote.Protocol.dll", + "lib/net8.0/Avalonia.Remote.Protocol.xml", + "lib/netstandard2.0/Avalonia.Remote.Protocol.dll", + "lib/netstandard2.0/Avalonia.Remote.Protocol.xml" + ] + }, "Azure.Core/1.43.0": { "sha512": "XE6GHvFAv0djbzNSC3jJPDytcDRmg2CUYlh4V4HjIjX9xLP90OYDPz1KyF02qJJJTF9wLuG4C0XIQm22MGkCww==", "type": "package", @@ -3705,6 +4055,19 @@ "logo.png" ] }, + "MicroCom.Runtime/0.11.0": { + "sha512": "MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "type": "package", + "path": "microcom.runtime/0.11.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/net5.0/MicroCom.Runtime.dll", + "lib/netstandard2.0/MicroCom.Runtime.dll", + "microcom.runtime.0.11.0.nupkg.sha512", + "microcom.runtime.nuspec" + ] + }, "Microsoft.AspNetCore.OpenApi/8.0.11": { "sha512": "1WCvCZpqvOAyul6upSJ8Rkb/QHdr4PLrDny26vFexya/nTkG3x2zt8j9qlJ5T3J+/yJD9KwlGKhho9ZDD/YiFA==", "type": "package", @@ -9793,6 +10156,8 @@ }, "projectFileDependencyGroups": { "net8.0": [ + "Avalonia >= 11.2.2", + "Avalonia.ReactiveUI >= 11.2.2", "ClosedXML >= 0.104.2", "CouchbaseNetClient >= 3.6.4", "DocumentFormat.OpenXml >= 3.1.1", @@ -9800,7 +10165,6 @@ "Microsoft.AspNetCore.OpenApi >= 8.0.11", "Microsoft.EntityFrameworkCore >= 8.0.10", "Microsoft.EntityFrameworkCore.Design >= 8.0.10", - "Microsoft.Extensions.DependencyInjection >= 8.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions >= 8.0.2", "Microsoft.Graph >= 5.62.0", "Npgsql.EntityFrameworkCore.PostgreSQL >= 8.0.10", @@ -9859,6 +10223,14 @@ "net8.0": { "targetAlias": "net8.0", "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.2.2, )" + }, + "Avalonia.ReactiveUI": { + "target": "Package", + "version": "[11.2.2, )" + }, "ClosedXML": { "target": "Package", "version": "[0.104.2, )" @@ -9889,10 +10261,6 @@ "target": "Package", "version": "[8.0.10, )" }, - "Microsoft.Extensions.DependencyInjection": { - "target": "Package", - "version": "[8.0.1, )" - }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "target": "Package", "version": "[8.0.2, )" diff --git a/Zurnal/obj/project.nuget.cache b/Zurnal/obj/project.nuget.cache index 89848d9..634648b 100644 --- a/Zurnal/obj/project.nuget.cache +++ b/Zurnal/obj/project.nuget.cache @@ -1,9 +1,13 @@ { "version": 2, - "dgSpecHash": "mfZlk4XJsWQ=", + "dgSpecHash": "HGQXDUV6T5U=", "success": true, "projectFilePath": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal\\Zurnal.csproj", "expectedPackageFiles": [ + "C:\\Users\\PC\\.nuget\\packages\\avalonia\\11.2.2\\avalonia.11.2.2.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.buildservices\\0.0.29\\avalonia.buildservices.0.0.29.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.reactiveui\\11.2.2\\avalonia.reactiveui.11.2.2.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.remote.protocol\\11.2.2\\avalonia.remote.protocol.11.2.2.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\azure.core\\1.43.0\\azure.core.1.43.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\closedxml\\0.104.2\\closedxml.0.104.2.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\closedxml.parser\\1.2.0\\closedxml.parser.1.2.0.nupkg.sha512", @@ -23,6 +27,7 @@ "C:\\Users\\PC\\.nuget\\packages\\grpc.net.clientfactory\\2.50.0\\grpc.net.clientfactory.2.50.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\grpc.net.common\\2.50.0\\grpc.net.common.2.50.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\humanizer.core\\2.14.1\\humanizer.core.2.14.1.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\microcom.runtime\\0.11.0\\microcom.runtime.0.11.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\microsoft.aspnetcore.openapi\\8.0.11\\microsoft.aspnetcore.openapi.8.0.11.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\6.0.0\\microsoft.bcl.asyncinterfaces.6.0.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\3.3.3\\microsoft.codeanalysis.analyzers.3.3.3.nupkg.sha512", diff --git a/Zurnal/ui/PresenceConsole.cs b/Zurnal/ui/PresenceConsole.cs index 2b7a7c4..1fdfa89 100644 --- a/Zurnal/ui/PresenceConsole.cs +++ b/Zurnal/ui/PresenceConsole.cs @@ -1,6 +1,5 @@ using data.RemoteData.RemoteDataBase.DAO; using data.Repository; -using domain.Models; using domain.UseCase; using remoteData.RemoteDataBase; diff --git a/Zurnal/ui/UserConsole.cs b/Zurnal/ui/UserConsole.cs index 03ad4ae..c01b991 100644 --- a/Zurnal/ui/UserConsole.cs +++ b/Zurnal/ui/UserConsole.cs @@ -1,5 +1,4 @@ -using domain.Models; -using domain.UseCase; +using domain.UseCase; using System.Text; namespace ui diff --git a/Zurnal_Vizual/App.axaml.cs b/Zurnal_Vizual/App.axaml.cs index 03f7090..72e3489 100644 --- a/Zurnal_Vizual/App.axaml.cs +++ b/Zurnal_Vizual/App.axaml.cs @@ -1,9 +1,11 @@ -using System.Linq; using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Data.Core.Plugins; using Avalonia.Markup.Xaml; -using Zurnal_Vizual.Views.MainWindow; +using Microsoft.Extensions.DependencyInjection; +using Presence.Desktop.DI; +using Presence.Desktop.ViewModels; +using System.Linq; namespace Zurnal_Vizual { @@ -13,19 +15,20 @@ namespace Zurnal_Vizual { AvaloniaXamlLoader.Load(this); } - public override void OnFrameworkInitializationCompleted() { + var servisCollect = new ServiceCollection(); + servisCollect.AddCommonService(); + var sesrvis = servisCollect.BuildServiceProvider(); + var mainViewModel = sesrvis.GetRequiredService(); if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { DisableAvaloniaDataAnnotationValidation(); - var mainWindow = new MainWindow + desktop.MainWindow = new MainWindow { - DataContext = new MainViewModel(), + DataContext = mainViewModel, }; - - desktop.MainWindow = mainWindow; } base.OnFrameworkInitializationCompleted(); diff --git a/Zurnal_Vizual/DI/ServiceColletionExtensions.cs b/Zurnal_Vizual/DI/ServiceColletionExtensions.cs new file mode 100644 index 0000000..634c042 --- /dev/null +++ b/Zurnal_Vizual/DI/ServiceColletionExtensions.cs @@ -0,0 +1,20 @@ +using data.Repository; +using domain.Service; +using domain.UseCase; +using Microsoft.Extensions.DependencyInjection; +using Presence.Desktop.ViewModels; +using remoteData.RemoteDataBase; + +namespace Presence.Desktop.DI +{ + public static class ServiceColletionExtensions + { + public static void AddCommonService(this IServiceCollection collection) { + collection + .AddDbContext() + .AddSingleton() + .AddTransient() + .AddTransient(); + } + } +} diff --git a/Zurnal_Vizual/MainWindow.cs b/Zurnal_Vizual/MainWindow.cs deleted file mode 100644 index c1ca3f9..0000000 --- a/Zurnal_Vizual/MainWindow.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Avalonia.Controls; -using Zurnal_Vizual.Views.MainWindow; - -namespace Zurnal_Vizual -{ - internal class MainWindow : Window - { - public MainViewModel DataContext { get; set; } - } -} \ No newline at end of file diff --git a/Zurnal_Vizual/ViewLocator.cs b/Zurnal_Vizual/ViewLocator.cs index 3d65f78..645baec 100644 --- a/Zurnal_Vizual/ViewLocator.cs +++ b/Zurnal_Vizual/ViewLocator.cs @@ -1,7 +1,7 @@ using System; using Avalonia.Controls; using Avalonia.Controls.Templates; -using Zurnal_Vizual.ViewModels; +using Presence.Desktop.ViewModels; namespace Zurnal_Vizual { diff --git a/Zurnal_Vizual/ViewModels/GroupViewModel.cs b/Zurnal_Vizual/ViewModels/GroupViewModel.cs new file mode 100644 index 0000000..641fd47 --- /dev/null +++ b/Zurnal_Vizual/ViewModels/GroupViewModel.cs @@ -0,0 +1,79 @@ +using data.RemoteData.RemoteDataBase.DAO; +using domain.UseCase; +using DynamicData; +using ReactiveUI; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reactive.Linq; + +namespace Presence.Desktop.ViewModels +{ + public class GroupViewModel : ViewModelBase, IRoutableViewModel + { + private readonly List _GroupDaosDataSource = new List(); + private ObservableCollection _groups; + public ObservableCollection Groups => _groups; + + public GroupDao? SelectedGroupItem { + get => _selectedGroupItem; + set => this.RaiseAndSetIfChanged(ref _selectedGroupItem, value); } + + private GroupDao? _selectedGroupItem; + + + private GroupUseCase _groupUseCase; + public ObservableCollection Users { get => _users;} + public ObservableCollection _users; + public GroupViewModel(GroupUseCase groupUseCase) + { + _groupUseCase = groupUseCase; + _users = new ObservableCollection(); + RefreshGroups(); + this.WhenAnyValue(vm => vm.SelectedGroupItem) + .Subscribe(_ => + { RefreshGroups(); + SetUsers(); + }); + + } + + private void SetUsers() + { + if(SelectedGroupItem == null) return; + Users.Clear(); + var group = _groups.First(it => it.Id == SelectedGroupItem.Id); + if(group.Users == null) return; + foreach (var item in group.Users) + { + Users.Add(item); + } + } + + private void RefreshGroups() + { + _GroupDaosDataSource.Clear(); + foreach (var item in _groupUseCase.GetGroupsWithStudents()) + { + GroupDao GroupDao = new GroupDao + { + Id = item.Id, + Name = item.Name, + Users = item.Users?.Select(user => new UserDao + { + FIO = user.FIO, + Guid = user.Guid, + Group = new GroupDao { Id = item.Id, Name = item.Name } + } + ).ToList() + }; + _GroupDaosDataSource.Add(GroupDao); + } + _groups = new ObservableCollection(_GroupDaosDataSource); + } + public string? UrlPathSegment { get; } + public IScreen HostScreen { get; } + } +} + diff --git a/Zurnal_Vizual/ViewModels/MainWindowViewModel.cs b/Zurnal_Vizual/ViewModels/MainWindowViewModel.cs index 5787aa2..4f4e78a 100644 --- a/Zurnal_Vizual/ViewModels/MainWindowViewModel.cs +++ b/Zurnal_Vizual/ViewModels/MainWindowViewModel.cs @@ -1,101 +1,13 @@ -using Avalonia.Controls; -using data.RemoteData.RemoteDataBase.DAO; -using ReactiveUI; -using System; -using System.Collections.ObjectModel; -using System.Reactive; +using domain.UseCase; -namespace Zurnal_Vizual.Views.MainWindow +namespace Presence.Desktop.ViewModels; + +public class MainWindowViewModel: ViewModelBase { - public class MainViewModel : ReactiveObject + private readonly GroupUseCase _groupService; + public MainWindowViewModel(GroupUseCase groupService) { - private ObservableCollection _groups; - private GroupDao _selectedGroup; - private ObservableCollection _students; - private string _selectedSortOption; - - public ObservableCollection Groups - { - get => _groups; - set => this.RaiseAndSetIfChanged(ref _groups, value); - } - - public GroupDao SelectedGroup - { - get => _selectedGroup; - set - { - this.RaiseAndSetIfChanged(ref _selectedGroup, value); - LoadStudents(); - } - } - - public ObservableCollection Students - { - get => _students; - set => this.RaiseAndSetIfChanged(ref _students, value); - } - - public string SelectedSortOption - { - get => _selectedSortOption; - set - { - this.RaiseAndSetIfChanged(ref _selectedSortOption, value); - SortStudents(); - } - } - - public ReactiveCommand DeleteAllStudentsCommand { get; } - public ReactiveCommand ImportStudentsCommand { get; } - private ObservableCollection _sortOptions; - public ObservableCollection SortOptions - { - get => _sortOptions; - set => this.RaiseAndSetIfChanged(ref _sortOptions, value); - } - - public MainViewModel() - { - DeleteAllStudentsCommand = ReactiveCommand.Create(DeleteAllStudents); - ImportStudentsCommand = ReactiveCommand.Create(ImportStudents); - Groups = new ObservableCollection(); - Students = new ObservableCollection(); - SortOptions = new ObservableCollection { "По имени", "По дате" }; - } - - public void LoadStudents() - { - //реализовать загрузку студентов по выбранной группе - } - - public void SortStudents() - { - //реализовать сортеровку пользователей (студентов) по имени и Id - } - - public void DeleteAllStudents() - { - //реализовать удоление студентов по имени или Id - } - - public void ImportStudents() - { - //реализовать добавление студентов по средсвам 2 полей для ввода текста - } - - public void ShowContextMenu(Window window) - { - var contextMenu = new ContextMenu(); - var deleteItem = new MenuItem { Header = "Удалить всех студентов" }; - deleteItem.Click += (sender, e) => DeleteAllStudentsCommand.Execute().Subscribe(); - contextMenu.Items.Add(deleteItem); - - var importItem = new MenuItem { Header = "Импортировать студентов" }; - importItem.Click += (sender, e) => ImportStudentsCommand.Execute().Subscribe(); - contextMenu.Items.Add(importItem); - - window.ContextMenu = contextMenu; - } + _groupService = groupService; } + } \ No newline at end of file diff --git a/Zurnal_Vizual/ViewModels/PrecenceViewModel.cs b/Zurnal_Vizual/ViewModels/PrecenceViewModel.cs new file mode 100644 index 0000000..d492c79 --- /dev/null +++ b/Zurnal_Vizual/ViewModels/PrecenceViewModel.cs @@ -0,0 +1,11 @@ +using ReactiveUI; + +namespace Presence.Desktop.ViewModels; + +public class PresenceViewModel: ViewModelBase, IRoutableViewModel +{ + public string? UrlPathSegment { get; } + public IScreen HostScreen { get; } +} + + \ No newline at end of file diff --git a/Zurnal_Vizual/ViewModels/ViewModelBase.cs b/Zurnal_Vizual/ViewModels/ViewModelBase.cs index e3ce0e9..66c82c5 100644 --- a/Zurnal_Vizual/ViewModels/ViewModelBase.cs +++ b/Zurnal_Vizual/ViewModels/ViewModelBase.cs @@ -1,8 +1,8 @@ -using CommunityToolkit.Mvvm.ComponentModel; +using ReactiveUI; -namespace Zurnal_Vizual.ViewModels +namespace Presence.Desktop.ViewModels { - public class ViewModelBase : ObservableObject + public class ViewModelBase : ReactiveObject { } } diff --git a/Zurnal_Vizual/Views/MainWindow.axaml.cs b/Zurnal_Vizual/Views/MainWindow.axaml.cs index e69de29..16500b1 100644 --- a/Zurnal_Vizual/Views/MainWindow.axaml.cs +++ b/Zurnal_Vizual/Views/MainWindow.axaml.cs @@ -0,0 +1,17 @@ +using Avalonia.Markup.Xaml; +using Avalonia.ReactiveUI; +using Presence.Desktop.ViewModels; +using ReactiveUI; + +namespace Zurnal_Vizual +{ + public partial class MainWindow : ReactiveWindow + { + public MainWindow() + { + this.WhenActivated(disposables => { }); + AvaloniaXamlLoader.Load(this); + + } + } +} \ No newline at end of file diff --git a/Zurnal_Vizual/Zurnal_Vizual.csproj b/Zurnal_Vizual/Zurnal_Vizual.csproj index bffad75..62b6291 100644 --- a/Zurnal_Vizual/Zurnal_Vizual.csproj +++ b/Zurnal_Vizual/Zurnal_Vizual.csproj @@ -6,6 +6,7 @@ true app.manifest true + False @@ -15,8 +16,8 @@ - - + + @@ -39,8 +40,7 @@ - - + diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/Zurnal_Vizual/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 97ab637..8ff626c 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/Zurnal_Vizual/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -48f1e7b759289e7cb89c0cc9e31067f6a72cfe103e0119b5459f99387cb2d683 +a0da20e6d8611da6aacaa96888bb09bad5cc88727b7dd7f0ffd2a889dead9cea diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfo.cs b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfo.cs index 18ba9f3..3b30f70 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfo.cs +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Zurnal_Vizual")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8e78b129eaddfab72461facfad823b5dae9d0c3c")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9644a4176c58e47c87596bcab2afbb9d6784b6be")] [assembly: System.Reflection.AssemblyProductAttribute("Zurnal_Vizual")] [assembly: System.Reflection.AssemblyTitleAttribute("Zurnal_Vizual")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfoInputs.cache b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfoInputs.cache index 6a91128..6871b53 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfoInputs.cache +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfoInputs.cache @@ -1 +1 @@ -d636cc88b6ff68f871fc141afef98bfe0709f6a184d9dd478a51cfb335e2b0cd +52cde88bd7fa674d83ab178f04c78ba864fd0e7caa65d7765f1b4dd246d870b1 diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.GeneratedMSBuildEditorConfig.editorconfig b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.GeneratedMSBuildEditorConfig.editorconfig index 58a4e93..137f390 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.GeneratedMSBuildEditorConfig.editorconfig +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.GeneratedMSBuildEditorConfig.editorconfig @@ -35,4 +35,3 @@ build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml [C:/Users/PC/source/repos/Zurnal_Vizual/Zurnal_Vizual/Views/MainWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.assets.cache b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.assets.cache index 9f4012e..dc8cda7 100644 Binary files a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.assets.cache and b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.assets.cache differ diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.AssemblyReference.cache b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.AssemblyReference.cache index 51a7969..75356f3 100644 Binary files a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.AssemblyReference.cache and b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.AssemblyReference.cache differ diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.CoreCompileInputs.cache b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.CoreCompileInputs.cache index b9c87af..25a6c55 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.CoreCompileInputs.cache +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4cbbc3dc0820b07e3ec5ec7fe09ca99079b596294c71fb7d8d1eba8182911ba1 +f72d8262524e5b5b37ccd4d6785782d921a53dade7e5fdbfa3292952bbd82c6b diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.sourcelink.json b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.sourcelink.json index 45c2372..7e272fa 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.sourcelink.json +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\*":"https://raw.githubusercontent.com/NuclierOwl/Jornal/8e78b129eaddfab72461facfad823b5dae9d0c3c/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\*":"https://raw.githubusercontent.com/NuclierOwl/Jornal/9644a4176c58e47c87596bcab2afbb9d6784b6be/*"}} \ No newline at end of file diff --git a/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.dgspec.json b/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.dgspec.json index b3e940e..5201b4c 100644 --- a/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.dgspec.json +++ b/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.dgspec.json @@ -50,6 +50,14 @@ "net8.0": { "targetAlias": "net8.0", "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.2.2, )" + }, + "Avalonia.ReactiveUI": { + "target": "Package", + "version": "[11.2.2, )" + }, "ClosedXML": { "target": "Package", "version": "[0.104.2, )" @@ -80,10 +88,6 @@ "target": "Package", "version": "[8.0.10, )" }, - "Microsoft.Extensions.DependencyInjection": { - "target": "Package", - "version": "[8.0.1, )" - }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "target": "Package", "version": "[8.0.2, )" @@ -185,11 +189,11 @@ }, "Avalonia": { "target": "Package", - "version": "[11.2.1, )" + "version": "[11.2.2, )" }, "Avalonia.Desktop": { "target": "Package", - "version": "[11.2.1, )" + "version": "[11.2.2, )" }, "Avalonia.Diagnostics": { "target": "Package", @@ -253,13 +257,9 @@ "target": "Package", "version": "[5.63.0, )" }, - "Npgsql.EntityFrameworkCore.PostgreSQL": { + "ReactiveUI": { "target": "Package", - "version": "[9.0.1, )" - }, - "Swashbuckle.AspNetCore": { - "target": "Package", - "version": "[7.1.0, )" + "version": "[20.1.63, )" }, "Swashbuckle.AspNetCore.Swagger": { "target": "Package", diff --git a/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.g.props b/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.g.props index 6876ecd..7c5a8f4 100644 --- a/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.g.props +++ b/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.g.props @@ -14,20 +14,18 @@ - - - + + - - + C:\Users\PC\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5 C:\Users\PC\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4 C:\Users\PC\.nuget\packages\avalonia.buildservices\0.0.29 - C:\Users\PC\.nuget\packages\avalonia\11.2.1 + C:\Users\PC\.nuget\packages\avalonia\11.2.2 \ No newline at end of file diff --git a/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.g.targets b/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.g.targets index e02d316..807f5e8 100644 --- a/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.g.targets +++ b/Zurnal_Vizual/obj/Zurnal_Vizual.csproj.nuget.g.targets @@ -2,16 +2,15 @@ - - - - - - + + + + + \ No newline at end of file diff --git a/Zurnal_Vizual/obj/project.assets.json b/Zurnal_Vizual/obj/project.assets.json index 7882329..bd29caf 100644 --- a/Zurnal_Vizual/obj/project.assets.json +++ b/Zurnal_Vizual/obj/project.assets.json @@ -5,11 +5,11 @@ "Arch.EntityFrameworkCore.Analyzers/2.1.15": { "type": "package" }, - "Avalonia/11.2.1": { + "Avalonia/11.2.2": { "type": "package", "dependencies": { "Avalonia.BuildServices": "0.0.29", - "Avalonia.Remote.Protocol": "11.2.1", + "Avalonia.Remote.Protocol": "11.2.2", "MicroCom.Runtime": "0.11.0" }, "compile": { @@ -144,14 +144,14 @@ } } }, - "Avalonia.Desktop/11.2.1": { + "Avalonia.Desktop/11.2.2": { "type": "package", "dependencies": { - "Avalonia": "11.2.1", - "Avalonia.Native": "11.2.1", - "Avalonia.Skia": "11.2.1", - "Avalonia.Win32": "11.2.1", - "Avalonia.X11": "11.2.1" + "Avalonia": "11.2.2", + "Avalonia.Native": "11.2.2", + "Avalonia.Skia": "11.2.2", + "Avalonia.Win32": "11.2.2", + "Avalonia.X11": "11.2.2" }, "compile": { "lib/net8.0/Avalonia.Desktop.dll": { @@ -199,10 +199,10 @@ } } }, - "Avalonia.FreeDesktop/11.2.1": { + "Avalonia.FreeDesktop/11.2.2": { "type": "package", "dependencies": { - "Avalonia": "11.2.1", + "Avalonia": "11.2.2", "Tmds.DBus.Protocol": "0.20.0" }, "compile": { @@ -216,10 +216,10 @@ } } }, - "Avalonia.Native/11.2.1": { + "Avalonia.Native/11.2.2": { "type": "package", "dependencies": { - "Avalonia": "11.2.1" + "Avalonia": "11.2.2" }, "compile": { "lib/net8.0/Avalonia.Native.dll": { @@ -238,7 +238,25 @@ } } }, - "Avalonia.Remote.Protocol/11.2.1": { + "Avalonia.ReactiveUI/11.2.2": { + "type": "package", + "dependencies": { + "Avalonia": "11.2.2", + "ReactiveUI": "20.1.1", + "System.Reactive": "6.0.1" + }, + "compile": { + "lib/net8.0/Avalonia.ReactiveUI.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.ReactiveUI.dll": { + "related": ".xml" + } + } + }, + "Avalonia.Remote.Protocol/11.2.2": { "type": "package", "compile": { "lib/net8.0/Avalonia.Remote.Protocol.dll": { @@ -251,16 +269,16 @@ } } }, - "Avalonia.Skia/11.2.1": { + "Avalonia.Skia/11.2.2": { "type": "package", "dependencies": { - "Avalonia": "11.2.1", - "HarfBuzzSharp": "7.3.0.2", - "HarfBuzzSharp.NativeAssets.Linux": "7.3.0.2", - "HarfBuzzSharp.NativeAssets.WebAssembly": "7.3.0.3-preview.2.2", - "SkiaSharp": "2.88.8", - "SkiaSharp.NativeAssets.Linux": "2.88.8", - "SkiaSharp.NativeAssets.WebAssembly": "2.88.8" + "Avalonia": "11.2.2", + "HarfBuzzSharp": "7.3.0.3", + "HarfBuzzSharp.NativeAssets.Linux": "7.3.0.3", + "HarfBuzzSharp.NativeAssets.WebAssembly": "7.3.0.3", + "SkiaSharp": "2.88.9", + "SkiaSharp.NativeAssets.Linux": "2.88.9", + "SkiaSharp.NativeAssets.WebAssembly": "2.88.9" }, "compile": { "lib/net8.0/Avalonia.Skia.dll": { @@ -305,10 +323,10 @@ } } }, - "Avalonia.Win32/11.2.1": { + "Avalonia.Win32/11.2.2": { "type": "package", "dependencies": { - "Avalonia": "11.2.1", + "Avalonia": "11.2.2", "Avalonia.Angle.Windows.Natives": "2.1.22045.20230930" }, "compile": { @@ -322,12 +340,12 @@ } } }, - "Avalonia.X11/11.2.1": { + "Avalonia.X11/11.2.2": { "type": "package", "dependencies": { - "Avalonia": "11.2.1", - "Avalonia.FreeDesktop": "11.2.1", - "Avalonia.Skia": "11.2.1" + "Avalonia": "11.2.2", + "Avalonia.FreeDesktop": "11.2.2", + "Avalonia.Skia": "11.2.2" }, "compile": { "lib/net8.0/Avalonia.X11.dll": { @@ -671,11 +689,11 @@ } } }, - "HarfBuzzSharp/7.3.0.2": { + "HarfBuzzSharp/7.3.0.3": { "type": "package", "dependencies": { - "HarfBuzzSharp.NativeAssets.Win32": "7.3.0.2", - "HarfBuzzSharp.NativeAssets.macOS": "7.3.0.2" + "HarfBuzzSharp.NativeAssets.Win32": "7.3.0.3", + "HarfBuzzSharp.NativeAssets.macOS": "7.3.0.3" }, "compile": { "lib/net6.0/HarfBuzzSharp.dll": { @@ -688,10 +706,10 @@ } } }, - "HarfBuzzSharp.NativeAssets.Linux/7.3.0.2": { + "HarfBuzzSharp.NativeAssets.Linux/7.3.0.3": { "type": "package", "dependencies": { - "HarfBuzzSharp": "7.3.0.2" + "HarfBuzzSharp": "7.3.0.3" }, "compile": { "lib/net6.0/_._": {} @@ -718,7 +736,7 @@ } } }, - "HarfBuzzSharp.NativeAssets.macOS/7.3.0.2": { + "HarfBuzzSharp.NativeAssets.macOS/7.3.0.3": { "type": "package", "compile": { "lib/net6.0/_._": {} @@ -733,7 +751,7 @@ } } }, - "HarfBuzzSharp.NativeAssets.WebAssembly/7.3.0.3-preview.2.2": { + "HarfBuzzSharp.NativeAssets.WebAssembly/7.3.0.3": { "type": "package", "compile": { "lib/netstandard1.0/_._": {} @@ -746,7 +764,7 @@ "buildTransitive/netstandard1.0/HarfBuzzSharp.NativeAssets.WebAssembly.targets": {} } }, - "HarfBuzzSharp.NativeAssets.Win32/7.3.0.2": { + "HarfBuzzSharp.NativeAssets.Win32/7.3.0.3": { "type": "package", "compile": { "lib/net6.0/_._": {} @@ -1735,12 +1753,10 @@ "Microsoft.Extensions.ApiDescription.Server/6.0.5": { "type": "package", "build": { - "build/Microsoft.Extensions.ApiDescription.Server.props": {}, - "build/Microsoft.Extensions.ApiDescription.Server.targets": {} + "build/_._": {} }, "buildMultiTargeting": { - "buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.props": {}, - "buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets": {} + "buildMultiTargeting/_._": {} } }, "Microsoft.Extensions.Caching.Abstractions/9.0.0": { @@ -2686,10 +2702,10 @@ } } }, - "Npgsql/9.0.1": { + "Npgsql/8.0.5": { "type": "package", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "8.0.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" }, "compile": { "lib/net8.0/Npgsql.dll": { @@ -2702,12 +2718,13 @@ } } }, - "Npgsql.EntityFrameworkCore.PostgreSQL/9.0.1": { + "Npgsql.EntityFrameworkCore.PostgreSQL/8.0.10": { "type": "package", "dependencies": { - "Microsoft.EntityFrameworkCore": "[9.0.0, 10.0.0)", - "Microsoft.EntityFrameworkCore.Relational": "[9.0.0, 10.0.0)", - "Npgsql": "9.0.1" + "Microsoft.EntityFrameworkCore": "8.0.10", + "Microsoft.EntityFrameworkCore.Abstractions": "8.0.10", + "Microsoft.EntityFrameworkCore.Relational": "8.0.10", + "Npgsql": "8.0.5" }, "compile": { "lib/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll": { @@ -2835,11 +2852,11 @@ } } }, - "SkiaSharp/2.88.8": { + "SkiaSharp/2.88.9": { "type": "package", "dependencies": { - "SkiaSharp.NativeAssets.Win32": "2.88.8", - "SkiaSharp.NativeAssets.macOS": "2.88.8" + "SkiaSharp.NativeAssets.Win32": "2.88.9", + "SkiaSharp.NativeAssets.macOS": "2.88.9" }, "compile": { "lib/net6.0/SkiaSharp.dll": { @@ -2852,10 +2869,10 @@ } } }, - "SkiaSharp.NativeAssets.Linux/2.88.8": { + "SkiaSharp.NativeAssets.Linux/2.88.9": { "type": "package", "dependencies": { - "SkiaSharp": "2.88.8" + "SkiaSharp": "2.88.9" }, "compile": { "lib/net6.0/_._": {} @@ -2882,7 +2899,7 @@ } } }, - "SkiaSharp.NativeAssets.macOS/2.88.8": { + "SkiaSharp.NativeAssets.macOS/2.88.9": { "type": "package", "compile": { "lib/net6.0/_._": {} @@ -2897,7 +2914,7 @@ } } }, - "SkiaSharp.NativeAssets.WebAssembly/2.88.8": { + "SkiaSharp.NativeAssets.WebAssembly/2.88.9": { "type": "package", "compile": { "lib/netstandard1.0/_._": {} @@ -2910,7 +2927,7 @@ "buildTransitive/netstandard1.0/SkiaSharp.NativeAssets.WebAssembly.targets": {} } }, - "SkiaSharp.NativeAssets.Win32/2.88.8": { + "SkiaSharp.NativeAssets.Win32/2.88.9": { "type": "package", "compile": { "lib/net6.0/_._": {} @@ -2968,19 +2985,19 @@ "lib/net5.0/Std.UriTemplate.dll": {} } }, - "Swashbuckle.AspNetCore/7.1.0": { + "Swashbuckle.AspNetCore/7.0.0": { "type": "package", "dependencies": { "Microsoft.Extensions.ApiDescription.Server": "6.0.5", - "Swashbuckle.AspNetCore.Swagger": "7.1.0", - "Swashbuckle.AspNetCore.SwaggerGen": "7.1.0", - "Swashbuckle.AspNetCore.SwaggerUI": "7.1.0" + "Swashbuckle.AspNetCore.Swagger": "7.0.0", + "Swashbuckle.AspNetCore.SwaggerGen": "7.0.0", + "Swashbuckle.AspNetCore.SwaggerUI": "7.0.0" }, "build": { - "build/Swashbuckle.AspNetCore.props": {} + "build/_._": {} }, "buildMultiTargeting": { - "buildMultiTargeting/Swashbuckle.AspNetCore.props": {} + "buildMultiTargeting/_._": {} } }, "Swashbuckle.AspNetCore.Swagger/7.1.0": { @@ -4579,13 +4596,14 @@ "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { + "Avalonia": "11.2.2", + "Avalonia.ReactiveUI": "11.2.2", "ClosedXML": "0.104.2", "CouchbaseNetClient": "3.6.4", "DocumentFormat.OpenXml": "3.1.1", "EPPlus": "7.4.2", "Microsoft.AspNetCore.OpenApi": "8.0.11", "Microsoft.EntityFrameworkCore": "8.0.10", - "Microsoft.Extensions.DependencyInjection": "8.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", "Microsoft.Graph": "5.62.0", "Npgsql.EntityFrameworkCore.PostgreSQL": "8.0.10", @@ -4615,10 +4633,10 @@ "arch.entityframeworkcore.analyzers.nuspec" ] }, - "Avalonia/11.2.1": { - "sha512": "AyYhIN2A7bRwxp6BFHrIbXAHUFPXegzSMYwDrUnw1BzZs9ctwYTiCPCM5wbE2PXsEBwFDVJ/a2YHTOp56fSYAw==", + "Avalonia/11.2.2": { + "sha512": "gycD/+pjaNh6288vEGDOcgks3Gz/dhZaZu6VSao6wMBXAQpBMEFlU4gW1dXXH2N0zdOlv3Jo1PgmH2megCe2yw==", "type": "package", - "path": "avalonia/11.2.1", + "path": "avalonia/11.2.2", "hasTools": true, "files": [ ".nupkg.metadata", @@ -4626,7 +4644,7 @@ "Icon.png", "analyzers/dotnet/cs/Avalonia.Analyzers.dll", "analyzers/dotnet/cs/Avalonia.Generators.dll", - "avalonia.11.2.1.nupkg.sha512", + "avalonia.11.2.2.nupkg.sha512", "avalonia.nuspec", "build/Avalonia.Generators.props", "build/Avalonia.props", @@ -4853,15 +4871,15 @@ "lib/netstandard2.0/Avalonia.Controls.DataGrid.xml" ] }, - "Avalonia.Desktop/11.2.1": { - "sha512": "q6alzkTgFjukOrbiiFlh0mkhkxGRMRTMS8zdNEixIl9apPnD2ln9sjAC4NR2agNz5+HmZVfXYu6kYK12rMmKwA==", + "Avalonia.Desktop/11.2.2": { + "sha512": "UPq1dmCR4AxDEaR7H/L/hqYlzqAox0LbUUChfbTs8HhSRZV4uoDBVzebp8Gl5x0sb6j+nr3Nbp1lpr/4C1dG4A==", "type": "package", - "path": "avalonia.desktop/11.2.1", + "path": "avalonia.desktop/11.2.2", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", - "avalonia.desktop.11.2.1.nupkg.sha512", + "avalonia.desktop.11.2.2.nupkg.sha512", "avalonia.desktop.nuspec", "lib/net6.0/Avalonia.Desktop.dll", "lib/net6.0/Avalonia.Desktop.xml", @@ -4907,15 +4925,15 @@ "lib/netstandard2.0/Avalonia.Fonts.Inter.xml" ] }, - "Avalonia.FreeDesktop/11.2.1": { - "sha512": "ChKdPjQ2uBJUN0y+/RsdoETzXRn/q1eWFBDwprDy+Zi/AVkUfRk06hKbsb/U+Q3zO65CMEprRcMPbys0EkK2vg==", + "Avalonia.FreeDesktop/11.2.2": { + "sha512": "bx5obPjGTmAg1YtHJexyvetEXQgfu5QjQjczvCjd6f8OFoeVqUP76ttsBwEkPhP9aVGGZ7xFKF9JGmgC4zCHbg==", "type": "package", - "path": "avalonia.freedesktop/11.2.1", + "path": "avalonia.freedesktop/11.2.2", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", - "avalonia.freedesktop.11.2.1.nupkg.sha512", + "avalonia.freedesktop.11.2.2.nupkg.sha512", "avalonia.freedesktop.nuspec", "lib/net6.0/Avalonia.FreeDesktop.dll", "lib/net6.0/Avalonia.FreeDesktop.xml", @@ -4925,15 +4943,15 @@ "lib/netstandard2.0/Avalonia.FreeDesktop.xml" ] }, - "Avalonia.Native/11.2.1": { - "sha512": "1cVasDUIkqfAYLkaLFDx+VDZymer2v643OYD6Jd6nzP20TNTqN2LfFOpxXCTYMrWc9Dk5AoVJJCrz3wRE5kooQ==", + "Avalonia.Native/11.2.2": { + "sha512": "eJYdGvLNzqSPVzubMm78ma3so96t7xuxQS4tKz3dOw13lF+/X32A9vflkifyIMKY/AqFsj7T7qHG7g8W0T5RWg==", "type": "package", - "path": "avalonia.native/11.2.1", + "path": "avalonia.native/11.2.2", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", - "avalonia.native.11.2.1.nupkg.sha512", + "avalonia.native.11.2.2.nupkg.sha512", "avalonia.native.nuspec", "lib/net6.0/Avalonia.Native.dll", "lib/net6.0/Avalonia.Native.xml", @@ -4944,15 +4962,33 @@ "runtimes/osx/native/libAvaloniaNative.dylib" ] }, - "Avalonia.Remote.Protocol/11.2.1": { - "sha512": "aqEialxjir7DO/dOFf7BGN/yQ4/adSC5UuVfqBr/RUHOENSH6CqoHj8kmtmJxnuz7ESQFSB2+h1kLVnk5csiDw==", + "Avalonia.ReactiveUI/11.2.2": { + "sha512": "pRP+A0V67yp3ItigHvTt8YIPKRLIdPO6GxYxscr/Eb2+DwCu6DFJDScZrTzj4IubhJufyYYQDJWqMNK6B3lmfw==", "type": "package", - "path": "avalonia.remote.protocol/11.2.1", + "path": "avalonia.reactiveui/11.2.2", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", - "avalonia.remote.protocol.11.2.1.nupkg.sha512", + "avalonia.reactiveui.11.2.2.nupkg.sha512", + "avalonia.reactiveui.nuspec", + "lib/net6.0/Avalonia.ReactiveUI.dll", + "lib/net6.0/Avalonia.ReactiveUI.xml", + "lib/net8.0/Avalonia.ReactiveUI.dll", + "lib/net8.0/Avalonia.ReactiveUI.xml", + "lib/netstandard2.0/Avalonia.ReactiveUI.dll", + "lib/netstandard2.0/Avalonia.ReactiveUI.xml" + ] + }, + "Avalonia.Remote.Protocol/11.2.2": { + "sha512": "76nQ2/TkJAmthHcCPoVznnCfsqhy+pDPFBhySoRv3ZIsj5q9jIgR0bi7rznIcFIKnfoXMEpB1uxMHbfeQ99OgQ==", + "type": "package", + "path": "avalonia.remote.protocol/11.2.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "avalonia.remote.protocol.11.2.2.nupkg.sha512", "avalonia.remote.protocol.nuspec", "lib/net6.0/Avalonia.Remote.Protocol.dll", "lib/net6.0/Avalonia.Remote.Protocol.xml", @@ -4962,15 +4998,15 @@ "lib/netstandard2.0/Avalonia.Remote.Protocol.xml" ] }, - "Avalonia.Skia/11.2.1": { - "sha512": "FkqiXWT1hN0s5MIx5IKDGZaqewQENikQh6aBQyApiZVu5koa8H8RW1yfb2cFK3M4IVIyhqwl8ZirkXsS18lf/Q==", + "Avalonia.Skia/11.2.2": { + "sha512": "/kNUpB8Lnx7wvVNLybkMjp9YbG4xdiyAmYTBRQAM7hObMPQRx5HKUQJ9AmduCt9KY50lvUkCfTbk/ROnUFhQ3w==", "type": "package", - "path": "avalonia.skia/11.2.1", + "path": "avalonia.skia/11.2.2", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", - "avalonia.skia.11.2.1.nupkg.sha512", + "avalonia.skia.11.2.2.nupkg.sha512", "avalonia.skia.nuspec", "lib/net6.0/Avalonia.Skia.dll", "lib/net6.0/Avalonia.Skia.xml", @@ -5016,15 +5052,15 @@ "lib/netstandard2.0/Avalonia.Themes.Simple.xml" ] }, - "Avalonia.Win32/11.2.1": { - "sha512": "7Gfw7S1PoINaCXaIV1rh7zo82IhsqhR7a0PAt281cBrfDkJiNU0DYgW2RZxKl3oVFxtfbxJZbdP7hSVmHvoDfw==", + "Avalonia.Win32/11.2.2": { + "sha512": "MQDY5f+GIbuv5klPUWf3WSh0cugEfxnHVQKkIJ02FnR3xzZpEQyfMvqfG8emMKmLAQ7ivqH68Mny0WuPKofc0Q==", "type": "package", - "path": "avalonia.win32/11.2.1", + "path": "avalonia.win32/11.2.2", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", - "avalonia.win32.11.2.1.nupkg.sha512", + "avalonia.win32.11.2.2.nupkg.sha512", "avalonia.win32.nuspec", "lib/net6.0/Avalonia.Win32.dll", "lib/net6.0/Avalonia.Win32.xml", @@ -5034,15 +5070,15 @@ "lib/netstandard2.0/Avalonia.Win32.xml" ] }, - "Avalonia.X11/11.2.1": { - "sha512": "h2aCpyLmxGkldPK7cbncEgyobrJ5En7gQtrwVARLmN32Rw6dHut3jyF3P8at2DmWxRuKwZVXgWBSSI62hINgrQ==", + "Avalonia.X11/11.2.2": { + "sha512": "uptryb4T1h6mBgMxRU0B7IX01CjRwT0KvxPbq2ObhF8CgehQPIl52lcAe09CFi+ZEeu3EJi1/Fa1MH4PDsp4Sw==", "type": "package", - "path": "avalonia.x11/11.2.1", + "path": "avalonia.x11/11.2.2", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", - "avalonia.x11.11.2.1.nupkg.sha512", + "avalonia.x11.11.2.2.nupkg.sha512", "avalonia.x11.nuspec", "lib/net6.0/Avalonia.X11.dll", "lib/net6.0/Avalonia.X11.xml", @@ -5577,16 +5613,16 @@ "packageIcon.png" ] }, - "HarfBuzzSharp/7.3.0.2": { - "sha512": "0tCd6HyCmNsX/DniCp2b00fo0xPbdNwKOs9BxxyT8oOOuMlWjcSFwzONKyeckCKVBFEsbSmsAHPDTqxoSDwZMg==", + "HarfBuzzSharp/7.3.0.3": { + "sha512": "Hq+5+gx10coOvuRgB13KBwiWxJq1QeYuhtVLbA01ZCWaugOnolUahF44KvrQTUUHDNk/C7HB6SMaebsZeOdhgg==", "type": "package", - "path": "harfbuzzsharp/7.3.0.2", + "path": "harfbuzzsharp/7.3.0.3", "files": [ ".nupkg.metadata", ".signature.p7s", "LICENSE.txt", "THIRD-PARTY-NOTICES.txt", - "harfbuzzsharp.7.3.0.2.nupkg.sha512", + "harfbuzzsharp.7.3.0.3.nupkg.sha512", "harfbuzzsharp.nuspec", "lib/monoandroid1.0/HarfBuzzSharp.dll", "lib/monoandroid1.0/HarfBuzzSharp.pdb", @@ -5647,10 +5683,10 @@ "lib/xamarinwatchos1.0/HarfBuzzSharp.xml" ] }, - "HarfBuzzSharp.NativeAssets.Linux/7.3.0.2": { - "sha512": "aKa5J1RqjXKAtdcZJp5wjC78klfBIzJHM6CneN76lFmQ9LLRJA9Oa0TkIDaV8lVLDKMAy5fCKHXFlXUK1YfL/g==", + "HarfBuzzSharp.NativeAssets.Linux/7.3.0.3": { + "sha512": "hkcHeTfOyIeJuPtO/QfoqkDvV/MXebZYaA/Bn/S+nXsjH3Wt9oQ6okH2kklYO+1UUdBSJFd67bi9IrpQXI2mPw==", "type": "package", - "path": "harfbuzzsharp.nativeassets.linux/7.3.0.2", + "path": "harfbuzzsharp.nativeassets.linux/7.3.0.3", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -5658,7 +5694,7 @@ "THIRD-PARTY-NOTICES.txt", "build/net462/HarfBuzzSharp.NativeAssets.Linux.targets", "buildTransitive/net462/HarfBuzzSharp.NativeAssets.Linux.targets", - "harfbuzzsharp.nativeassets.linux.7.3.0.2.nupkg.sha512", + "harfbuzzsharp.nativeassets.linux.7.3.0.3.nupkg.sha512", "harfbuzzsharp.nativeassets.linux.nuspec", "lib/net462/_._", "lib/net6.0/_._", @@ -5670,10 +5706,10 @@ "runtimes/linux-x64/native/libHarfBuzzSharp.so" ] }, - "HarfBuzzSharp.NativeAssets.macOS/7.3.0.2": { - "sha512": "nycYH/WLJ6ogm+I+QSFCdPJsdxSb5GANWYbQyp1vsd/KjXN56RVUJWPhbgP2GKb/Y7mrsHM7EProqVXlO/EMsA==", + "HarfBuzzSharp.NativeAssets.macOS/7.3.0.3": { + "sha512": "UAwIYnkbBTzBJv1Id8FijY/i8QiIepRemSXufU8fyzwWhYJdx4+ajG8yQUie5HW/uusbVLFSr26muSlJOFDgSw==", "type": "package", - "path": "harfbuzzsharp.nativeassets.macos/7.3.0.2", + "path": "harfbuzzsharp.nativeassets.macos/7.3.0.3", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -5685,7 +5721,7 @@ "buildTransitive/net462/HarfBuzzSharp.NativeAssets.macOS.targets", "buildTransitive/net6.0-macos10.15/HarfBuzzSharp.NativeAssets.macOS.targets", "buildTransitive/xamarinmac2.0/HarfBuzzSharp.NativeAssets.macOS.targets", - "harfbuzzsharp.nativeassets.macos.7.3.0.2.nupkg.sha512", + "harfbuzzsharp.nativeassets.macos.7.3.0.3.nupkg.sha512", "harfbuzzsharp.nativeassets.macos.nuspec", "lib/net462/_._", "lib/net6.0-macos10.15/_._", @@ -5696,10 +5732,10 @@ "runtimes/osx/native/libHarfBuzzSharp.dylib" ] }, - "HarfBuzzSharp.NativeAssets.WebAssembly/7.3.0.3-preview.2.2": { - "sha512": "Dc+dolrhmkpqwT25NfNEEgceW0//KRR2WIOvxlyIIHIIMBCn0FfUeJX5RhFll8kyaZwF8tuKsxRJtQG/rzSBog==", + "HarfBuzzSharp.NativeAssets.WebAssembly/7.3.0.3": { + "sha512": "OpheDNp9a3nC6hWNACemWkNEXJ4tWP3Gw9bykw3FbyeEmU2nUDtLIp6VgNnjHAPRMgUs1Kl7m4gJpzVYwC7CZw==", "type": "package", - "path": "harfbuzzsharp.nativeassets.webassembly/7.3.0.3-preview.2.2", + "path": "harfbuzzsharp.nativeassets.webassembly/7.3.0.3", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -5724,15 +5760,15 @@ "build/netstandard1.0/libHarfBuzzSharp.a/3.1.7/libHarfBuzzSharp.a", "buildTransitive/netstandard1.0/HarfBuzzSharp.NativeAssets.WebAssembly.props", "buildTransitive/netstandard1.0/HarfBuzzSharp.NativeAssets.WebAssembly.targets", - "harfbuzzsharp.nativeassets.webassembly.7.3.0.3-preview.2.2.nupkg.sha512", + "harfbuzzsharp.nativeassets.webassembly.7.3.0.3.nupkg.sha512", "harfbuzzsharp.nativeassets.webassembly.nuspec", "lib/netstandard1.0/_._" ] }, - "HarfBuzzSharp.NativeAssets.Win32/7.3.0.2": { - "sha512": "DpF9JBzwws2dupOLnjME65hxQWWbN/GD40AoTkwB4S05WANvxo3n81AnQJKxWDCnrWfWhLPB36OF27TvEqzb/A==", + "HarfBuzzSharp.NativeAssets.Win32/7.3.0.3": { + "sha512": "RPxRXD16KtSs8Yxr2RK9Qs7AwyN9MlpqZIYs0AvfaJwl7RAtVhC0+u2f2SKwX0uMYYd3O98Z+OBA1sj6aWVKQA==", "type": "package", - "path": "harfbuzzsharp.nativeassets.win32/7.3.0.2", + "path": "harfbuzzsharp.nativeassets.win32/7.3.0.3", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -5740,7 +5776,7 @@ "THIRD-PARTY-NOTICES.txt", "build/net462/HarfBuzzSharp.NativeAssets.Win32.targets", "buildTransitive/net462/HarfBuzzSharp.NativeAssets.Win32.targets", - "harfbuzzsharp.nativeassets.win32.7.3.0.2.nupkg.sha512", + "harfbuzzsharp.nativeassets.win32.7.3.0.3.nupkg.sha512", "harfbuzzsharp.nativeassets.win32.nuspec", "lib/net462/_._", "lib/net6.0/_._", @@ -8683,34 +8719,40 @@ "packageIcon.png" ] }, - "Npgsql/9.0.1": { - "sha512": "aZrXuBUUjRnvjoS4Lq0ZPYe3pnzAfK7TroGNGVpo4FCMBW1ypD/XfTTYjXpeRI8xcX5Otiv535Dy2jQWi98oeA==", + "Npgsql/8.0.5": { + "sha512": "zRG5V8cyeZLpzJlKzFKjEwkRMYIYnHWJvEor2lWXeccS2E1G2nIWYYhnukB51iz5XsWSVEtqg3AxTWM0QJ6vfg==", "type": "package", - "path": "npgsql/9.0.1", + "path": "npgsql/8.0.5", "files": [ ".nupkg.metadata", ".signature.p7s", "README.md", "lib/net6.0/Npgsql.dll", "lib/net6.0/Npgsql.xml", + "lib/net7.0/Npgsql.dll", + "lib/net7.0/Npgsql.xml", "lib/net8.0/Npgsql.dll", "lib/net8.0/Npgsql.xml", - "npgsql.9.0.1.nupkg.sha512", + "lib/netstandard2.0/Npgsql.dll", + "lib/netstandard2.0/Npgsql.xml", + "lib/netstandard2.1/Npgsql.dll", + "lib/netstandard2.1/Npgsql.xml", + "npgsql.8.0.5.nupkg.sha512", "npgsql.nuspec", "postgresql.png" ] }, - "Npgsql.EntityFrameworkCore.PostgreSQL/9.0.1": { - "sha512": "nN9Tjg73Edr4oBhNkBsfHBduNUlDFty1gIX0Ztp0np82ElSCiEcwRuN11Kv4kx2H9VDQaEeMwWAIym5aVsgVyg==", + "Npgsql.EntityFrameworkCore.PostgreSQL/8.0.10": { + "sha512": "gFPl9Dmxih7Yi4tZ3bITzZFzbxFMBx04gqTqcjoL2r5VEW+O2TA5UVw/wm/XW26NAJ7sg59Je0+9QrwiZt6MPQ==", "type": "package", - "path": "npgsql.entityframeworkcore.postgresql/9.0.1", + "path": "npgsql.entityframeworkcore.postgresql/8.0.10", "files": [ ".nupkg.metadata", ".signature.p7s", "README.md", "lib/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll", "lib/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.xml", - "npgsql.entityframeworkcore.postgresql.9.0.1.nupkg.sha512", + "npgsql.entityframeworkcore.postgresql.8.0.10.nupkg.sha512", "npgsql.entityframeworkcore.postgresql.nuspec", "postgresql.png" ] @@ -8880,10 +8922,10 @@ "sixlabors.fonts.nuspec" ] }, - "SkiaSharp/2.88.8": { - "sha512": "bRkp3uKp5ZI8gXYQT57uKwil1uobb2p8c69n7v5evlB/2JNcMAXVcw9DZAP5Ig3WSvgzGm2YSn27UVeOi05NlA==", + "SkiaSharp/2.88.9": { + "sha512": "3MD5VHjXXieSHCleRLuaTXmL2pD0mB7CcOB1x2kA1I4bhptf4e3R27iM93264ZYuAq6mkUyX5XbcxnZvMJYc1Q==", "type": "package", - "path": "skiasharp/2.88.8", + "path": "skiasharp/2.88.9", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -8950,14 +8992,14 @@ "lib/xamarinwatchos1.0/SkiaSharp.dll", "lib/xamarinwatchos1.0/SkiaSharp.pdb", "lib/xamarinwatchos1.0/SkiaSharp.xml", - "skiasharp.2.88.8.nupkg.sha512", + "skiasharp.2.88.9.nupkg.sha512", "skiasharp.nuspec" ] }, - "SkiaSharp.NativeAssets.Linux/2.88.8": { - "sha512": "0FO6YA7paNFBMJULvEyecPmCvL9/STvOAi5VOUw2srqJ7pNTbiiZkfl7sulAzcumbWgfzaVjRXYTgMj7SoUnWQ==", + "SkiaSharp.NativeAssets.Linux/2.88.9": { + "sha512": "cWSaJKVPWAaT/WIn9c8T5uT/l4ETwHxNJTkEOtNKjphNo8AW6TF9O32aRkxqw3l8GUdUo66Bu7EiqtFh/XG0Zg==", "type": "package", - "path": "skiasharp.nativeassets.linux/2.88.8", + "path": "skiasharp.nativeassets.linux/2.88.9", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -8973,14 +9015,14 @@ "runtimes/linux-arm64/native/libSkiaSharp.so", "runtimes/linux-musl-x64/native/libSkiaSharp.so", "runtimes/linux-x64/native/libSkiaSharp.so", - "skiasharp.nativeassets.linux.2.88.8.nupkg.sha512", + "skiasharp.nativeassets.linux.2.88.9.nupkg.sha512", "skiasharp.nativeassets.linux.nuspec" ] }, - "SkiaSharp.NativeAssets.macOS/2.88.8": { - "sha512": "6Kn5TSkKlfyS6azWHF3Jk2sW5C4jCE5uSshM/5AbfFrR+5n6qM5XEnz9h4VaVl7LTxBvHvMkuPb/3bpbq0vxTw==", + "SkiaSharp.NativeAssets.macOS/2.88.9": { + "sha512": "Nv5spmKc4505Ep7oUoJ5vp3KweFpeNqxpyGDWyeEPTX2uR6S6syXIm3gj75dM0YJz7NPvcix48mR5laqs8dPuA==", "type": "package", - "path": "skiasharp.nativeassets.macos/2.88.8", + "path": "skiasharp.nativeassets.macos/2.88.9", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -8999,14 +9041,14 @@ "lib/netstandard1.3/_._", "lib/xamarinmac2.0/_._", "runtimes/osx/native/libSkiaSharp.dylib", - "skiasharp.nativeassets.macos.2.88.8.nupkg.sha512", + "skiasharp.nativeassets.macos.2.88.9.nupkg.sha512", "skiasharp.nativeassets.macos.nuspec" ] }, - "SkiaSharp.NativeAssets.WebAssembly/2.88.8": { - "sha512": "S3qRo8c+gVYOyfrdf6FYnjx/ft+gPkb4dNY2IPv5Oy5yNBhDhXhKqHFr9h4+ne6ZU+7D4dbuRQqsIqCo8u1/DA==", + "SkiaSharp.NativeAssets.WebAssembly/2.88.9": { + "sha512": "kt06RccBHSnAs2wDYdBSfsjIDbY3EpsOVqnlDgKdgvyuRA8ZFDaHRdWNx1VHjGgYzmnFCGiTJBnXFl5BqGwGnA==", "type": "package", - "path": "skiasharp.nativeassets.webassembly/2.88.8", + "path": "skiasharp.nativeassets.webassembly/2.88.9", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -9024,18 +9066,22 @@ "build/netstandard1.0/libSkiaSharp.a/3.1.34/simd,mt/libSkiaSharp.a", "build/netstandard1.0/libSkiaSharp.a/3.1.34/simd,st/libSkiaSharp.a", "build/netstandard1.0/libSkiaSharp.a/3.1.34/st/libSkiaSharp.a", + "build/netstandard1.0/libSkiaSharp.a/3.1.56/mt/libSkiaSharp.a", + "build/netstandard1.0/libSkiaSharp.a/3.1.56/simd,mt/libSkiaSharp.a", + "build/netstandard1.0/libSkiaSharp.a/3.1.56/simd,st/libSkiaSharp.a", + "build/netstandard1.0/libSkiaSharp.a/3.1.56/st/libSkiaSharp.a", "build/netstandard1.0/libSkiaSharp.a/3.1.7/libSkiaSharp.a", "buildTransitive/netstandard1.0/SkiaSharp.NativeAssets.WebAssembly.props", "buildTransitive/netstandard1.0/SkiaSharp.NativeAssets.WebAssembly.targets", "lib/netstandard1.0/_._", - "skiasharp.nativeassets.webassembly.2.88.8.nupkg.sha512", + "skiasharp.nativeassets.webassembly.2.88.9.nupkg.sha512", "skiasharp.nativeassets.webassembly.nuspec" ] }, - "SkiaSharp.NativeAssets.Win32/2.88.8": { - "sha512": "O9QXoWEXA+6cweR4h3BOnwMz+pO9vL9mXdjLrpDd0w1QzCgWmLQBxa1VgySDITiH7nQndrDG1h6937zm9pLj1Q==", + "SkiaSharp.NativeAssets.Win32/2.88.9": { + "sha512": "wb2kYgU7iy84nQLYZwMeJXixvK++GoIuECjU4ECaUKNuflyRlJKyiRhN1MAHswvlvzuvkrjRWlK0Za6+kYQK7w==", "type": "package", - "path": "skiasharp.nativeassets.win32/2.88.8", + "path": "skiasharp.nativeassets.win32/2.88.9", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -9050,7 +9096,7 @@ "runtimes/win-arm64/native/libSkiaSharp.dll", "runtimes/win-x64/native/libSkiaSharp.dll", "runtimes/win-x86/native/libSkiaSharp.dll", - "skiasharp.nativeassets.win32.2.88.8.nupkg.sha512", + "skiasharp.nativeassets.win32.2.88.9.nupkg.sha512", "skiasharp.nativeassets.win32.nuspec" ] }, @@ -9106,16 +9152,16 @@ "std.uritemplate.nuspec" ] }, - "Swashbuckle.AspNetCore/7.1.0": { - "sha512": "PpKwEZNCciDPczWPnuqaTVuN5jR/fG2RubQYgKHVWY2KB+TpvKkOrQJoF51S1yMJxygaofCM3BXlLy4PK/o8WA==", + "Swashbuckle.AspNetCore/7.0.0": { + "sha512": "aF6oCgMy8CC17cSbILAw9J4UVhqOE+0Z11V8JstA+pIrXcY8ZbNL3ayHOWKZm0NdHMS6RI1k5sFVfMkpZOobvw==", "type": "package", - "path": "swashbuckle.aspnetcore/7.1.0", + "path": "swashbuckle.aspnetcore/7.0.0", "files": [ ".nupkg.metadata", ".signature.p7s", "build/Swashbuckle.AspNetCore.props", "buildMultiTargeting/Swashbuckle.AspNetCore.props", - "swashbuckle.aspnetcore.7.1.0.nupkg.sha512", + "swashbuckle.aspnetcore.7.0.0.nupkg.sha512", "swashbuckle.aspnetcore.nuspec" ] }, @@ -13225,8 +13271,8 @@ "projectFileDependencyGroups": { "net8.0": [ "Arch.EntityFrameworkCore.Analyzers >= 2.1.15", - "Avalonia >= 11.2.1", - "Avalonia.Desktop >= 11.2.1", + "Avalonia >= 11.2.2", + "Avalonia.Desktop >= 11.2.2", "Avalonia.Diagnostics >= 11.2.1", "Avalonia.Fonts.Inter >= 11.2.1", "Avalonia.Themes.Fluent >= 11.2.1", @@ -13242,8 +13288,7 @@ "Microsoft.EntityFrameworkCore.Design >= 9.0.0", "Microsoft.Extensions.DependencyInjection >= 9.0.0", "Microsoft.Graph >= 5.63.0", - "Npgsql.EntityFrameworkCore.PostgreSQL >= 9.0.1", - "Swashbuckle.AspNetCore >= 7.1.0", + "ReactiveUI >= 20.1.63", "Swashbuckle.AspNetCore.Swagger >= 7.1.0", "Swashbuckle.AspNetCore.SwaggerGen >= 7.1.0", "Swashbuckle.AspNetCore.SwaggerUI >= 7.1.0", @@ -13311,11 +13356,11 @@ }, "Avalonia": { "target": "Package", - "version": "[11.2.1, )" + "version": "[11.2.2, )" }, "Avalonia.Desktop": { "target": "Package", - "version": "[11.2.1, )" + "version": "[11.2.2, )" }, "Avalonia.Diagnostics": { "target": "Package", @@ -13379,13 +13424,9 @@ "target": "Package", "version": "[5.63.0, )" }, - "Npgsql.EntityFrameworkCore.PostgreSQL": { + "ReactiveUI": { "target": "Package", - "version": "[9.0.1, )" - }, - "Swashbuckle.AspNetCore": { - "target": "Package", - "version": "[7.1.0, )" + "version": "[20.1.63, )" }, "Swashbuckle.AspNetCore.Swagger": { "target": "Package", diff --git a/Zurnal_Vizual/obj/project.nuget.cache b/Zurnal_Vizual/obj/project.nuget.cache index 87d347c..f7bc6b8 100644 --- a/Zurnal_Vizual/obj/project.nuget.cache +++ b/Zurnal_Vizual/obj/project.nuget.cache @@ -1,26 +1,27 @@ { "version": 2, - "dgSpecHash": "8XzeLf0zi/s=", + "dgSpecHash": "86+9md6b8lQ=", "success": true, "projectFilePath": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Zurnal_Vizual.csproj", "expectedPackageFiles": [ "C:\\Users\\PC\\.nuget\\packages\\arch.entityframeworkcore.analyzers\\2.1.15\\arch.entityframeworkcore.analyzers.2.1.15.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\avalonia\\11.2.1\\avalonia.11.2.1.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia\\11.2.2\\avalonia.11.2.2.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.angle.windows.natives\\2.1.22045.20230930\\avalonia.angle.windows.natives.2.1.22045.20230930.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.buildservices\\0.0.29\\avalonia.buildservices.0.0.29.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.controls.colorpicker\\11.2.1\\avalonia.controls.colorpicker.11.2.1.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.controls.datagrid\\11.2.1\\avalonia.controls.datagrid.11.2.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\avalonia.desktop\\11.2.1\\avalonia.desktop.11.2.1.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.desktop\\11.2.2\\avalonia.desktop.11.2.2.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.diagnostics\\11.2.1\\avalonia.diagnostics.11.2.1.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.fonts.inter\\11.2.1\\avalonia.fonts.inter.11.2.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\avalonia.freedesktop\\11.2.1\\avalonia.freedesktop.11.2.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\avalonia.native\\11.2.1\\avalonia.native.11.2.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\avalonia.remote.protocol\\11.2.1\\avalonia.remote.protocol.11.2.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\avalonia.skia\\11.2.1\\avalonia.skia.11.2.1.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.freedesktop\\11.2.2\\avalonia.freedesktop.11.2.2.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.native\\11.2.2\\avalonia.native.11.2.2.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.reactiveui\\11.2.2\\avalonia.reactiveui.11.2.2.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.remote.protocol\\11.2.2\\avalonia.remote.protocol.11.2.2.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.skia\\11.2.2\\avalonia.skia.11.2.2.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.themes.fluent\\11.2.1\\avalonia.themes.fluent.11.2.1.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.themes.simple\\11.2.1\\avalonia.themes.simple.11.2.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\avalonia.win32\\11.2.1\\avalonia.win32.11.2.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\avalonia.x11\\11.2.1\\avalonia.x11.11.2.1.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.win32\\11.2.2\\avalonia.win32.11.2.2.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\avalonia.x11\\11.2.2\\avalonia.x11.11.2.2.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\azura\\0.9.0\\azura.0.9.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\azure.core\\1.44.1\\azure.core.1.44.1.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\closedxml\\0.104.2\\closedxml.0.104.2.nupkg.sha512", @@ -41,11 +42,11 @@ "C:\\Users\\PC\\.nuget\\packages\\grpc.net.client\\2.50.0\\grpc.net.client.2.50.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\grpc.net.clientfactory\\2.50.0\\grpc.net.clientfactory.2.50.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\grpc.net.common\\2.50.0\\grpc.net.common.2.50.0.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp\\7.3.0.2\\harfbuzzsharp.7.3.0.2.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp.nativeassets.linux\\7.3.0.2\\harfbuzzsharp.nativeassets.linux.7.3.0.2.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp.nativeassets.macos\\7.3.0.2\\harfbuzzsharp.nativeassets.macos.7.3.0.2.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp.nativeassets.webassembly\\7.3.0.3-preview.2.2\\harfbuzzsharp.nativeassets.webassembly.7.3.0.3-preview.2.2.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp.nativeassets.win32\\7.3.0.2\\harfbuzzsharp.nativeassets.win32.7.3.0.2.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp\\7.3.0.3\\harfbuzzsharp.7.3.0.3.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp.nativeassets.linux\\7.3.0.3\\harfbuzzsharp.nativeassets.linux.7.3.0.3.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp.nativeassets.macos\\7.3.0.3\\harfbuzzsharp.nativeassets.macos.7.3.0.3.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp.nativeassets.webassembly\\7.3.0.3\\harfbuzzsharp.nativeassets.webassembly.7.3.0.3.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\harfbuzzsharp.nativeassets.win32\\7.3.0.3\\harfbuzzsharp.nativeassets.win32.7.3.0.3.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\humanizer.core\\2.14.1\\humanizer.core.2.14.1.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\microcom.runtime\\0.11.0\\microcom.runtime.0.11.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\microsoft.aspnetcore\\2.1.7\\microsoft.aspnetcore.2.1.7.nupkg.sha512", @@ -142,8 +143,8 @@ "C:\\Users\\PC\\.nuget\\packages\\mono.texttemplating\\3.0.0\\mono.texttemplating.3.0.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\netstandard.library\\1.6.0\\netstandard.library.1.6.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\npgsql\\9.0.1\\npgsql.9.0.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\npgsql.entityframeworkcore.postgresql\\9.0.1\\npgsql.entityframeworkcore.postgresql.9.0.1.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\npgsql\\8.0.5\\npgsql.8.0.5.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\npgsql.entityframeworkcore.postgresql\\8.0.10\\npgsql.entityframeworkcore.postgresql.8.0.10.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\officeopenxml.core.excelpackage\\1.0.0\\officeopenxml.core.excelpackage.1.0.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\rbush\\4.0.0\\rbush.4.0.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\reactiveui\\20.1.63\\reactiveui.20.1.63.nupkg.sha512", @@ -152,15 +153,15 @@ "C:\\Users\\PC\\.nuget\\packages\\runtime.native.system.net.http\\4.0.1\\runtime.native.system.net.http.4.0.1.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\runtime.native.system.security.cryptography\\4.0.0\\runtime.native.system.security.cryptography.4.0.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\sixlabors.fonts\\1.0.0\\sixlabors.fonts.1.0.0.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\skiasharp\\2.88.8\\skiasharp.2.88.8.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\skiasharp.nativeassets.linux\\2.88.8\\skiasharp.nativeassets.linux.2.88.8.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\skiasharp.nativeassets.macos\\2.88.8\\skiasharp.nativeassets.macos.2.88.8.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\skiasharp.nativeassets.webassembly\\2.88.8\\skiasharp.nativeassets.webassembly.2.88.8.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\skiasharp.nativeassets.win32\\2.88.8\\skiasharp.nativeassets.win32.2.88.8.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\skiasharp\\2.88.9\\skiasharp.2.88.9.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\skiasharp.nativeassets.linux\\2.88.9\\skiasharp.nativeassets.linux.2.88.9.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\skiasharp.nativeassets.macos\\2.88.9\\skiasharp.nativeassets.macos.2.88.9.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\skiasharp.nativeassets.webassembly\\2.88.9\\skiasharp.nativeassets.webassembly.2.88.9.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\skiasharp.nativeassets.win32\\2.88.9\\skiasharp.nativeassets.win32.2.88.9.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\snappier\\1.1.6\\snappier.1.1.6.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\splat\\15.1.1\\splat.15.1.1.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\std.uritemplate\\2.0.1\\std.uritemplate.2.0.1.nupkg.sha512", - "C:\\Users\\PC\\.nuget\\packages\\swashbuckle.aspnetcore\\7.1.0\\swashbuckle.aspnetcore.7.1.0.nupkg.sha512", + "C:\\Users\\PC\\.nuget\\packages\\swashbuckle.aspnetcore\\7.0.0\\swashbuckle.aspnetcore.7.0.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\7.1.0\\swashbuckle.aspnetcore.swagger.7.1.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\7.1.0\\swashbuckle.aspnetcore.swaggergen.7.1.0.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\7.1.0\\swashbuckle.aspnetcore.swaggerui.7.1.0.nupkg.sha512",