diff --git a/Presence.Desktop/App.axaml b/Presence.Desktop/App.axaml index eea6afa..d3f2dbe 100644 --- a/Presence.Desktop/App.axaml +++ b/Presence.Desktop/App.axaml @@ -1,13 +1,8 @@ - - - - diff --git a/Presence.Desktop/App.axaml.cs b/Presence.Desktop/App.axaml.cs index 94bf268..023b7c1 100644 --- a/Presence.Desktop/App.axaml.cs +++ b/Presence.Desktop/App.axaml.cs @@ -1,29 +1,37 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; +using Microsoft.Extensions.DependencyInjection; +using Presence.Desktop.DI; using Presence.Desktop.ViewModels; using Presence.Desktop.Views; -namespace Presence.Desktop; - -public partial class App : Application +namespace Presence.Desktop { - public override void Initialize() + public partial class App : Application { - AvaloniaXamlLoader.Load(this); - } - - public override void OnFrameworkInitializationCompleted() - { - if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + public override void Initialize() { - desktop.MainWindow = new MainWindow - { - DataContext = new MainWindowViewModel(), - }; + AvaloniaXamlLoader.Load(this); } - base.OnFrameworkInitializationCompleted(); - } + public override void OnFrameworkInitializationCompleted() + { + var serviceCollection = new ServiceCollection(); + serviceCollection.AddCommonService(); + var services = serviceCollection.BuildServiceProvider(); + var mainViewModel = services.GetRequiredService(); + if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + desktop.MainWindow = new MainWindow() + { + DataContext = new MainWindowViewModel(services), + }; + } + + base.OnFrameworkInitializationCompleted(); + } + + } } \ No newline at end of file diff --git a/Presence.Desktop/DI/ServiceCollictionExtensions.cs b/Presence.Desktop/DI/ServiceCollictionExtensions.cs new file mode 100644 index 0000000..795d886 --- /dev/null +++ b/Presence.Desktop/DI/ServiceCollictionExtensions.cs @@ -0,0 +1,29 @@ +using data; +using data.Repository; +using domain.Service; +using domain.UseCase; +using Microsoft.Extensions.DependencyInjection; +using presence.data.RemoteData.RemoteDataBase; +using presence.data.Repository; +using presence.domain.UseCase; +using Presence.Desktop.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; + +namespace Presence.Desktop.DI +{ + public static class ServiceColletionExtensions + { + public static void AddCommonService(this IServiceCollection collection) { + collection + .AddDbContext() + .AddSingleton() + .AddTransient() + .AddTransient(); + } + } +} \ No newline at end of file diff --git a/Presence.Desktop/Models/GroupPresenter.cs b/Presence.Desktop/Models/GroupPresenter.cs new file mode 100644 index 0000000..abf5d36 --- /dev/null +++ b/Presence.Desktop/Models/GroupPresenter.cs @@ -0,0 +1,17 @@ +using Avalonia.Controls; +using ReactiveUI; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Presence.Desktop.Models +{ + public class GroupPresenter + { + public int Id { get; set; } + public string Name { get; set; } + public IEnumerable? Users { get; set; } = null; + } +} \ No newline at end of file diff --git a/Presence.Desktop/Models/UserPresenter.cs b/Presence.Desktop/Models/UserPresenter.cs new file mode 100644 index 0000000..45cecce --- /dev/null +++ b/Presence.Desktop/Models/UserPresenter.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Presence.Desktop.Models +{ + public class UserPresenter + { + public int Id{ get; set; } + public string Name { get; set; } + public GroupPresenter Group { get; set; } + } +} \ No newline at end of file diff --git a/Presence.Desktop/Presence.Desktop.csproj b/Presence.Desktop/Presence.Desktop.csproj index cd9686a..ccd94d0 100644 --- a/Presence.Desktop/Presence.Desktop.csproj +++ b/Presence.Desktop/Presence.Desktop.csproj @@ -25,4 +25,8 @@ + + + + diff --git a/Presence.Desktop/ViewLocator.cs b/Presence.Desktop/ViewLocator.cs index 4b14d4b..c0397bd 100644 --- a/Presence.Desktop/ViewLocator.cs +++ b/Presence.Desktop/ViewLocator.cs @@ -1,31 +1,19 @@ -using System; -using Avalonia.Controls; using Avalonia.Controls.Templates; using Presence.Desktop.ViewModels; +using System; +using Presence.Desktop.Views; +using ReactiveUI; -namespace Presence.Desktop; - -public class ViewLocator : IDataTemplate +namespace Presence.Desktop { - - public Control? Build(object? param) + public class ViewLocator : IViewLocator { - if (param is null) - return null; - - var name = param.GetType().FullName!.Replace("ViewModel", "View", StringComparison.Ordinal); - var type = Type.GetType(name); - - if (type != null) + public IViewFor? ResolveView(T? viewModel, string? contract = null) => viewModel switch { - return (Control)Activator.CreateInstance(type)!; - } - - return new TextBlock { Text = "Not Found: " + name }; - } - - public bool Match(object? data) - { - return data is ViewModelBase; + + GroupViewModel groupViewModel => new GroupView{DataContext = groupViewModel}, + PresenceViewModel presenceViewModel => new PresenceView{DataContext = presenceViewModel}, + _ => throw new ArgumentOutOfRangeException(nameof(viewModel)) + }; } } diff --git a/Presence.Desktop/ViewModels/GroupViewModel.cs b/Presence.Desktop/ViewModels/GroupViewModel.cs new file mode 100644 index 0000000..7d6f5fb --- /dev/null +++ b/Presence.Desktop/ViewModels/GroupViewModel.cs @@ -0,0 +1,102 @@ +using domain.UseCase; +using DynamicData; +using DynamicData.Binding; +using Presence.Desktop.Models; +using ReactiveUI; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reactive.Linq; +using Tmds.DBus.Protocol; + +namespace Presence.Desktop.ViewModels +{ + public class GroupViewModel : ViewModelBase, IRoutableViewModel + { + private readonly List _groupPresentersDataSource = new List(); + private ObservableCollection _groups; + public ObservableCollection Groups => _groups; + + public GroupPresenter? SelectedGroupItem { + get => _selectedGroupItem; + set => this.RaiseAndSetIfChanged(ref _selectedGroupItem, value); } + + private GroupPresenter? _selectedGroupItem; + + + + private IGroupUseCase _groupUseCase; + public ObservableCollection Users { get => _users;} + public ObservableCollection _users; + public GroupViewModel(IGroupUseCase groupUseCase) + { + foreach (var item in groupUseCase.GetGroupsWithStudents()) + { + GroupPresenter groupPresenter = new GroupPresenter + { + Id = item.Id, + Name = item.Name, + Users = item.User?.Select(user => new UserPresenter + { + Name = user.FIO, + Id = user.Id, + Group = new GroupPresenter { Id = item.Id, Name = item.Name } + } + ).ToList() + }; + _groupPresentersDataSource.Add(groupPresenter); + } + _groups = new ObservableCollection(_groupPresentersDataSource); + + _groupUseCase = groupUseCase; + _users = new ObservableCollection(); + + RefreshGroups(); + this.WhenAnyValue(vm => vm.SelectedGroupItem) + .Subscribe(_ => + { + RefreshGroups(); + SetUsers(); + }); + } + + private void SetUsers() + { + if(SelectedGroupItem == null) return; + if (SelectedGroupItem.Users == null) return; + Users.Clear(); + GroupPresenter 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() + { + _groupPresentersDataSource.Clear(); + foreach (var item in _groupUseCase.GetGroupsWithStudents()) + { + GroupPresenter groupPresenter = new GroupPresenter + { + Id = item.Id, + Name = item.Name, + Users = item.User?.Select(user => new UserPresenter + { + Name = user.FIO, + Id = user.Id, + Group = new GroupPresenter { Id = item.Id, Name = item.Name } + } + ).ToList() + }; + _groupPresentersDataSource.Add(groupPresenter); + } + _groups = new ObservableCollection(_groupPresentersDataSource); + } + public string? UrlPathSegment { get; } + public IScreen HostScreen { get; } + } +} \ No newline at end of file diff --git a/Presence.Desktop/ViewModels/MainWindowViewModel.cs b/Presence.Desktop/ViewModels/MainWindowViewModel.cs index 2bde3fc..24e5a55 100644 --- a/Presence.Desktop/ViewModels/MainWindowViewModel.cs +++ b/Presence.Desktop/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,20 @@ -namespace Presence.Desktop.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using ReactiveUI; -public class MainWindowViewModel : ViewModelBase +namespace Presence.Desktop.ViewModels { - public string Greeting { get; } = "Welcome to Avalonia!"; -} + public class MainWindowViewModel: ViewModelBase, IScreen + { + public RoutingState Router { get; } = new RoutingState(); + + public MainWindowViewModel(IServiceProvider serviceProvider) + { + var groupViewModel = serviceProvider.GetRequiredService(); + Router.Navigate.Execute(groupViewModel); + } + } +} \ No newline at end of file diff --git a/Presence.Desktop/ViewModels/PresenceViewModel.cs b/Presence.Desktop/ViewModels/PresenceViewModel.cs new file mode 100644 index 0000000..e7f6127 --- /dev/null +++ b/Presence.Desktop/ViewModels/PresenceViewModel.cs @@ -0,0 +1,13 @@ + 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/Presence.Desktop/Views/GroupView.axaml b/Presence.Desktop/Views/GroupView.axaml new file mode 100644 index 0000000..e63b8c6 --- /dev/null +++ b/Presence.Desktop/Views/GroupView.axaml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Presence.Desktop/Views/GroupView.axaml.cs b/Presence.Desktop/Views/GroupView.axaml.cs new file mode 100644 index 0000000..7702263 --- /dev/null +++ b/Presence.Desktop/Views/GroupView.axaml.cs @@ -0,0 +1,17 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; +using Avalonia.ReactiveUI; +using Presence.Desktop.ViewModels; +using ReactiveUI; + +namespace Presence.Desktop.Views +{ + public partial class GroupView : ReactiveUserControl + { + public GroupView() + { + this.WhenActivated(disposables => { }); + AvaloniaXamlLoader.Load(this); + } + } +} \ No newline at end of file diff --git a/Presence.Desktop/Views/MainWindow.axaml b/Presence.Desktop/Views/MainWindow.axaml index a158e7f..480df97 100644 --- a/Presence.Desktop/Views/MainWindow.axaml +++ b/Presence.Desktop/Views/MainWindow.axaml @@ -1,20 +1,19 @@ - - - - - - - - - + Title="MainWindow"> + + + + + + + + \ No newline at end of file diff --git a/Presence.Desktop/Views/MainWindow.axaml.cs b/Presence.Desktop/Views/MainWindow.axaml.cs index 6de841f..2385b19 100644 --- a/Presence.Desktop/Views/MainWindow.axaml.cs +++ b/Presence.Desktop/Views/MainWindow.axaml.cs @@ -1,11 +1,18 @@ +using Avalonia; using Avalonia.Controls; +using Avalonia.Markup.Xaml; +using Avalonia.ReactiveUI; +using Presence.Desktop.ViewModels; +using ReactiveUI; namespace Presence.Desktop.Views; -public partial class MainWindow : Window +public partial class MainWindow : ReactiveWindow { public MainWindow() { - InitializeComponent(); + this.WhenActivated(disposables => { }); + AvaloniaXamlLoader.Load(this); + } } \ No newline at end of file diff --git a/Presence.Desktop/Views/PresenceView.axaml b/Presence.Desktop/Views/PresenceView.axaml new file mode 100644 index 0000000..654d34b --- /dev/null +++ b/Presence.Desktop/Views/PresenceView.axaml @@ -0,0 +1,8 @@ + + Welcome to Avalonia! + \ No newline at end of file diff --git a/Presence.Desktop/Views/PresenceView.axaml.cs b/Presence.Desktop/Views/PresenceView.axaml.cs new file mode 100644 index 0000000..ad4e1fe --- /dev/null +++ b/Presence.Desktop/Views/PresenceView.axaml.cs @@ -0,0 +1,16 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; +using Avalonia.ReactiveUI; +using Presence.Desktop.ViewModels; +using ReactiveUI; + +namespace Presence.Desktop.Views; + +public partial class PresenceView : ReactiveUserControl +{ + public PresenceView() + { + this.WhenActivated(disposables => { }); + AvaloniaXamlLoader.Load(this); } +} \ No newline at end of file diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll new file mode 100755 index 0000000..2169cf8 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.Relational.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.Relational.dll new file mode 100755 index 0000000..f8c58d0 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.Relational.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.dll new file mode 100755 index 0000000..b628ed6 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Caching.Abstractions.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Caching.Abstractions.dll new file mode 100755 index 0000000..99aac98 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Caching.Abstractions.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Caching.Memory.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Caching.Memory.dll new file mode 100755 index 0000000..077b1b6 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Caching.Memory.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll new file mode 100755 index 0000000..a5ab313 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll new file mode 100755 index 0000000..81ed3de Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.DependencyInjection.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.DependencyInjection.dll new file mode 100755 index 0000000..bd71a2b Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.DependencyInjection.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Logging.Abstractions.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Logging.Abstractions.dll new file mode 100755 index 0000000..f9d1dc6 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Logging.Abstractions.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Logging.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Logging.dll new file mode 100755 index 0000000..35905b6 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Logging.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Options.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Options.dll new file mode 100755 index 0000000..a7b3f21 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Options.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Primitives.dll b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Primitives.dll new file mode 100755 index 0000000..c24f2a0 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Primitives.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll b/Presence.Desktop/bin/Debug/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll new file mode 100755 index 0000000..4b4f0fc Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Npgsql.dll b/Presence.Desktop/bin/Debug/net8.0/Npgsql.dll new file mode 100755 index 0000000..fde1387 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/Npgsql.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.deps.json b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.deps.json index fb614a0..245d810 100644 --- a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.deps.json +++ b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.deps.json @@ -13,7 +13,8 @@ "Avalonia.Diagnostics": "11.2.1", "Avalonia.Fonts.Inter": "11.2.1", "Avalonia.ReactiveUI": "11.2.1", - "Avalonia.Themes.Fluent": "11.2.1" + "Avalonia.Themes.Fluent": "11.2.1", + "domain": "1.0.0" }, "runtime": { "Presence.Desktop.dll": {} @@ -358,6 +359,166 @@ } } }, + "Microsoft.EntityFrameworkCore/8.0.10": { + "dependencies": { + "Microsoft.EntityFrameworkCore.Abstractions": "8.0.10", + "Microsoft.EntityFrameworkCore.Analyzers": "8.0.10", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Extensions.Logging": "8.0.1" + }, + "runtime": { + "lib/net8.0/Microsoft.EntityFrameworkCore.dll": { + "assemblyVersion": "8.0.10.0", + "fileVersion": "8.0.1024.46708" + } + } + }, + "Microsoft.EntityFrameworkCore.Abstractions/8.0.10": { + "runtime": { + "lib/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll": { + "assemblyVersion": "8.0.10.0", + "fileVersion": "8.0.1024.46708" + } + } + }, + "Microsoft.EntityFrameworkCore.Analyzers/8.0.10": {}, + "Microsoft.EntityFrameworkCore.Relational/8.0.10": { + "dependencies": { + "Microsoft.EntityFrameworkCore": "8.0.10", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + }, + "runtime": { + "lib/net8.0/Microsoft.EntityFrameworkCore.Relational.dll": { + "assemblyVersion": "8.0.10.0", + "fileVersion": "8.0.1024.46708" + } + } + }, + "Microsoft.Extensions.Caching.Abstractions/8.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Caching.Abstractions.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.23.53103" + } + } + }, + "Microsoft.Extensions.Caching.Memory/8.0.1": { + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Caching.Memory.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.1024.46610" + } + } + }, + "Microsoft.Extensions.Configuration.Abstractions/8.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.23.53103" + } + } + }, + "Microsoft.Extensions.DependencyInjection/8.0.1": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.DependencyInjection.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.1024.46610" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.2": { + "runtime": { + "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.1024.46610" + } + } + }, + "Microsoft.Extensions.Logging/8.0.1": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Logging.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.1024.46610" + } + } + }, + "Microsoft.Extensions.Logging.Abstractions/8.0.2": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.1024.46610" + } + } + }, + "Microsoft.Extensions.Options/8.0.2": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.224.6711" + } + } + }, + "Microsoft.Extensions.Primitives/8.0.0": { + "runtime": { + "lib/net8.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.23.53103" + } + } + }, + "Npgsql/8.0.5": { + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "8.0.2" + }, + "runtime": { + "lib/net8.0/Npgsql.dll": { + "assemblyVersion": "8.0.5.0", + "fileVersion": "8.0.5.0" + } + } + }, + "Npgsql.EntityFrameworkCore.PostgreSQL/8.0.10": { + "dependencies": { + "Microsoft.EntityFrameworkCore": "8.0.10", + "Microsoft.EntityFrameworkCore.Abstractions": "8.0.10", + "Microsoft.EntityFrameworkCore.Relational": "8.0.10", + "Npgsql": "8.0.5" + }, + "runtime": { + "lib/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll": { + "assemblyVersion": "8.0.10.0", + "fileVersion": "8.0.10.0" + } + } + }, "ReactiveUI/20.1.1": { "dependencies": { "DynamicData": "8.4.1", @@ -474,6 +635,29 @@ "fileVersion": "0.20.0.0" } } + }, + "data/1.0.0": { + "dependencies": { + "Microsoft.EntityFrameworkCore": "8.0.10", + "Npgsql.EntityFrameworkCore.PostgreSQL": "8.0.10" + }, + "runtime": { + "data.dll": { + "assemblyVersion": "1.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "domain/1.0.0": { + "dependencies": { + "data": "1.0.0" + }, + "runtime": { + "domain.dll": { + "assemblyVersion": "1.0.0", + "fileVersion": "1.0.0.0" + } + } } } }, @@ -651,6 +835,111 @@ "path": "microcom.runtime/0.11.0", "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" }, + "Microsoft.EntityFrameworkCore/8.0.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-PPkQdIqfR1nU3n6YgGGDk8G+eaYbaAKM1AzIQtlPNTKf10Osg3N9T+iK9AlnSA/ujsK00flPpFHVfJrbuBFS1A==", + "path": "microsoft.entityframeworkcore/8.0.10", + "hashPath": "microsoft.entityframeworkcore.8.0.10.nupkg.sha512" + }, + "Microsoft.EntityFrameworkCore.Abstractions/8.0.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-FV0QlcX9INY4kAD2o72uPtyOh0nZut2jB11Jf9mNYBtHay8gDLe+x4AbXFwuQg+eSvofjT7naV82e827zGfyMg==", + "path": "microsoft.entityframeworkcore.abstractions/8.0.10", + "hashPath": "microsoft.entityframeworkcore.abstractions.8.0.10.nupkg.sha512" + }, + "Microsoft.EntityFrameworkCore.Analyzers/8.0.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-51KkPIc0EMv/gVXhPIUi6cwJE9Mvh+PLr4Lap4naLcsoGZ0lF2SvOPgUUprwRV3MnN7nyD1XPhT5RJ/p+xFAXw==", + "path": "microsoft.entityframeworkcore.analyzers/8.0.10", + "hashPath": "microsoft.entityframeworkcore.analyzers.8.0.10.nupkg.sha512" + }, + "Microsoft.EntityFrameworkCore.Relational/8.0.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-OefBEE47kGKPRPV3OT+FAW6o5BFgLk2D9EoeWVy7NbOepzUneayLQxbVE098FfedTyMwxvZQoDD9LrvZc3MadA==", + "path": "microsoft.entityframeworkcore.relational/8.0.10", + "hashPath": "microsoft.entityframeworkcore.relational.8.0.10.nupkg.sha512" + }, + "Microsoft.Extensions.Caching.Abstractions/8.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "path": "microsoft.extensions.caching.abstractions/8.0.0", + "hashPath": "microsoft.extensions.caching.abstractions.8.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Caching.Memory/8.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "path": "microsoft.extensions.caching.memory/8.0.1", + "hashPath": "microsoft.extensions.caching.memory.8.0.1.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Abstractions/8.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "path": "microsoft.extensions.configuration.abstractions/8.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.8.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection/8.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==", + "path": "microsoft.extensions.dependencyinjection/8.0.1", + "hashPath": "microsoft.extensions.dependencyinjection.8.0.1.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", + "path": "microsoft.extensions.dependencyinjection.abstractions/8.0.2", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512" + }, + "Microsoft.Extensions.Logging/8.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-4x+pzsQEbqxhNf1QYRr5TDkLP9UsLT3A6MdRKDDEgrW7h1ljiEPgTNhKYUhNCCAaVpQECVQ+onA91PTPnIp6Lw==", + "path": "microsoft.extensions.logging/8.0.1", + "hashPath": "microsoft.extensions.logging.8.0.1.nupkg.sha512" + }, + "Microsoft.Extensions.Logging.Abstractions/8.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", + "path": "microsoft.extensions.logging.abstractions/8.0.2", + "hashPath": "microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512" + }, + "Microsoft.Extensions.Options/8.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "path": "microsoft.extensions.options/8.0.2", + "hashPath": "microsoft.extensions.options.8.0.2.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/8.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "path": "microsoft.extensions.primitives/8.0.0", + "hashPath": "microsoft.extensions.primitives.8.0.0.nupkg.sha512" + }, + "Npgsql/8.0.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zRG5V8cyeZLpzJlKzFKjEwkRMYIYnHWJvEor2lWXeccS2E1G2nIWYYhnukB51iz5XsWSVEtqg3AxTWM0QJ6vfg==", + "path": "npgsql/8.0.5", + "hashPath": "npgsql.8.0.5.nupkg.sha512" + }, + "Npgsql.EntityFrameworkCore.PostgreSQL/8.0.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gFPl9Dmxih7Yi4tZ3bITzZFzbxFMBx04gqTqcjoL2r5VEW+O2TA5UVw/wm/XW26NAJ7sg59Je0+9QrwiZt6MPQ==", + "path": "npgsql.entityframeworkcore.postgresql/8.0.10", + "hashPath": "npgsql.entityframeworkcore.postgresql.8.0.10.nupkg.sha512" + }, "ReactiveUI/20.1.1": { "type": "package", "serviceable": true, @@ -727,6 +1016,16 @@ "sha512": "sha512-2gkt2kuYPhDKd8gtl34jZSJOnn4nRJfFngCDcTZT/uySbK++ua0YQx2418l9Rn1Y4dE5XNq6zG9ZsE5ltLlNNw==", "path": "tmds.dbus.protocol/0.20.0", "hashPath": "tmds.dbus.protocol.0.20.0.nupkg.sha512" + }, + "data/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "domain/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" } } } \ No newline at end of file diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll index 2ca96f3..ec0d35e 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll and b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb index ae6dc93..6a20a2a 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb and b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.runtimeconfig.json b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.runtimeconfig.json index 61e5180..3a4aba4 100644 --- a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.runtimeconfig.json +++ b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.runtimeconfig.json @@ -6,6 +6,7 @@ "version": "8.0.0" }, "configProperties": { + "System.Reflection.NullabilityInfoContext.IsSupported": true, "System.Runtime.InteropServices.BuiltInComInterop.IsSupported": true, "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false } diff --git a/Presence.Desktop/bin/Debug/net8.0/data.dll b/Presence.Desktop/bin/Debug/net8.0/data.dll new file mode 100644 index 0000000..859c092 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/data.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/data.pdb b/Presence.Desktop/bin/Debug/net8.0/data.pdb new file mode 100644 index 0000000..e0fd2bf Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/data.pdb differ diff --git a/Presence.Desktop/bin/Debug/net8.0/domain.dll b/Presence.Desktop/bin/Debug/net8.0/domain.dll new file mode 100644 index 0000000..285307a Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/domain.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/domain.pdb b/Presence.Desktop/bin/Debug/net8.0/domain.pdb new file mode 100644 index 0000000..d587f77 Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/domain.pdb differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.dll index 2ca96f3..ec0d35e 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.dll and b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.dll differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.pdb b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.pdb index ae6dc93..6a20a2a 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.pdb and b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.pdb differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index d9135ee..8ab200c 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -15f2befdcd594ebd13b58232a419e51eeef63891a84ce4128e3145ca606a550a +9bed0cd3c89dc88826b4309b09b8760dd6e18f10b2c8c30cedb93144a4b3ebad diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/references b/Presence.Desktop/obj/Debug/net8.0/Avalonia/references index d54d8f6..5f61f57 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Avalonia/references +++ b/Presence.Desktop/obj/Debug/net8.0/Avalonia/references @@ -23,16 +23,32 @@ /home/gara/.nuget/packages/avalonia/11.2.1/ref/net8.0/Avalonia.Vulkan.dll /home/gara/.nuget/packages/avalonia.win32/11.2.1/lib/net8.0/Avalonia.Win32.dll /home/gara/.nuget/packages/avalonia.x11/11.2.1/lib/net8.0/Avalonia.X11.dll +/home/gara/csharp/BIGPROGECT/presence/data/obj/Debug/net8.0/ref/data.dll +/home/gara/csharp/BIGPROGECT/presence/domain/obj/Debug/net8.0/ref/domain.dll /home/gara/.nuget/packages/dynamicdata/8.4.1/lib/net8.0/DynamicData.dll /home/gara/.nuget/packages/harfbuzzsharp/7.3.0.2/lib/net6.0/HarfBuzzSharp.dll /home/gara/.nuget/packages/microcom.runtime/0.11.0/lib/net5.0/MicroCom.Runtime.dll /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/8.0.11/ref/net8.0/Microsoft.CSharp.dll +/home/gara/.nuget/packages/microsoft.entityframeworkcore.abstractions/8.0.10/lib/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll +/home/gara/.nuget/packages/microsoft.entityframeworkcore/8.0.10/lib/net8.0/Microsoft.EntityFrameworkCore.dll +/home/gara/.nuget/packages/microsoft.entityframeworkcore.relational/8.0.10/lib/net8.0/Microsoft.EntityFrameworkCore.Relational.dll +/home/gara/.nuget/packages/microsoft.extensions.caching.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Caching.Abstractions.dll +/home/gara/.nuget/packages/microsoft.extensions.caching.memory/8.0.1/lib/net8.0/Microsoft.Extensions.Caching.Memory.dll +/home/gara/.nuget/packages/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll +/home/gara/.nuget/packages/microsoft.extensions.dependencyinjection.abstractions/8.0.2/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll +/home/gara/.nuget/packages/microsoft.extensions.dependencyinjection/8.0.1/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll +/home/gara/.nuget/packages/microsoft.extensions.logging.abstractions/8.0.2/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll +/home/gara/.nuget/packages/microsoft.extensions.logging/8.0.1/lib/net8.0/Microsoft.Extensions.Logging.dll +/home/gara/.nuget/packages/microsoft.extensions.options/8.0.2/lib/net8.0/Microsoft.Extensions.Options.dll +/home/gara/.nuget/packages/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/8.0.11/ref/net8.0/Microsoft.VisualBasic.Core.dll /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/8.0.11/ref/net8.0/Microsoft.VisualBasic.dll /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/8.0.11/ref/net8.0/Microsoft.Win32.Primitives.dll /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/8.0.11/ref/net8.0/Microsoft.Win32.Registry.dll /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/8.0.11/ref/net8.0/mscorlib.dll /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/8.0.11/ref/net8.0/netstandard.dll +/home/gara/.nuget/packages/npgsql/8.0.5/lib/net8.0/Npgsql.dll +/home/gara/.nuget/packages/npgsql.entityframeworkcore.postgresql/8.0.10/lib/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll /home/gara/.nuget/packages/reactiveui/20.1.1/lib/net8.0/ReactiveUI.dll /home/gara/.nuget/packages/skiasharp/2.88.8/lib/net6.0/SkiaSharp.dll /home/gara/.nuget/packages/splat/15.1.1/lib/net8.0/Splat.dll diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources b/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources index e9a7746..eaf52f4 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources and b/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs index 4934519..0bfb3e6 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Presence.Desktop")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+427bb6d1639a554afe63c4c9b999f31f3af7ae76")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c690640f78e1f149f0f4dfceaba8f73ce93541f8")] [assembly: System.Reflection.AssemblyProductAttribute("Presence.Desktop")] [assembly: System.Reflection.AssemblyTitleAttribute("Presence.Desktop")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfoInputs.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfoInputs.cache index 6963dd6..825920f 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfoInputs.cache +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfoInputs.cache @@ -1 +1 @@ -ae6e219e97a2e1895985d0650b802aceec95cd96cba399cff6364b57cb7f3a93 +8b882697ba5e9bf12ace9fba0b85c22dc0a2b8cbf33597d104c460fee549711b diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.GeneratedMSBuildEditorConfig.editorconfig b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.GeneratedMSBuildEditorConfig.editorconfig index 28694ed..ce77e5e 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.GeneratedMSBuildEditorConfig.editorconfig +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.GeneratedMSBuildEditorConfig.editorconfig @@ -22,5 +22,11 @@ build_property.EnableGeneratedComInterfaceComImportInterop = [/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/App.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml +[/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/Views/GroupView.axaml] +build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml + [/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/Views/MainWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml + +[/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/Views/PresenceView.axaml] +build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.assets.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.assets.cache index ca2d580..7ff5bd8 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.assets.cache and b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.assets.cache differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.AssemblyReference.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.AssemblyReference.cache index 8fad425..19b1bd4 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.AssemblyReference.cache and b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.AssemblyReference.cache differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.CoreCompileInputs.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.CoreCompileInputs.cache index 548969e..1f948bb 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.CoreCompileInputs.cache +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ad0226e00477ef82b79936269033a260c079ca0e61334c2fa472eb7f676734f1 +e68626bd1a98dbdea1f40f374f2417a325447b8270eac3ee295a31c6c470b799 diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.FileListAbsolute.txt b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.FileListAbsolute.txt index ba7fe24..7c6696d 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.FileListAbsolute.txt +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.FileListAbsolute.txt @@ -70,3 +70,21 @@ /home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/obj/Debug/net8.0/Presence.C94E1B86.Up2Date /home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.genruntimeconfig.cache /home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.EntityFrameworkCore.Relational.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Caching.Abstractions.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Caching.Memory.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.DependencyInjection.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Logging.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Logging.Abstractions.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Options.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Microsoft.Extensions.Primitives.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Npgsql.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/data.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/domain.dll +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/domain.pdb +/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/bin/Debug/net8.0/data.pdb diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll deleted file mode 100644 index 4681bc4..0000000 Binary files a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll and /dev/null differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.genruntimeconfig.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.genruntimeconfig.cache index 821d14c..8e0db0c 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.genruntimeconfig.cache +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.genruntimeconfig.cache @@ -1 +1 @@ -be20363c74f23ae794fc0c198cce5d75dc9dee71954abbd6a521762e33422600 +a2ab95b9e423e0bbbb745ab3c41e0947a598182ac0a0249153215a40b7446fff diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.pdb b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.pdb deleted file mode 100644 index 301905a..0000000 Binary files a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.pdb and /dev/null differ diff --git a/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll index f474996..bf4f92b 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll and b/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll differ diff --git a/Presence.Desktop/obj/Debug/net8.0/refint/Avalonia/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/refint/Avalonia/Presence.Desktop.dll index f474996..bf4f92b 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/refint/Avalonia/Presence.Desktop.dll and b/Presence.Desktop/obj/Debug/net8.0/refint/Avalonia/Presence.Desktop.dll differ diff --git a/Presence.Desktop/obj/Debug/net8.0/refint/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/refint/Presence.Desktop.dll deleted file mode 100644 index b201652..0000000 Binary files a/Presence.Desktop/obj/Debug/net8.0/refint/Presence.Desktop.dll and /dev/null differ diff --git a/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.dgspec.json b/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.dgspec.json index d6ca39f..53d1d6d 100644 --- a/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.dgspec.json +++ b/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.dgspec.json @@ -25,7 +25,11 @@ "frameworks": { "net8.0": { "targetAlias": "net8.0", - "projectReferences": {} + "projectReferences": { + "/home/gara/csharp/BIGPROGECT/presence/domain/domain.csproj": { + "projectPath": "/home/gara/csharp/BIGPROGECT/presence/domain/domain.csproj" + } + } } }, "warningProperties": { @@ -87,6 +91,142 @@ "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json" } } + }, + "/home/gara/csharp/BIGPROGECT/presence/data/data.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "/home/gara/csharp/BIGPROGECT/presence/data/data.csproj", + "projectName": "data", + "projectPath": "/home/gara/csharp/BIGPROGECT/presence/data/data.csproj", + "packagesPath": "/home/gara/.nuget/packages/", + "outputPath": "/home/gara/csharp/BIGPROGECT/presence/data/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/home/gara/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "dependencies": { + "Microsoft.EntityFrameworkCore": { + "target": "Package", + "version": "[8.0.10, )" + }, + "Microsoft.EntityFrameworkCore.Design": { + "include": "Runtime, Build, Native, ContentFiles, Analyzers, BuildTransitive", + "suppressParent": "All", + "target": "Package", + "version": "[8.0.10, )" + }, + "Npgsql.EntityFrameworkCore.PostgreSQL": { + "target": "Package", + "version": "[8.0.10, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json" + } + } + }, + "/home/gara/csharp/BIGPROGECT/presence/domain/domain.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "/home/gara/csharp/BIGPROGECT/presence/domain/domain.csproj", + "projectName": "domain", + "projectPath": "/home/gara/csharp/BIGPROGECT/presence/domain/domain.csproj", + "packagesPath": "/home/gara/.nuget/packages/", + "outputPath": "/home/gara/csharp/BIGPROGECT/presence/domain/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/home/gara/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "projectReferences": { + "/home/gara/csharp/BIGPROGECT/presence/data/data.csproj": { + "projectPath": "/home/gara/csharp/BIGPROGECT/presence/data/data.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json" + } + } } } } \ No newline at end of file diff --git a/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.g.props b/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.g.props index 4aa5c30..8ddbf18 100644 --- a/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.g.props +++ b/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.g.props @@ -14,6 +14,7 @@ + diff --git a/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.g.targets b/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.g.targets index c671c75..27dd88a 100644 --- a/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.g.targets +++ b/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.g.targets @@ -2,6 +2,8 @@ + + diff --git a/Presence.Desktop/obj/project.assets.json b/Presence.Desktop/obj/project.assets.json index 6d3e6dc..308a856 100644 --- a/Presence.Desktop/obj/project.assets.json +++ b/Presence.Desktop/obj/project.assets.json @@ -478,6 +478,274 @@ "lib/net5.0/MicroCom.Runtime.dll": {} } }, + "Microsoft.EntityFrameworkCore/8.0.10": { + "type": "package", + "dependencies": { + "Microsoft.EntityFrameworkCore.Abstractions": "8.0.10", + "Microsoft.EntityFrameworkCore.Analyzers": "8.0.10", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Extensions.Logging": "8.0.1" + }, + "compile": { + "lib/net8.0/Microsoft.EntityFrameworkCore.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.EntityFrameworkCore.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net8.0/Microsoft.EntityFrameworkCore.props": {} + } + }, + "Microsoft.EntityFrameworkCore.Abstractions/8.0.10": { + "type": "package", + "compile": { + "lib/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll": { + "related": ".xml" + } + } + }, + "Microsoft.EntityFrameworkCore.Analyzers/8.0.10": { + "type": "package", + "compile": { + "lib/netstandard2.0/_._": {} + }, + "runtime": { + "lib/netstandard2.0/_._": {} + } + }, + "Microsoft.EntityFrameworkCore.Relational/8.0.10": { + "type": "package", + "dependencies": { + "Microsoft.EntityFrameworkCore": "8.0.10", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + }, + "compile": { + "lib/net8.0/Microsoft.EntityFrameworkCore.Relational.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.EntityFrameworkCore.Relational.dll": { + "related": ".xml" + } + } + }, + "Microsoft.Extensions.Caching.Abstractions/8.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + }, + "compile": { + "lib/net8.0/Microsoft.Extensions.Caching.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Caching.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Caching.Memory/8.0.1": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + }, + "compile": { + "lib/net8.0/Microsoft.Extensions.Caching.Memory.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Caching.Memory.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Configuration.Abstractions/8.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + }, + "compile": { + "lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.DependencyInjection/8.0.1": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + }, + "compile": { + "lib/net8.0/Microsoft.Extensions.DependencyInjection.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.DependencyInjection.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.2": { + "type": "package", + "compile": { + "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Logging/8.0.1": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" + }, + "compile": { + "lib/net8.0/Microsoft.Extensions.Logging.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Logging.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Logging.Abstractions/8.0.2": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + }, + "compile": { + "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets": {} + } + }, + "Microsoft.Extensions.Options/8.0.2": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + }, + "compile": { + "lib/net8.0/Microsoft.Extensions.Options.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Options.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/Microsoft.Extensions.Options.targets": {} + } + }, + "Microsoft.Extensions.Primitives/8.0.0": { + "type": "package", + "compile": { + "lib/net8.0/Microsoft.Extensions.Primitives.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Extensions.Primitives.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Npgsql/8.0.5": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" + }, + "compile": { + "lib/net8.0/Npgsql.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Npgsql.dll": { + "related": ".xml" + } + } + }, + "Npgsql.EntityFrameworkCore.PostgreSQL/8.0.10": { + "type": "package", + "dependencies": { + "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": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Npgsql.EntityFrameworkCore.PostgreSQL.dll": { + "related": ".xml" + } + } + }, "ReactiveUI/20.1.1": { "type": "package", "dependencies": { @@ -663,6 +931,33 @@ "runtime": { "lib/net8.0/Tmds.DBus.Protocol.dll": {} } + }, + "data/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "Microsoft.EntityFrameworkCore": "8.0.10", + "Npgsql.EntityFrameworkCore.PostgreSQL": "8.0.10" + }, + "compile": { + "bin/placeholder/data.dll": {} + }, + "runtime": { + "bin/placeholder/data.dll": {} + } + }, + "domain/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "data": "1.0.0" + }, + "compile": { + "bin/placeholder/domain.dll": {} + }, + "runtime": { + "bin/placeholder/domain.dll": {} + } } } }, @@ -1333,6 +1628,441 @@ "microcom.runtime.nuspec" ] }, + "Microsoft.EntityFrameworkCore/8.0.10": { + "sha512": "PPkQdIqfR1nU3n6YgGGDk8G+eaYbaAKM1AzIQtlPNTKf10Osg3N9T+iK9AlnSA/ujsK00flPpFHVfJrbuBFS1A==", + "type": "package", + "path": "microsoft.entityframeworkcore/8.0.10", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "PACKAGE.md", + "buildTransitive/net8.0/Microsoft.EntityFrameworkCore.props", + "lib/net8.0/Microsoft.EntityFrameworkCore.dll", + "lib/net8.0/Microsoft.EntityFrameworkCore.xml", + "microsoft.entityframeworkcore.8.0.10.nupkg.sha512", + "microsoft.entityframeworkcore.nuspec" + ] + }, + "Microsoft.EntityFrameworkCore.Abstractions/8.0.10": { + "sha512": "FV0QlcX9INY4kAD2o72uPtyOh0nZut2jB11Jf9mNYBtHay8gDLe+x4AbXFwuQg+eSvofjT7naV82e827zGfyMg==", + "type": "package", + "path": "microsoft.entityframeworkcore.abstractions/8.0.10", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "PACKAGE.md", + "lib/net8.0/Microsoft.EntityFrameworkCore.Abstractions.dll", + "lib/net8.0/Microsoft.EntityFrameworkCore.Abstractions.xml", + "microsoft.entityframeworkcore.abstractions.8.0.10.nupkg.sha512", + "microsoft.entityframeworkcore.abstractions.nuspec" + ] + }, + "Microsoft.EntityFrameworkCore.Analyzers/8.0.10": { + "sha512": "51KkPIc0EMv/gVXhPIUi6cwJE9Mvh+PLr4Lap4naLcsoGZ0lF2SvOPgUUprwRV3MnN7nyD1XPhT5RJ/p+xFAXw==", + "type": "package", + "path": "microsoft.entityframeworkcore.analyzers/8.0.10", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "analyzers/dotnet/cs/Microsoft.EntityFrameworkCore.Analyzers.dll", + "docs/PACKAGE.md", + "lib/netstandard2.0/_._", + "microsoft.entityframeworkcore.analyzers.8.0.10.nupkg.sha512", + "microsoft.entityframeworkcore.analyzers.nuspec" + ] + }, + "Microsoft.EntityFrameworkCore.Relational/8.0.10": { + "sha512": "OefBEE47kGKPRPV3OT+FAW6o5BFgLk2D9EoeWVy7NbOepzUneayLQxbVE098FfedTyMwxvZQoDD9LrvZc3MadA==", + "type": "package", + "path": "microsoft.entityframeworkcore.relational/8.0.10", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "PACKAGE.md", + "lib/net8.0/Microsoft.EntityFrameworkCore.Relational.dll", + "lib/net8.0/Microsoft.EntityFrameworkCore.Relational.xml", + "microsoft.entityframeworkcore.relational.8.0.10.nupkg.sha512", + "microsoft.entityframeworkcore.relational.nuspec" + ] + }, + "Microsoft.Extensions.Caching.Abstractions/8.0.0": { + "sha512": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "type": "package", + "path": "microsoft.extensions.caching.abstractions/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Caching.Abstractions.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Caching.Abstractions.targets", + "lib/net462/Microsoft.Extensions.Caching.Abstractions.dll", + "lib/net462/Microsoft.Extensions.Caching.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.Caching.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.Caching.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.Caching.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.Caching.Abstractions.xml", + "lib/net8.0/Microsoft.Extensions.Caching.Abstractions.dll", + "lib/net8.0/Microsoft.Extensions.Caching.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Caching.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Caching.Abstractions.xml", + "microsoft.extensions.caching.abstractions.8.0.0.nupkg.sha512", + "microsoft.extensions.caching.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Caching.Memory/8.0.1": { + "sha512": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "type": "package", + "path": "microsoft.extensions.caching.memory/8.0.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Caching.Memory.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Caching.Memory.targets", + "lib/net462/Microsoft.Extensions.Caching.Memory.dll", + "lib/net462/Microsoft.Extensions.Caching.Memory.xml", + "lib/net6.0/Microsoft.Extensions.Caching.Memory.dll", + "lib/net6.0/Microsoft.Extensions.Caching.Memory.xml", + "lib/net7.0/Microsoft.Extensions.Caching.Memory.dll", + "lib/net7.0/Microsoft.Extensions.Caching.Memory.xml", + "lib/net8.0/Microsoft.Extensions.Caching.Memory.dll", + "lib/net8.0/Microsoft.Extensions.Caching.Memory.xml", + "lib/netstandard2.0/Microsoft.Extensions.Caching.Memory.dll", + "lib/netstandard2.0/Microsoft.Extensions.Caching.Memory.xml", + "microsoft.extensions.caching.memory.8.0.1.nupkg.sha512", + "microsoft.extensions.caching.memory.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Configuration.Abstractions/8.0.0": { + "sha512": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "type": "package", + "path": "microsoft.extensions.configuration.abstractions/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Abstractions.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Abstractions.targets", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "microsoft.extensions.configuration.abstractions.8.0.0.nupkg.sha512", + "microsoft.extensions.configuration.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.DependencyInjection/8.0.1": { + "sha512": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==", + "type": "package", + "path": "microsoft.extensions.dependencyinjection/8.0.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.DependencyInjection.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.targets", + "lib/net462/Microsoft.Extensions.DependencyInjection.dll", + "lib/net462/Microsoft.Extensions.DependencyInjection.xml", + "lib/net6.0/Microsoft.Extensions.DependencyInjection.dll", + "lib/net6.0/Microsoft.Extensions.DependencyInjection.xml", + "lib/net7.0/Microsoft.Extensions.DependencyInjection.dll", + "lib/net7.0/Microsoft.Extensions.DependencyInjection.xml", + "lib/net8.0/Microsoft.Extensions.DependencyInjection.dll", + "lib/net8.0/Microsoft.Extensions.DependencyInjection.xml", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.xml", + "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.dll", + "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.xml", + "microsoft.extensions.dependencyinjection.8.0.1.nupkg.sha512", + "microsoft.extensions.dependencyinjection.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.2": { + "sha512": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", + "type": "package", + "path": "microsoft.extensions.dependencyinjection.abstractions/8.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.DependencyInjection.Abstractions.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.Abstractions.targets", + "lib/net462/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net462/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", + "microsoft.extensions.dependencyinjection.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Logging/8.0.1": { + "sha512": "4x+pzsQEbqxhNf1QYRr5TDkLP9UsLT3A6MdRKDDEgrW7h1ljiEPgTNhKYUhNCCAaVpQECVQ+onA91PTPnIp6Lw==", + "type": "package", + "path": "microsoft.extensions.logging/8.0.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Logging.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Logging.targets", + "lib/net462/Microsoft.Extensions.Logging.dll", + "lib/net462/Microsoft.Extensions.Logging.xml", + "lib/net6.0/Microsoft.Extensions.Logging.dll", + "lib/net6.0/Microsoft.Extensions.Logging.xml", + "lib/net7.0/Microsoft.Extensions.Logging.dll", + "lib/net7.0/Microsoft.Extensions.Logging.xml", + "lib/net8.0/Microsoft.Extensions.Logging.dll", + "lib/net8.0/Microsoft.Extensions.Logging.xml", + "lib/netstandard2.0/Microsoft.Extensions.Logging.dll", + "lib/netstandard2.0/Microsoft.Extensions.Logging.xml", + "lib/netstandard2.1/Microsoft.Extensions.Logging.dll", + "lib/netstandard2.1/Microsoft.Extensions.Logging.xml", + "microsoft.extensions.logging.8.0.1.nupkg.sha512", + "microsoft.extensions.logging.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Logging.Abstractions/8.0.2": { + "sha512": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", + "type": "package", + "path": "microsoft.extensions.logging.abstractions/8.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "analyzers/dotnet/roslyn3.11/cs/Microsoft.Extensions.Logging.Generators.dll", + "analyzers/dotnet/roslyn3.11/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn3.11/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.dll", + "analyzers/dotnet/roslyn4.0/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.0/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/Microsoft.Extensions.Logging.Generators.dll", + "analyzers/dotnet/roslyn4.4/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll", + "buildTransitive/net461/Microsoft.Extensions.Logging.Abstractions.targets", + "buildTransitive/net462/Microsoft.Extensions.Logging.Abstractions.targets", + "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Logging.Abstractions.targets", + "buildTransitive/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.targets", + "lib/net462/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net462/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.xml", + "microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", + "microsoft.extensions.logging.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Options/8.0.2": { + "sha512": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "type": "package", + "path": "microsoft.extensions.options/8.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "analyzers/dotnet/roslyn4.4/cs/Microsoft.Extensions.Options.SourceGeneration.dll", + "analyzers/dotnet/roslyn4.4/cs/cs/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/de/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/es/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/fr/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/it/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ja/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ko/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/pl/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/pt-BR/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/ru/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/tr/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/zh-Hans/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "analyzers/dotnet/roslyn4.4/cs/zh-Hant/Microsoft.Extensions.Options.SourceGeneration.resources.dll", + "buildTransitive/net461/Microsoft.Extensions.Options.targets", + "buildTransitive/net462/Microsoft.Extensions.Options.targets", + "buildTransitive/net6.0/Microsoft.Extensions.Options.targets", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Options.targets", + "buildTransitive/netstandard2.0/Microsoft.Extensions.Options.targets", + "lib/net462/Microsoft.Extensions.Options.dll", + "lib/net462/Microsoft.Extensions.Options.xml", + "lib/net6.0/Microsoft.Extensions.Options.dll", + "lib/net6.0/Microsoft.Extensions.Options.xml", + "lib/net7.0/Microsoft.Extensions.Options.dll", + "lib/net7.0/Microsoft.Extensions.Options.xml", + "lib/net8.0/Microsoft.Extensions.Options.dll", + "lib/net8.0/Microsoft.Extensions.Options.xml", + "lib/netstandard2.0/Microsoft.Extensions.Options.dll", + "lib/netstandard2.0/Microsoft.Extensions.Options.xml", + "lib/netstandard2.1/Microsoft.Extensions.Options.dll", + "lib/netstandard2.1/Microsoft.Extensions.Options.xml", + "microsoft.extensions.options.8.0.2.nupkg.sha512", + "microsoft.extensions.options.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Primitives/8.0.0": { + "sha512": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "type": "package", + "path": "microsoft.extensions.primitives/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "PACKAGE.md", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Primitives.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Primitives.targets", + "lib/net462/Microsoft.Extensions.Primitives.dll", + "lib/net462/Microsoft.Extensions.Primitives.xml", + "lib/net6.0/Microsoft.Extensions.Primitives.dll", + "lib/net6.0/Microsoft.Extensions.Primitives.xml", + "lib/net7.0/Microsoft.Extensions.Primitives.dll", + "lib/net7.0/Microsoft.Extensions.Primitives.xml", + "lib/net8.0/Microsoft.Extensions.Primitives.dll", + "lib/net8.0/Microsoft.Extensions.Primitives.xml", + "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll", + "lib/netstandard2.0/Microsoft.Extensions.Primitives.xml", + "microsoft.extensions.primitives.8.0.0.nupkg.sha512", + "microsoft.extensions.primitives.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Npgsql/8.0.5": { + "sha512": "zRG5V8cyeZLpzJlKzFKjEwkRMYIYnHWJvEor2lWXeccS2E1G2nIWYYhnukB51iz5XsWSVEtqg3AxTWM0QJ6vfg==", + "type": "package", + "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", + "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/8.0.10": { + "sha512": "gFPl9Dmxih7Yi4tZ3bITzZFzbxFMBx04gqTqcjoL2r5VEW+O2TA5UVw/wm/XW26NAJ7sg59Je0+9QrwiZt6MPQ==", + "type": "package", + "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.8.0.10.nupkg.sha512", + "npgsql.entityframeworkcore.postgresql.nuspec", + "postgresql.png" + ] + }, "ReactiveUI/20.1.1": { "sha512": "9hNPknWjijnaSWs6auypoXqUptPZcRpUypF+cf1zD50fgW+SEoQda502N3fVZ2eWPcaiUad+z6GaLwOWmUVHNw==", "type": "package", @@ -1728,6 +2458,16 @@ "tmds.dbus.protocol.0.20.0.nupkg.sha512", "tmds.dbus.protocol.nuspec" ] + }, + "data/1.0.0": { + "type": "project", + "path": "../data/data.csproj", + "msbuildProject": "../data/data.csproj" + }, + "domain/1.0.0": { + "type": "project", + "path": "../domain/domain.csproj", + "msbuildProject": "../domain/domain.csproj" } }, "projectFileDependencyGroups": { @@ -1737,7 +2477,8 @@ "Avalonia.Diagnostics >= 11.2.1", "Avalonia.Fonts.Inter >= 11.2.1", "Avalonia.ReactiveUI >= 11.2.1", - "Avalonia.Themes.Fluent >= 11.2.1" + "Avalonia.Themes.Fluent >= 11.2.1", + "domain >= 1.0.0" ] }, "packageFolders": { @@ -1764,7 +2505,11 @@ "frameworks": { "net8.0": { "targetAlias": "net8.0", - "projectReferences": {} + "projectReferences": { + "/home/gara/csharp/BIGPROGECT/presence/domain/domain.csproj": { + "projectPath": "/home/gara/csharp/BIGPROGECT/presence/domain/domain.csproj" + } + } } }, "warningProperties": { @@ -1826,13 +2571,5 @@ "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json" } } - }, - "logs": [ - { - "code": "NU1900", - "level": "Warning", - "warningLevel": 1, - "message": "Error occurred while getting package vulnerability data: Unable to load the service index for source https://api.nuget.org/v3/index.json." - } - ] + } } \ No newline at end of file diff --git a/Presence.Desktop/obj/project.nuget.cache b/Presence.Desktop/obj/project.nuget.cache index 4a5d680..2eda1a4 100644 --- a/Presence.Desktop/obj/project.nuget.cache +++ b/Presence.Desktop/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "ZzTBU9VE+ec=", + "dgSpecHash": "yZq6gfkM/18=", "success": true, "projectFilePath": "/home/gara/csharp/BIGPROGECT/presence/Presence.Desktop/Presence.Desktop.csproj", "expectedPackageFiles": [ @@ -28,6 +28,21 @@ "/home/gara/.nuget/packages/harfbuzzsharp.nativeassets.webassembly/7.3.0.3-preview.2.2/harfbuzzsharp.nativeassets.webassembly.7.3.0.3-preview.2.2.nupkg.sha512", "/home/gara/.nuget/packages/harfbuzzsharp.nativeassets.win32/7.3.0.2/harfbuzzsharp.nativeassets.win32.7.3.0.2.nupkg.sha512", "/home/gara/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.entityframeworkcore/8.0.10/microsoft.entityframeworkcore.8.0.10.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.entityframeworkcore.abstractions/8.0.10/microsoft.entityframeworkcore.abstractions.8.0.10.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.entityframeworkcore.analyzers/8.0.10/microsoft.entityframeworkcore.analyzers.8.0.10.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.entityframeworkcore.relational/8.0.10/microsoft.entityframeworkcore.relational.8.0.10.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.caching.abstractions/8.0.0/microsoft.extensions.caching.abstractions.8.0.0.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.caching.memory/8.0.1/microsoft.extensions.caching.memory.8.0.1.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.dependencyinjection/8.0.1/microsoft.extensions.dependencyinjection.8.0.1.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.dependencyinjection.abstractions/8.0.2/microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.logging/8.0.1/microsoft.extensions.logging.8.0.1.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.logging.abstractions/8.0.2/microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.options/8.0.2/microsoft.extensions.options.8.0.2.nupkg.sha512", + "/home/gara/.nuget/packages/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg.sha512", + "/home/gara/.nuget/packages/npgsql/8.0.5/npgsql.8.0.5.nupkg.sha512", + "/home/gara/.nuget/packages/npgsql.entityframeworkcore.postgresql/8.0.10/npgsql.entityframeworkcore.postgresql.8.0.10.nupkg.sha512", "/home/gara/.nuget/packages/reactiveui/20.1.1/reactiveui.20.1.1.nupkg.sha512", "/home/gara/.nuget/packages/skiasharp/2.88.8/skiasharp.2.88.8.nupkg.sha512", "/home/gara/.nuget/packages/skiasharp.nativeassets.linux/2.88.8/skiasharp.nativeassets.linux.2.88.8.nupkg.sha512", @@ -40,12 +55,5 @@ "/home/gara/.nuget/packages/system.reactive/6.0.1/system.reactive.6.0.1.nupkg.sha512", "/home/gara/.nuget/packages/tmds.dbus.protocol/0.20.0/tmds.dbus.protocol.0.20.0.nupkg.sha512" ], - "logs": [ - { - "code": "NU1900", - "level": "Warning", - "warningLevel": 1, - "message": "Error occurred while getting package vulnerability data: Unable to load the service index for source https://api.nuget.org/v3/index.json." - } - ] + "logs": [] } \ No newline at end of file diff --git a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs index 04e5e92..3c21b33 100644 --- a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs +++ b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("console_ui")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+427bb6d1639a554afe63c4c9b999f31f3af7ae76")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c690640f78e1f149f0f4dfceaba8f73ce93541f8")] [assembly: System.Reflection.AssemblyProductAttribute("console_ui")] [assembly: System.Reflection.AssemblyTitleAttribute("console_ui")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache index 7c0de2e..18f890a 100644 --- a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache +++ b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache @@ -1 +1 @@ -49a3e78568fbafc89d6a10ad50eda8e7e08d9455475e01c26535741e0d17c7c9 +c4b7c660d360501baf1f1942572f96b0c294069fdb2ffa46820e5f62689b2638 diff --git a/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache b/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache index b8f3733..77af28b 100644 Binary files a/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache and b/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache differ diff --git a/data/RemoteData/RemoteDataBase/DAO/User.cs b/data/RemoteData/RemoteDataBase/DAO/User.cs index c99a1c9..3783cb8 100755 --- a/data/RemoteData/RemoteDataBase/DAO/User.cs +++ b/data/RemoteData/RemoteDataBase/DAO/User.cs @@ -9,7 +9,7 @@ namespace presence.data.RemoteData.RemoteDataBase.DAO { public required string FIO {get; set; } public int UserId { get; set; } - public required int GroupId {get; set;} + public int GroupId {get; set;} public GroupDao Group {get; set;} public IEnumerable Presences { get; set; } } diff --git a/data/Repository/AdminRepositoryImp.cs b/data/Repository/AdminRepositoryImp.cs index f4ff465..768dbd3 100644 --- a/data/Repository/AdminRepositoryImp.cs +++ b/data/Repository/AdminRepositoryImp.cs @@ -18,19 +18,13 @@ namespace data.Repository _remoteDataBaseContext = remoteDataBaseContext; } - public bool AddStudents(GroupDao group, List students) + public bool AddStudents(GroupDao group, List students) { _remoteDataBaseContext.Groups.Add(group); _remoteDataBaseContext.SaveChanges(); - foreach (string student in students) + foreach (UserDao student in students) { - var user = new UserDao - { - FIO = student, - GroupId = group.Id, - Group = _remoteDataBaseContext.Groups.Where(x => x.Id == group.Id).FirstOrDefault(), - }; - _remoteDataBaseContext.Users.Add(user); + _remoteDataBaseContext.Users.Add(student); } _remoteDataBaseContext.SaveChanges(); return true; diff --git a/data/Repository/GroupRepositoryImpl.cs b/data/Repository/GroupRepositoryImpl.cs index e506d24..9c35ed3 100755 --- a/data/Repository/GroupRepositoryImpl.cs +++ b/data/Repository/GroupRepositoryImpl.cs @@ -31,10 +31,10 @@ namespace presence.data.Repository return true; } - public List GetAllGroup() + public List GetAllGroup() { return _remoteDatabaseContext.Groups - .Select(g => new GroupLocalEntity + .Select(g => new GroupDao { Name = g.Name, Id = g.Id @@ -87,5 +87,21 @@ namespace presence.data.Repository _remoteDatabaseContext.SaveChanges(); return true; } + + public bool AddStudents(GroupDao group, List students) + { + _remoteDatabaseContext.Groups.Add(group); + _remoteDatabaseContext.SaveChanges(); + foreach (UserDao student in students) + { + _remoteDatabaseContext.Users.Add(student); + } + _remoteDatabaseContext.SaveChanges(); + return true; + } + public async Task> getAllGroupAsync() + { + return await _remoteDatabaseContext.Groups.Include(group => group.User).ToListAsync(); + } } } \ No newline at end of file diff --git a/data/Repository/IAdminRepository.cs b/data/Repository/IAdminRepository.cs index 66cd3e1..c1d76e4 100644 --- a/data/Repository/IAdminRepository.cs +++ b/data/Repository/IAdminRepository.cs @@ -8,7 +8,7 @@ namespace data.Repository { public interface IAdminRepository { - bool AddStudents(GroupDao group, List students); + bool AddStudents(GroupDao group, List students); IEnumerable GetAllGroupsWithStudents(); UserDao GetStudentInfo(int userId); bool RemoveUserById(int userId, int groupId); diff --git a/data/Repository/IGroupRepository.cs b/data/Repository/IGroupRepository.cs index 28bed81..396f596 100755 --- a/data/Repository/IGroupRepository.cs +++ b/data/Repository/IGroupRepository.cs @@ -10,10 +10,12 @@ using presence.data.RemoteData.RemoteDataBase.DAO; namespace presence.data.Repository { public interface IGroupRepository { - List GetAllGroup(); + List GetAllGroup(); bool RemoveGroupById(int groupID); bool UpdateGroupById(int groupID, String name); GroupDao GetGroupById(int groupID); bool AddGroup(GroupDao group); + bool AddStudents(GroupDao group, List students); + public Task> getAllGroupAsync(); } } \ No newline at end of file diff --git a/data/Repository/PresenceRepositoryImpl.cs b/data/Repository/PresenceRepositoryImpl.cs index 9450799..63fd297 100755 --- a/data/Repository/PresenceRepositoryImpl.cs +++ b/data/Repository/PresenceRepositoryImpl.cs @@ -26,7 +26,7 @@ namespace presence.data.Repository Date = presence.Date, ClassNumber = presence.ClassNumber, UserId = presence.UserId, - User = presence.User + GroupId = presence.GroupId }; _remoteDatabaseContext.Presences.Add(presenceDao); _remoteDatabaseContext.SaveChanges(); diff --git a/data/bin/Debug/net8.0/data.dll b/data/bin/Debug/net8.0/data.dll index 632fae8..859c092 100644 Binary files a/data/bin/Debug/net8.0/data.dll and b/data/bin/Debug/net8.0/data.dll differ diff --git a/data/bin/Debug/net8.0/data.pdb b/data/bin/Debug/net8.0/data.pdb index ba9850d..e0fd2bf 100644 Binary files a/data/bin/Debug/net8.0/data.pdb and b/data/bin/Debug/net8.0/data.pdb differ diff --git a/data/obj/Debug/net8.0/data.AssemblyInfo.cs b/data/obj/Debug/net8.0/data.AssemblyInfo.cs index 7d265c6..bd06336 100644 --- a/data/obj/Debug/net8.0/data.AssemblyInfo.cs +++ b/data/obj/Debug/net8.0/data.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("data")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+427bb6d1639a554afe63c4c9b999f31f3af7ae76")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c690640f78e1f149f0f4dfceaba8f73ce93541f8")] [assembly: System.Reflection.AssemblyProductAttribute("data")] [assembly: System.Reflection.AssemblyTitleAttribute("data")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache b/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache index f7259bc..26d9ba8 100644 --- a/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache +++ b/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache @@ -1 +1 @@ -f9352d11b37234a085d1a7821bab4c2bcbb2f5f47e47212cce4b55148647f193 +6d0b8de6b931e9e0143fcb1b1cf9e324d3b41aace7681baad3b708e378bbf653 diff --git a/data/obj/Debug/net8.0/data.dll b/data/obj/Debug/net8.0/data.dll index 632fae8..859c092 100644 Binary files a/data/obj/Debug/net8.0/data.dll and b/data/obj/Debug/net8.0/data.dll differ diff --git a/data/obj/Debug/net8.0/data.pdb b/data/obj/Debug/net8.0/data.pdb index ba9850d..e0fd2bf 100644 Binary files a/data/obj/Debug/net8.0/data.pdb and b/data/obj/Debug/net8.0/data.pdb differ diff --git a/data/obj/Debug/net8.0/ref/data.dll b/data/obj/Debug/net8.0/ref/data.dll index fd98a1d..d91de57 100644 Binary files a/data/obj/Debug/net8.0/ref/data.dll and b/data/obj/Debug/net8.0/ref/data.dll differ diff --git a/data/obj/Debug/net8.0/refint/data.dll b/data/obj/Debug/net8.0/refint/data.dll index fd98a1d..d91de57 100644 Binary files a/data/obj/Debug/net8.0/refint/data.dll and b/data/obj/Debug/net8.0/refint/data.dll differ diff --git a/domain/Requests/AddGroupRequest.cs b/domain/Requests/AddGroupRequest.cs new file mode 100644 index 0000000..ea3e208 --- /dev/null +++ b/domain/Requests/AddGroupRequest.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace domain.Requests +{ + public class AddGroupRequest + { + public string Name { get; set; } + } +} \ No newline at end of file diff --git a/domain/Requests/AddGroupWithStudentRequest.cs b/domain/Requests/AddGroupWithStudentRequest.cs new file mode 100644 index 0000000..19de838 --- /dev/null +++ b/domain/Requests/AddGroupWithStudentRequest.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace domain.Requests +{ + public class AddGroupWithStudentRequest + { + public AddGroupRequest addGroupRequest { get; set; } + public IEnumerable AddStudentRequests { get; set; } + } +} \ No newline at end of file diff --git a/domain/Requests/AddStudentRequest.cs b/domain/Requests/AddStudentRequest.cs new file mode 100644 index 0000000..f728194 --- /dev/null +++ b/domain/Requests/AddStudentRequest.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace domain.Requests +{ + public class AddStudentRequest + { + public string StudentName { get; set; } + } +} \ No newline at end of file diff --git a/domain/Services/GroupService.cs b/domain/Services/GroupService.cs new file mode 100644 index 0000000..adafec0 --- /dev/null +++ b/domain/Services/GroupService.cs @@ -0,0 +1,84 @@ +using data.Repository; +using domain.Models.ResponseModels; +using domain.Requests; +using domain.UseCase; +using presence.data.RemoteData.RemoteDataBase.DAO; +using presence.data.Repository; +using presence.domain.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace domain.Service +{ + public class GroupService : IGroupUseCase + { + private readonly IGroupRepository _groupRepository; + public GroupService(IGroupRepository groupRepository) + { + _groupRepository = groupRepository; + } + public void AddGroup(AddGroupRequest addGroupRequest) + { + _groupRepository.AddGroup(new GroupDao { Name = addGroupRequest.Name }); + } + + + + public void AddGroupWithStudents(AddGroupWithStudentRequest addGroupWithStudents) + { + GroupDao groupDAO = new GroupDao { Name = addGroupWithStudents.addGroupRequest.Name }; + List users = addGroupWithStudents + .AddStudentRequests + .Select(it => new UserDao { FIO = it.StudentName }) + .ToList(); + _groupRepository.AddStudents(groupDAO, users); + } + + public async Task> GetGroupsWithStudentsAsync() + { + var result = await _groupRepository.getAllGroupAsync(); + + return result.Select( + group => new GroupResponse + { + Id = group.Id, + Name = group.Name, + User = group.User.Select( + user => new UserResponse + { + Id = user.UserId, + FIO = user.FIO, + Group = new GroupResponse + { + Id = group.Id, + Name = group.Name, + } + }).ToList() + }).ToList(); + } + + public IEnumerable GetGroupsWithStudents() + { + return _groupRepository.GetAllGroup().Select( + group => new GroupResponse + { + Id = group.Id, + Name = group.Name, + User = group.User != null ? group.User.Select( + user => new UserResponse + { + Id = user.UserId, + FIO = user.FIO, + Group = new GroupResponse + { + Id = group.Id, + Name = group.Name, + } + }).ToList() : new List() + }).ToList(); + } + } +} \ No newline at end of file diff --git a/domain/UseCase/AdminUseCase.cs b/domain/UseCase/AdminUseCase.cs index 116b709..377c3c2 100644 --- a/domain/UseCase/AdminUseCase.cs +++ b/domain/UseCase/AdminUseCase.cs @@ -50,7 +50,17 @@ namespace domain.UseCase public bool AddStudents(string GroupName, List Students) { GroupDao groupDao= new GroupDao{ Name = GroupName}; - return _adminRepository.AddStudents(groupDao, Students); + List users = new List(); + foreach (string student in Students) + { + var user = new UserDao + { + FIO = student, + Group = groupDao + }; + users.Add(user); + } + return _adminRepository.AddStudents(groupDao, users); } public bool DeleteGroup(int groupId) => _groupRepository.RemoveGroupById(groupId); diff --git a/domain/UseCase/IAdminUseCase.cs b/domain/UseCase/IAdminUseCase.cs new file mode 100644 index 0000000..060f399 --- /dev/null +++ b/domain/UseCase/IAdminUseCase.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using domain.Models.ResponseModels; + +namespace domain.UseCase +{ + public interface IAdminUseCase + { + IEnumerable GetAllGroupsWithStudents(); + UserResponse GetStudentInfo(int userId); + bool AddStudents(string GroupName, List Students); + bool DeleteGroup(int groupId); + bool DeleteUserFromGroup(int userId, int groupId); + } +} \ No newline at end of file diff --git a/domain/UseCase/IGroupUseCase.cs b/domain/UseCase/IGroupUseCase.cs new file mode 100644 index 0000000..d311313 --- /dev/null +++ b/domain/UseCase/IGroupUseCase.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using domain.Models.ResponseModels; +using domain.Requests; +using presence.domain.Models; + +namespace domain.UseCase +{ + public interface IGroupUseCase + { + public Task> GetGroupsWithStudentsAsync(); + public IEnumerable GetGroupsWithStudents(); + public void AddGroup(AddGroupRequest addGroupRequest); + public void AddGroupWithStudents(AddGroupWithStudentRequest addGroupWithStudents); + + } +} \ No newline at end of file diff --git a/domain/UseCase/IPresenceUseCase.cs b/domain/UseCase/IPresenceUseCase.cs new file mode 100644 index 0000000..f245dd8 --- /dev/null +++ b/domain/UseCase/IPresenceUseCase.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using domain.Models.ResponseModels; +using presence.domain.Models; + +namespace domain.UseCase +{ + public interface IPresenceUseCase + { + List GetPresence(int GroupId, DateOnly startData, DateOnly endData, int UserId); + List GetPresenceByGroup(int groupId); + List GetPresenceByGroupAndDate(int groupId, DateOnly date); + bool UncheckAttendence(int firstClass, int lastClass, DateOnly date, int userId); + void AddPresence(int firstClass, int lastClass, int groupId,DateOnly date); + List AddPresenceByDate(String startDate, String endDate, int groupId); + Dictionary GetPresenceStatsByGroup(int groupId); + void GenerateWeeklyPresence(int firstClass, int lastClass, int groupId, DateOnly startDate); + bool DeletePresenceByGroup(int groupId); + bool DeletePresenceByUser(int UserId); + bool DeletePresenceByDate(DateOnly startData, DateOnly endData); + + } +} \ No newline at end of file diff --git a/domain/UseCase/IUserUseCase.cs b/domain/UseCase/IUserUseCase.cs new file mode 100644 index 0000000..d08586b --- /dev/null +++ b/domain/UseCase/IUserUseCase.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using presence.domain.Models; + +namespace domain.UseCase +{ + public interface IUserUseCase + { + List GetAllUsers(); + bool RemoveUserById(int userId); + User GetUserById(int userId); + bool UpdateUserById(int userId, String fio, int groupId); + + } +} \ No newline at end of file diff --git a/domain/UseCase/PresenceUseCase.cs b/domain/UseCase/PresenceUseCase.cs index 076c212..491846a 100755 --- a/domain/UseCase/PresenceUseCase.cs +++ b/domain/UseCase/PresenceUseCase.cs @@ -44,6 +44,7 @@ namespace presence.domain.UseCase }).ToList(); return presence; } + public List GetPresenceByGroup(int groupId) { var users = _userRepository.GetAllUser().Where(x => x.GroupId == groupId).ToList(); @@ -92,11 +93,17 @@ namespace presence.domain.UseCase { foreach (var user in users) { - Presence pres = new Presence{ClassNumber = i, Date = date, - User = new User{Id = user.UserId, - FIO = user.FIO, - GroupId = new Group{Id = groupId, - Name = _groupRepository.GetGroupById(groupId).Name}}}; + Presence pres = new Presence + {ClassNumber = i, Date = date, + User = new User + {Id = user.UserId, + FIO = user.FIO, + GroupId = new Group + {Id = groupId, + Name = _groupRepository.GetGroupById(groupId).Name + } + } + }; presenceList.Add(pres); } } diff --git a/domain/UseCase/UserUseCase.cs b/domain/UseCase/UserUseCase.cs index 6e7e789..d17ff62 100755 --- a/domain/UseCase/UserUseCase.cs +++ b/domain/UseCase/UserUseCase.cs @@ -24,8 +24,6 @@ namespace presence.domain.UseCase _repositoryGroupImpl = repositoryGroupImpl; } - private List GetAllGroups() => _repositoryGroupImpl.GetAllGroup() - .Select(it => new Group { Id = it.Id, Name = it.Name}).ToList(); public List GetAllUsers() => _repositoryUserImpl.GetAllUser() .Join(_repositoryGroupImpl.GetAllGroup(), user => user.GroupId, diff --git a/domain/bin/Debug/net8.0/data.dll b/domain/bin/Debug/net8.0/data.dll index 632fae8..859c092 100644 Binary files a/domain/bin/Debug/net8.0/data.dll and b/domain/bin/Debug/net8.0/data.dll differ diff --git a/domain/bin/Debug/net8.0/data.pdb b/domain/bin/Debug/net8.0/data.pdb index ba9850d..e0fd2bf 100644 Binary files a/domain/bin/Debug/net8.0/data.pdb and b/domain/bin/Debug/net8.0/data.pdb differ diff --git a/domain/bin/Debug/net8.0/domain.dll b/domain/bin/Debug/net8.0/domain.dll index bc8dbbd..285307a 100644 Binary files a/domain/bin/Debug/net8.0/domain.dll and b/domain/bin/Debug/net8.0/domain.dll differ diff --git a/domain/bin/Debug/net8.0/domain.pdb b/domain/bin/Debug/net8.0/domain.pdb index 5918cc0..d587f77 100644 Binary files a/domain/bin/Debug/net8.0/domain.pdb and b/domain/bin/Debug/net8.0/domain.pdb differ diff --git a/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs b/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs index 4416fbd..c8d6b8d 100644 --- a/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs +++ b/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("domain")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+427bb6d1639a554afe63c4c9b999f31f3af7ae76")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c690640f78e1f149f0f4dfceaba8f73ce93541f8")] [assembly: System.Reflection.AssemblyProductAttribute("domain")] [assembly: System.Reflection.AssemblyTitleAttribute("domain")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache b/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache index af3975b..fc988c1 100644 --- a/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache +++ b/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache @@ -1 +1 @@ -421bbb27b234aeeb3e8a0dd963d9c36d9a69163f8ffc91f242ca454b2c574fe8 +43afdf5708c755cbde2e76d819f2a123c0a982403109275bceb5be533c69e450 diff --git a/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache b/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache index 457435a..41d681e 100644 Binary files a/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache and b/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache differ diff --git a/domain/obj/Debug/net8.0/domain.csproj.CoreCompileInputs.cache b/domain/obj/Debug/net8.0/domain.csproj.CoreCompileInputs.cache index d343454..a2417d2 100644 --- a/domain/obj/Debug/net8.0/domain.csproj.CoreCompileInputs.cache +++ b/domain/obj/Debug/net8.0/domain.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -911d9573732d1fc380d91486860b2874ebb6e8fcc72a2feadc02621a14a4bef7 +535cddd3929e4f6dcfa360404cf64d9b6e6c19b6281c53f4bdc2cbaac97f574f diff --git a/domain/obj/Debug/net8.0/domain.dll b/domain/obj/Debug/net8.0/domain.dll index bc8dbbd..285307a 100644 Binary files a/domain/obj/Debug/net8.0/domain.dll and b/domain/obj/Debug/net8.0/domain.dll differ diff --git a/domain/obj/Debug/net8.0/domain.pdb b/domain/obj/Debug/net8.0/domain.pdb index 5918cc0..d587f77 100644 Binary files a/domain/obj/Debug/net8.0/domain.pdb and b/domain/obj/Debug/net8.0/domain.pdb differ diff --git a/domain/obj/Debug/net8.0/ref/domain.dll b/domain/obj/Debug/net8.0/ref/domain.dll index bc5de48..49dc48f 100644 Binary files a/domain/obj/Debug/net8.0/ref/domain.dll and b/domain/obj/Debug/net8.0/ref/domain.dll differ diff --git a/domain/obj/Debug/net8.0/refint/domain.dll b/domain/obj/Debug/net8.0/refint/domain.dll index bc5de48..49dc48f 100644 Binary files a/domain/obj/Debug/net8.0/refint/domain.dll and b/domain/obj/Debug/net8.0/refint/domain.dll differ diff --git a/presence_api/bin/Debug/net8.0/data.dll b/presence_api/bin/Debug/net8.0/data.dll index 632fae8..859c092 100644 Binary files a/presence_api/bin/Debug/net8.0/data.dll and b/presence_api/bin/Debug/net8.0/data.dll differ diff --git a/presence_api/bin/Debug/net8.0/data.pdb b/presence_api/bin/Debug/net8.0/data.pdb index ba9850d..e0fd2bf 100644 Binary files a/presence_api/bin/Debug/net8.0/data.pdb and b/presence_api/bin/Debug/net8.0/data.pdb differ diff --git a/presence_api/bin/Debug/net8.0/domain.dll b/presence_api/bin/Debug/net8.0/domain.dll index bc8dbbd..4a2043a 100644 Binary files a/presence_api/bin/Debug/net8.0/domain.dll and b/presence_api/bin/Debug/net8.0/domain.dll differ diff --git a/presence_api/bin/Debug/net8.0/domain.pdb b/presence_api/bin/Debug/net8.0/domain.pdb index 5918cc0..2733adb 100644 Binary files a/presence_api/bin/Debug/net8.0/domain.pdb and b/presence_api/bin/Debug/net8.0/domain.pdb differ diff --git a/presence_api/bin/Debug/net8.0/presence_api.dll b/presence_api/bin/Debug/net8.0/presence_api.dll index c66e7f9..19f767e 100644 Binary files a/presence_api/bin/Debug/net8.0/presence_api.dll and b/presence_api/bin/Debug/net8.0/presence_api.dll differ diff --git a/presence_api/bin/Debug/net8.0/presence_api.pdb b/presence_api/bin/Debug/net8.0/presence_api.pdb index 05c2330..67c876f 100644 Binary files a/presence_api/bin/Debug/net8.0/presence_api.pdb and b/presence_api/bin/Debug/net8.0/presence_api.pdb differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs index afae948..a3099e4 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs +++ b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("presence_api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+427bb6d1639a554afe63c4c9b999f31f3af7ae76")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c690640f78e1f149f0f4dfceaba8f73ce93541f8")] [assembly: System.Reflection.AssemblyProductAttribute("presence_api")] [assembly: System.Reflection.AssemblyTitleAttribute("presence_api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache index 5217e98..0ab0402 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache +++ b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache @@ -1 +1 @@ -0f888d6ee77d75b6d7c64349ec419a7095328a0c07d3485f0bd7349fa8f4ae08 +dc964b6452494326efb17b5f11aa54a8134ee046ea9b8f4d5774ee6844209ae9 diff --git a/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache b/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache index c583406..03f9b3f 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache and b/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.dll b/presence_api/obj/Debug/net8.0/presence_api.dll index c66e7f9..19f767e 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.dll and b/presence_api/obj/Debug/net8.0/presence_api.dll differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.pdb b/presence_api/obj/Debug/net8.0/presence_api.pdb index 05c2330..67c876f 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.pdb and b/presence_api/obj/Debug/net8.0/presence_api.pdb differ diff --git a/presence_api/obj/Debug/net8.0/ref/presence_api.dll b/presence_api/obj/Debug/net8.0/ref/presence_api.dll index 8a85278..5ee549e 100644 Binary files a/presence_api/obj/Debug/net8.0/ref/presence_api.dll and b/presence_api/obj/Debug/net8.0/ref/presence_api.dll differ diff --git a/presence_api/obj/Debug/net8.0/refint/presence_api.dll b/presence_api/obj/Debug/net8.0/refint/presence_api.dll index 8a85278..5ee549e 100644 Binary files a/presence_api/obj/Debug/net8.0/refint/presence_api.dll and b/presence_api/obj/Debug/net8.0/refint/presence_api.dll differ diff --git a/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs b/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs index 0db5a28..fb602de 100644 --- a/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs +++ b/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("ui")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+427bb6d1639a554afe63c4c9b999f31f3af7ae76")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c690640f78e1f149f0f4dfceaba8f73ce93541f8")] [assembly: System.Reflection.AssemblyProductAttribute("ui")] [assembly: System.Reflection.AssemblyTitleAttribute("ui")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache b/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache index c92d556..09dd8fb 100644 --- a/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache +++ b/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache @@ -1 +1 @@ -6b2706fd1f27814daa069ff07e06b64f3629ae9da285a319059bb4f65025a36c +527bdd839471066e3aa5070f0846ea8bc1eb12102df96e285b1a6055bb99ff1b diff --git a/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache b/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache index c2c9552..f8195cd 100644 Binary files a/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache and b/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache differ