diff --git a/demo_hard/AddClient.axaml.cs b/demo_hard/AddClient.axaml.cs index 5e67efe..aad6cbd 100644 --- a/demo_hard/AddClient.axaml.cs +++ b/demo_hard/AddClient.axaml.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using Avalonia.Controls; using Avalonia.Interactivity; -using demo_hard.Models; +using demo_hard.Model; namespace demo_hard; diff --git a/demo_hard/FunctionWindow.axaml.cs b/demo_hard/FunctionWindow.axaml.cs index a2e62f2..942f157 100644 --- a/demo_hard/FunctionWindow.axaml.cs +++ b/demo_hard/FunctionWindow.axaml.cs @@ -6,7 +6,7 @@ using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using Avalonia.Media.Imaging; -using demo_hard.Models; +using demo_hard.Model; namespace demo_hard; diff --git a/demo_hard/HistoryWindow.axaml.cs b/demo_hard/HistoryWindow.axaml.cs index cf4fbb2..31bb83c 100644 --- a/demo_hard/HistoryWindow.axaml.cs +++ b/demo_hard/HistoryWindow.axaml.cs @@ -7,7 +7,7 @@ using Avalonia.Controls; using Avalonia.Data.Converters; using Avalonia.Media; using Avalonia.Interactivity; -using demo_hard.Models; +using demo_hard.Model; namespace demo_hard; diff --git a/demo_hard/MainWindow.axaml.cs b/demo_hard/MainWindow.axaml.cs index de05897..002d0e0 100644 --- a/demo_hard/MainWindow.axaml.cs +++ b/demo_hard/MainWindow.axaml.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using Avalonia.Controls; using Avalonia.Interactivity; -using demo_hard.Models; +using demo_hard.Model; using Tmds.DBus.Protocol; namespace demo_hard; diff --git a/demo_hard/Migrations/20250421231548_CreateOrderServiceTable.Designer.cs b/demo_hard/Migrations/20250421231548_CreateOrderServiceTable.Designer.cs index c61f0e2..1a456c3 100644 --- a/demo_hard/Migrations/20250421231548_CreateOrderServiceTable.Designer.cs +++ b/demo_hard/Migrations/20250421231548_CreateOrderServiceTable.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using demo_hard.Models; +using demo_hard.Model; #nullable disable diff --git a/demo_hard/Migrations/User15ContextModelSnapshot.cs b/demo_hard/Migrations/User15ContextModelSnapshot.cs index 5928cef..d96d473 100644 --- a/demo_hard/Migrations/User15ContextModelSnapshot.cs +++ b/demo_hard/Migrations/User15ContextModelSnapshot.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using demo_hard.Models; +using demo_hard.Model; #nullable disable diff --git a/demo_hard/Models/Client.cs b/demo_hard/Model/Client.cs similarity index 94% rename from demo_hard/Models/Client.cs rename to demo_hard/Model/Client.cs index 95a48a1..37a9d59 100644 --- a/demo_hard/Models/Client.cs +++ b/demo_hard/Model/Client.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace demo_hard.Models; +namespace demo_hard.Model; public partial class Client { diff --git a/demo_hard/Models/Employee.cs b/demo_hard/Model/Employee.cs similarity index 93% rename from demo_hard/Models/Employee.cs rename to demo_hard/Model/Employee.cs index b21dac7..2abd0a4 100644 --- a/demo_hard/Models/Employee.cs +++ b/demo_hard/Model/Employee.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace demo_hard.Models; +namespace demo_hard.Model; public partial class Employee { diff --git a/demo_hard/Models/Order.cs b/demo_hard/Model/Order.cs similarity index 74% rename from demo_hard/Models/Order.cs rename to demo_hard/Model/Order.cs index 80190d7..114e308 100644 --- a/demo_hard/Models/Order.cs +++ b/demo_hard/Model/Order.cs @@ -1,19 +1,23 @@ using System; using System.Collections.Generic; -namespace demo_hard.Models; +namespace demo_hard.Model; public partial class Order { public int OrderId { get; set; } + public string? OrderCode { get; set; } + public TimeOnly? Time { get; set; } + public DateOnly? EndDate { get; set; } - public int? RentTime { get; set; } + public DateOnly? StartDate { get; set; } + public int? ClientId { get; set; } + public string? Status { get; set; } - + public virtual ICollection OrderServices { get; set; } = new List(); - public virtual ICollection Services { get; set; } = new List(); -} \ No newline at end of file +} diff --git a/demo_hard/Model/OrderService.cs b/demo_hard/Model/OrderService.cs new file mode 100644 index 0000000..513271a --- /dev/null +++ b/demo_hard/Model/OrderService.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; + +namespace demo_hard.Model; + +public partial class OrderService +{ + public int OrderId { get; set; } + + public int ServiceId { get; set; } + + public int RentTime { get; set; } + + public virtual Order Order { get; set; } = null!; + + public virtual Service Service { get; set; } = null!; +} diff --git a/demo_hard/Models/Role.cs b/demo_hard/Model/Role.cs similarity index 85% rename from demo_hard/Models/Role.cs rename to demo_hard/Model/Role.cs index 2b431ec..7bec9ba 100644 --- a/demo_hard/Models/Role.cs +++ b/demo_hard/Model/Role.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace demo_hard.Models; +namespace demo_hard.Model; public partial class Role { diff --git a/demo_hard/Models/Service.cs b/demo_hard/Model/Service.cs similarity index 67% rename from demo_hard/Models/Service.cs rename to demo_hard/Model/Service.cs index a43e9b4..af985b9 100644 --- a/demo_hard/Models/Service.cs +++ b/demo_hard/Model/Service.cs @@ -1,14 +1,17 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; -namespace demo_hard.Models; +namespace demo_hard.Model; public partial class Service { public string? ServiceName { get; set; } + public int? CostPerHour { get; set; } + public string ServiceCode { get; set; } = null!; + public int ServiceId { get; set; } - + public virtual ICollection OrderServices { get; set; } = new List(); - public virtual ICollection Orders { get; set; } = new List(); -} \ No newline at end of file +} diff --git a/demo_hard/Models/User15Context.cs b/demo_hard/Model/User15Context.cs similarity index 80% rename from demo_hard/Models/User15Context.cs rename to demo_hard/Model/User15Context.cs index 5582c80..142b54b 100644 --- a/demo_hard/Models/User15Context.cs +++ b/demo_hard/Model/User15Context.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Microsoft.EntityFrameworkCore; -namespace demo_hard.Models; +namespace demo_hard.Model; public partial class User15Context : DbContext { @@ -16,26 +16,29 @@ public partial class User15Context : DbContext } public virtual DbSet Clients { get; set; } + public virtual DbSet Employees { get; set; } + public virtual DbSet Orders { get; set; } - public virtual DbSet Roles { get; set; } - public virtual DbSet Services { get; set; } + public virtual DbSet OrderServices { get; set; } + public virtual DbSet Roles { get; set; } + + public virtual DbSet Services { get; set; } + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - if (!optionsBuilder.IsConfigured) - { - optionsBuilder.UseNpgsql("Host=45.67.56.214;Port=5421;USERNAME=user15;DATABASE=user15;Password=3XkvwMOb"); - } - } +#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see https://go.microsoft.com/fwlink/?LinkId=723263. + => optionsBuilder.UseNpgsql("Host=45.67.56.214;Port=5421;USERNAME=user15;DATABASE=user15;Password=3XkvwMOb"); protected override void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.Entity(entity => { entity.HasKey(e => e.ClientId).HasName("client_pk"); + entity.ToTable("client"); + entity.HasIndex(e => e.ClientCode, "client_unique").IsUnique(); entity.Property(e => e.ClientId) @@ -64,6 +67,7 @@ public partial class User15Context : DbContext modelBuilder.Entity(entity => { entity.HasKey(e => e.Id).HasName("employees_pk"); + entity.ToTable("employees"); entity.Property(e => e.Id) @@ -93,6 +97,7 @@ public partial class User15Context : DbContext modelBuilder.Entity(entity => { entity.HasKey(e => e.OrderId).HasName("orders_pk"); + entity.ToTable("orders"); entity.Property(e => e.OrderId) @@ -103,21 +108,36 @@ public partial class User15Context : DbContext entity.Property(e => e.OrderCode) .HasColumnType("character varying") .HasColumnName("order_code"); - entity.Property(e => e.RentTime).HasColumnName("rent_time"); entity.Property(e => e.StartDate).HasColumnName("start_date"); entity.Property(e => e.Status) .HasColumnType("character varying") .HasColumnName("status"); entity.Property(e => e.Time).HasColumnName("time"); + }); - entity.HasMany(o => o.OrderServices) - .WithOne(os => os.Order) - .HasForeignKey(os => os.OrderId); + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.OrderId, e.ServiceId }); + + entity.ToTable("order_services"); + + entity.HasIndex(e => e.ServiceId, "IX_order_services_service_id"); + + entity.Property(e => e.OrderId).HasColumnName("order_id"); + entity.Property(e => e.ServiceId).HasColumnName("service_id"); + entity.Property(e => e.RentTime).HasColumnName("rent_time"); + + entity.HasOne(d => d.Order).WithMany(p => p.OrderServices).HasForeignKey(d => d.OrderId); + + entity.HasOne(d => d.Service).WithMany(p => p.OrderServices).HasForeignKey(d => d.ServiceId); }); modelBuilder.Entity(entity => { - entity.HasNoKey().ToTable("roles"); + entity + .HasNoKey() + .ToTable("roles"); + entity.Property(e => e.RoleId).HasColumnName("role_id"); entity.Property(e => e.RoleName) .HasColumnType("character varying") @@ -127,7 +147,9 @@ public partial class User15Context : DbContext modelBuilder.Entity(entity => { entity.HasKey(e => e.ServiceId).HasName("services_pk"); + entity.ToTable("services"); + entity.HasIndex(e => e.ServiceCode, "services_unique").IsUnique(); entity.Property(e => e.ServiceId) @@ -140,34 +162,10 @@ public partial class User15Context : DbContext entity.Property(e => e.ServiceName) .HasColumnType("character varying") .HasColumnName("service_name"); - - entity.HasMany(s => s.OrderServices) - .WithOne(os => os.Service) - .HasForeignKey(os => os.ServiceId); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(os => new { os.OrderId, os.ServiceId }); - entity.ToTable("order_services"); - - entity.Property(os => os.OrderId).HasColumnName("order_id"); - entity.Property(os => os.ServiceId).HasColumnName("service_id"); - entity.Property(os => os.RentTime).HasColumnName("rent_time"); - - entity.HasOne(os => os.Order) - .WithMany(o => o.OrderServices) - .HasForeignKey(os => os.OrderId) - .HasConstraintName("order_services_order_id_fkey"); - - entity.HasOne(os => os.Service) - .WithMany(s => s.OrderServices) - .HasForeignKey(os => os.ServiceId) - .HasConstraintName("order_services_service_id_fkey"); }); OnModelCreatingPartial(modelBuilder); } partial void OnModelCreatingPartial(ModelBuilder modelBuilder); -} \ No newline at end of file +} diff --git a/demo_hard/Models/OrderService.cs b/demo_hard/Models/OrderService.cs deleted file mode 100644 index 0efac48..0000000 --- a/demo_hard/Models/OrderService.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace demo_hard.Models; - -public class OrderService -{ - public int OrderId { get; set; } - public int ServiceId { get; set; } - public int RentTime { get; set; } - - public virtual Order Order { get; set; } - - public virtual Service Service { get; set; } -} \ No newline at end of file diff --git a/demo_hard/Order.axaml.cs b/demo_hard/Order.axaml.cs index c9a55e2..2836661 100644 --- a/demo_hard/Order.axaml.cs +++ b/demo_hard/Order.axaml.cs @@ -1,6 +1,7 @@ +using System.Collections.Generic; using Avalonia.Controls; using Avalonia.Interactivity; -using demo_hard.Models; +using demo_hard.Model; using System.Linq; using Microsoft.EntityFrameworkCore; @@ -8,10 +9,10 @@ namespace demo_hard; public partial class Order : Window { - private readonly Models.Order _order; + private readonly Model.Order _order; private readonly User15Context _db = new(); - public Order(Models.Order order) + public Order(Model.Order order) { InitializeComponent(); _order = order; @@ -21,42 +22,32 @@ public partial class Order : Window private void LoadOrderData() { var client = _db.Clients.FirstOrDefault(c => c.ClientId == _order.ClientId); + var orderServices = _db.OrderServices + .Include(os => os.Service) + .Where(os => os.OrderId == _order.OrderId) + .ToList(); OrderNumber.Text = _order.OrderId.ToString(); ClientName.Text = client?.Fio ?? "Не указан"; OrderDate.Text = $"{_order.StartDate} {_order.Time}"; - // Парсим информацию об услугах из OrderCode - var servicesInfo = ParseServicesInfo(_order); + var servicesInfo = CalculateServicesInfo(orderServices); TotalCost.Text = servicesInfo.totalCost.ToString("C"); StatusText.Text = _order.Status ?? "Новая"; } - private (decimal totalCost, string servicesText) ParseServicesInfo(Models.Order order) + private (decimal totalCost, string servicesText) CalculateServicesInfo(List orderServices) { decimal total = 0; string info = ""; - if (!string.IsNullOrEmpty(order.OrderCode)) + foreach (var os in orderServices) { - var parts = order.OrderCode.Split(';'); - foreach (var part in parts) + if (os.Service != null) { - if (string.IsNullOrEmpty(part)) continue; - - var serviceParts = part.Split(':'); - if (serviceParts.Length == 2 && - int.TryParse(serviceParts[0], out var serviceId) && - int.TryParse(serviceParts[1], out var rentTime)) - { - var service = _db.Services.Find(serviceId); - if (service != null) - { - var cost = (service.CostPerHour ?? 0) * rentTime; - total += cost; - info += $"{service.ServiceName} - {rentTime} ч ({cost:C})\n"; - } - } + decimal cost = (os.Service.CostPerHour ?? 0) * (os.RentTime / 60m); + total += cost; + info += $"{os.Service.ServiceName} - {os.RentTime} мин ({cost:C})\n"; } } @@ -65,7 +56,11 @@ public partial class Order : Window private void PrintBarcode_Click(object sender, RoutedEventArgs e) { - new BarcodeWindow(_order.OrderId, _order.RentTime ?? 1).Show(); + int rentTime = _db.OrderServices + .Where(os => os.OrderId == _order.OrderId) + .Max(os => os.RentTime); + + new BarcodeWindow(_order.OrderId, rentTime).Show(); Close(); } diff --git a/demo_hard/SallerWindow.axaml.cs b/demo_hard/SallerWindow.axaml.cs index 3e2a07a..bc0101d 100644 --- a/demo_hard/SallerWindow.axaml.cs +++ b/demo_hard/SallerWindow.axaml.cs @@ -3,7 +3,7 @@ using System.Collections.ObjectModel; using System.Linq; using Avalonia.Controls; using Avalonia.Interactivity; -using demo_hard.Models; +using demo_hard.Model; using Microsoft.EntityFrameworkCore; using System.Threading.Tasks; using System.IO; @@ -178,13 +178,12 @@ public partial class SallerWindow : Window, INotifyPropertyChanged, IReactiveObj try { string orderNumber = $"{new Random().Next(10000000, 99999999)}/{DateTime.Now:dd.MM.yyyy}"; - Models.Order newOrder = new Models.Order() + Model.Order newOrder = new Model.Order() { ClientId = SelectedClient.ClientId, Time = TimeOnly.FromDateTime(DateTime.Now), StartDate = DateOnly.FromDateTime(DateTime.Now), Status = "Новая", - RentTime = SelectedServices.Max(service => service.RentTime), OrderCode = orderNumber }; @@ -203,7 +202,11 @@ public partial class SallerWindow : Window, INotifyPropertyChanged, IReactiveObj await _databaseContext.SaveChangesAsync(); GenerateOrderPdfDocument(newOrder); - new BarcodeWindow(newOrder.OrderId, newOrder.RentTime ?? 30).Show(); + + // Получаем максимальное время аренды из выбранных услуг + int maxRentTime = SelectedServices.Max(s => s.RentTime); + new BarcodeWindow(newOrder.OrderId, maxRentTime).Show(); + Close(); } catch (Exception exception) @@ -212,7 +215,7 @@ public partial class SallerWindow : Window, INotifyPropertyChanged, IReactiveObj } } - private void GenerateOrderPdfDocument(Models.Order order) + private void GenerateOrderPdfDocument(Model.Order order) { string documentsDirectoryPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); string pdfFilePath = Path.Combine(documentsDirectoryPath, $"Заказ_{order.OrderCode.Replace("/", "_")}.pdf"); diff --git a/demo_hard/bin/Debug/net9.0/demo_hard.dll b/demo_hard/bin/Debug/net9.0/demo_hard.dll index 8e15a5b..a352a0c 100644 Binary files a/demo_hard/bin/Debug/net9.0/demo_hard.dll and b/demo_hard/bin/Debug/net9.0/demo_hard.dll differ diff --git a/demo_hard/bin/Debug/net9.0/demo_hard.exe b/demo_hard/bin/Debug/net9.0/demo_hard.exe index d14ffb5..821fe87 100644 Binary files a/demo_hard/bin/Debug/net9.0/demo_hard.exe and b/demo_hard/bin/Debug/net9.0/demo_hard.exe differ diff --git a/demo_hard/bin/Debug/net9.0/demo_hard.pdb b/demo_hard/bin/Debug/net9.0/demo_hard.pdb index a367cd4..d5a0a90 100644 Binary files a/demo_hard/bin/Debug/net9.0/demo_hard.pdb and b/demo_hard/bin/Debug/net9.0/demo_hard.pdb differ diff --git a/demo_hard/obj/Debug/net9.0/Avalonia/demo_hard.dll b/demo_hard/obj/Debug/net9.0/Avalonia/demo_hard.dll index 8e15a5b..a352a0c 100644 Binary files a/demo_hard/obj/Debug/net9.0/Avalonia/demo_hard.dll and b/demo_hard/obj/Debug/net9.0/Avalonia/demo_hard.dll differ diff --git a/demo_hard/obj/Debug/net9.0/Avalonia/demo_hard.pdb b/demo_hard/obj/Debug/net9.0/Avalonia/demo_hard.pdb index a367cd4..d5a0a90 100644 Binary files a/demo_hard/obj/Debug/net9.0/Avalonia/demo_hard.pdb and b/demo_hard/obj/Debug/net9.0/Avalonia/demo_hard.pdb differ diff --git a/demo_hard/obj/Debug/net9.0/apphost.exe b/demo_hard/obj/Debug/net9.0/apphost.exe index d14ffb5..821fe87 100644 Binary files a/demo_hard/obj/Debug/net9.0/apphost.exe and b/demo_hard/obj/Debug/net9.0/apphost.exe differ diff --git a/demo_hard/obj/Debug/net9.0/demo_hard.AssemblyInfo.cs b/demo_hard/obj/Debug/net9.0/demo_hard.AssemblyInfo.cs index 4640289..80307ff 100644 --- a/demo_hard/obj/Debug/net9.0/demo_hard.AssemblyInfo.cs +++ b/demo_hard/obj/Debug/net9.0/demo_hard.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("demo_hard")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+156a9ed6bb53a76169eafb82e995c01d89a56817")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+69fe9ea9bc91472e247d6c5d565068a4efb0a683")] [assembly: System.Reflection.AssemblyProductAttribute("demo_hard")] [assembly: System.Reflection.AssemblyTitleAttribute("demo_hard")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/demo_hard/obj/Debug/net9.0/demo_hard.AssemblyInfoInputs.cache b/demo_hard/obj/Debug/net9.0/demo_hard.AssemblyInfoInputs.cache index 55df951..0ceefdd 100644 --- a/demo_hard/obj/Debug/net9.0/demo_hard.AssemblyInfoInputs.cache +++ b/demo_hard/obj/Debug/net9.0/demo_hard.AssemblyInfoInputs.cache @@ -1 +1 @@ -812ad4f6e1371c563aeffa5b4bf990438482d87b5551f2810d09b0e13e09da16 +b558e1c40e2637b7a5437875d3c594c1eda934e9d40f49c41e49dbf89f9df5f0 diff --git a/demo_hard/obj/Debug/net9.0/demo_hard.csproj.CoreCompileInputs.cache b/demo_hard/obj/Debug/net9.0/demo_hard.csproj.CoreCompileInputs.cache index d46144e..8db5671 100644 --- a/demo_hard/obj/Debug/net9.0/demo_hard.csproj.CoreCompileInputs.cache +++ b/demo_hard/obj/Debug/net9.0/demo_hard.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0bbac13ec88c23487d9db86ba7974427e4532f7c392dba1fdea7e096e6b18f90 +8a3ffaadb0909b81ef510f10eee5bfc4b36ff8994bac3e39e3d64c1f02f66b23 diff --git a/demo_hard/obj/Debug/net9.0/demo_hard.dll b/demo_hard/obj/Debug/net9.0/demo_hard.dll index 47550f9..68cdeca 100644 Binary files a/demo_hard/obj/Debug/net9.0/demo_hard.dll and b/demo_hard/obj/Debug/net9.0/demo_hard.dll differ diff --git a/demo_hard/obj/Debug/net9.0/demo_hard.pdb b/demo_hard/obj/Debug/net9.0/demo_hard.pdb index cdfff64..c2d304f 100644 Binary files a/demo_hard/obj/Debug/net9.0/demo_hard.pdb and b/demo_hard/obj/Debug/net9.0/demo_hard.pdb differ diff --git a/demo_hard/obj/Debug/net9.0/ref/demo_hard.dll b/demo_hard/obj/Debug/net9.0/ref/demo_hard.dll index 7f58a73..ab15331 100644 Binary files a/demo_hard/obj/Debug/net9.0/ref/demo_hard.dll and b/demo_hard/obj/Debug/net9.0/ref/demo_hard.dll differ diff --git a/demo_hard/obj/Debug/net9.0/refint/Avalonia/demo_hard.dll b/demo_hard/obj/Debug/net9.0/refint/Avalonia/demo_hard.dll index 7f58a73..ab15331 100644 Binary files a/demo_hard/obj/Debug/net9.0/refint/Avalonia/demo_hard.dll and b/demo_hard/obj/Debug/net9.0/refint/Avalonia/demo_hard.dll differ diff --git a/demo_hard/obj/Debug/net9.0/refint/demo_hard.dll b/demo_hard/obj/Debug/net9.0/refint/demo_hard.dll index a986928..92f01af 100644 Binary files a/demo_hard/obj/Debug/net9.0/refint/demo_hard.dll and b/demo_hard/obj/Debug/net9.0/refint/demo_hard.dll differ diff --git a/demo_hard/obj/rider.project.model.nuget.info b/demo_hard/obj/rider.project.model.nuget.info index 9178972..f6f84da 100644 --- a/demo_hard/obj/rider.project.model.nuget.info +++ b/demo_hard/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17452753038636502 \ No newline at end of file +17453098515261366 \ No newline at end of file diff --git a/demo_hard/obj/rider.project.restore.info b/demo_hard/obj/rider.project.restore.info index d32e49a..6a23581 100644 --- a/demo_hard/obj/rider.project.restore.info +++ b/demo_hard/obj/rider.project.restore.info @@ -1 +1 @@ -17452753050856052 \ No newline at end of file +17453098574157962 \ No newline at end of file