diff --git a/Clients/TgDownloaderBlazor/.config/dotnet-tools.json b/Clients/TgDownloaderBlazor/.config/dotnet-tools.json new file mode 100644 index 00000000..9d58272e --- /dev/null +++ b/Clients/TgDownloaderBlazor/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "8.0.2", + "commands": [ + "dotnet-ef" + ] + } + } +} \ No newline at end of file diff --git a/Clients/TgDownloaderBlazor/Components/Pages/HomeComponent.razor.cs b/Clients/TgDownloaderBlazor/Components/Pages/HomeComponent.razor.cs deleted file mode 100644 index da193c57..00000000 --- a/Clients/TgDownloaderBlazor/Components/Pages/HomeComponent.razor.cs +++ /dev/null @@ -1,24 +0,0 @@ -// This is an independent project of an individual developer. Dear PVS-Studio, please check it. -// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com - -namespace TgDownloaderBlazor.Components.Pages; - -public sealed partial class HomeComponent : TgPageComponent -{ - #region Public and private fields, properties, constructor - - public static string AppVersionTitle { get; set; } = string.Empty; - public static string AppVersionShort { get; set; } = string.Empty; - public static string AppVersionFull { get; set; } = string.Empty; - - public HomeComponent() - { - AppVersionTitle = $"{TgLocale.AppTitleBlazor} " + - $"v{TgCommonUtils.GetTrimVersion(Assembly.GetExecutingAssembly().GetName().Version)}"; - AppVersionShort = $"v{TgCommonUtils.GetTrimVersion(Assembly.GetExecutingAssembly().GetName().Version)}"; - AppVersionFull = $"{TgLocale.AppVersion}: {AppVersionShort}"; - - } - - #endregion -} \ No newline at end of file diff --git a/Clients/TgDownloaderBlazor/Components/Routes.razor b/Clients/TgDownloaderBlazor/Components/Routes.razor deleted file mode 100644 index f756e19d..00000000 --- a/Clients/TgDownloaderBlazor/Components/Routes.razor +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Clients/TgDownloaderBlazor/Components/AppComponent.razor b/Clients/TgDownloaderBlazor/Features/AppComponent.razor similarity index 82% rename from Clients/TgDownloaderBlazor/Components/AppComponent.razor rename to Clients/TgDownloaderBlazor/Features/AppComponent.razor index 70dd0a6c..265906f0 100644 --- a/Clients/TgDownloaderBlazor/Components/AppComponent.razor +++ b/Clients/TgDownloaderBlazor/Features/AppComponent.razor @@ -8,6 +8,7 @@ + diff --git a/Clients/TgDownloaderBlazor/Components/Pages/HomeComponent.razor b/Clients/TgDownloaderBlazor/Features/Home/HomeComponent.razor similarity index 100% rename from Clients/TgDownloaderBlazor/Components/Pages/HomeComponent.razor rename to Clients/TgDownloaderBlazor/Features/Home/HomeComponent.razor diff --git a/Clients/TgDownloaderBlazor/Features/Home/HomeComponent.razor.cs b/Clients/TgDownloaderBlazor/Features/Home/HomeComponent.razor.cs new file mode 100644 index 00000000..0a6e7981 --- /dev/null +++ b/Clients/TgDownloaderBlazor/Features/Home/HomeComponent.razor.cs @@ -0,0 +1,24 @@ +// This is an independent project of an individual developer. Dear PVS-Studio, please check it. +// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com + +namespace TgDownloaderBlazor.Features.Home; + +public sealed partial class HomeComponent : TgPageComponent +{ + #region Public and private fields, properties, constructor + + public static string AppVersionTitle { get; set; } = string.Empty; + public static string AppVersionShort { get; set; } = string.Empty; + public static string AppVersionFull { get; set; } = string.Empty; + + public HomeComponent() + { + AppVersionTitle = $"{TgLocale.AppTitleBlazor} " + + $"v{TgCommonUtils.GetTrimVersion(Assembly.GetExecutingAssembly().GetName().Version)}"; + AppVersionShort = $"v{TgCommonUtils.GetTrimVersion(Assembly.GetExecutingAssembly().GetName().Version)}"; + AppVersionFull = $"{TgLocale.AppVersion}: {AppVersionShort}"; + + } + + #endregion +} \ No newline at end of file diff --git a/Clients/TgDownloaderBlazor/Features/Layout/Header.razor b/Clients/TgDownloaderBlazor/Features/Layout/Header.razor new file mode 100644 index 00000000..b0deb2f4 --- /dev/null +++ b/Clients/TgDownloaderBlazor/Features/Layout/Header.razor @@ -0,0 +1,8 @@ +@page "/Header" +@inherits TgPageComponent + + \ No newline at end of file diff --git a/Clients/TgDownloaderBlazor/Features/Layout/Header.razor.cs b/Clients/TgDownloaderBlazor/Features/Layout/Header.razor.cs new file mode 100644 index 00000000..44b1a974 --- /dev/null +++ b/Clients/TgDownloaderBlazor/Features/Layout/Header.razor.cs @@ -0,0 +1,6 @@ +namespace TgDownloaderBlazor.Features.Layout; + +public sealed partial class Header : TgPageComponent +{ + +} diff --git a/Clients/TgDownloaderBlazor/Components/Layout/MainLayout.razor b/Clients/TgDownloaderBlazor/Features/Layout/MainLayout.razor similarity index 92% rename from Clients/TgDownloaderBlazor/Components/Layout/MainLayout.razor rename to Clients/TgDownloaderBlazor/Features/Layout/MainLayout.razor index 882fab11..202c86df 100644 --- a/Clients/TgDownloaderBlazor/Components/Layout/MainLayout.razor +++ b/Clients/TgDownloaderBlazor/Features/Layout/MainLayout.razor @@ -5,6 +5,7 @@ + @*
*@
@LocaleHelper.FieldTgDownloader diff --git a/Clients/TgDownloaderBlazor/Components/Layout/MainLayout.razor.cs b/Clients/TgDownloaderBlazor/Features/Layout/MainLayout.razor.cs similarity index 58% rename from Clients/TgDownloaderBlazor/Components/Layout/MainLayout.razor.cs rename to Clients/TgDownloaderBlazor/Features/Layout/MainLayout.razor.cs index 60431b60..bacb58c0 100644 --- a/Clients/TgDownloaderBlazor/Components/Layout/MainLayout.razor.cs +++ b/Clients/TgDownloaderBlazor/Features/Layout/MainLayout.razor.cs @@ -1,6 +1,6 @@ -namespace TgDownloaderBlazor.Components.Layout; +namespace TgDownloaderBlazor.Features.Layout; -public sealed partial class MainLayout +public sealed partial class MainLayout : LayoutComponentBase { #region Public and private fields, properties, constructor diff --git a/Clients/TgDownloaderBlazor/Components/Layout/MainLayout.razor.css b/Clients/TgDownloaderBlazor/Features/Layout/MainLayout.razor.css similarity index 100% rename from Clients/TgDownloaderBlazor/Components/Layout/MainLayout.razor.css rename to Clients/TgDownloaderBlazor/Features/Layout/MainLayout.razor.css diff --git a/Clients/TgDownloaderBlazor/Components/Layout/NavMenu.razor b/Clients/TgDownloaderBlazor/Features/Layout/NavMenu.razor similarity index 82% rename from Clients/TgDownloaderBlazor/Components/Layout/NavMenu.razor rename to Clients/TgDownloaderBlazor/Features/Layout/NavMenu.razor index 58714df4..ea3381aa 100644 --- a/Clients/TgDownloaderBlazor/Components/Layout/NavMenu.razor +++ b/Clients/TgDownloaderBlazor/Features/Layout/NavMenu.razor @@ -20,6 +20,11 @@ @TgLocale.MenuMainApps
+
+ + @TgLocale.MenuMainFilters + +
@TgLocale.MenuMainProxies diff --git a/Clients/TgDownloaderBlazor/Components/Layout/NavMenu.razor.cs b/Clients/TgDownloaderBlazor/Features/Layout/NavMenu.razor.cs similarity index 55% rename from Clients/TgDownloaderBlazor/Components/Layout/NavMenu.razor.cs rename to Clients/TgDownloaderBlazor/Features/Layout/NavMenu.razor.cs index 17223db4..8559ed9d 100644 --- a/Clients/TgDownloaderBlazor/Components/Layout/NavMenu.razor.cs +++ b/Clients/TgDownloaderBlazor/Features/Layout/NavMenu.razor.cs @@ -1,4 +1,4 @@ -namespace TgDownloaderBlazor.Components.Layout; +namespace TgDownloaderBlazor.Features.Layout; public sealed partial class NavMenu : TgPageComponent { diff --git a/Clients/TgDownloaderBlazor/Components/Layout/NavMenu.razor.css b/Clients/TgDownloaderBlazor/Features/Layout/NavMenu.razor.css similarity index 100% rename from Clients/TgDownloaderBlazor/Components/Layout/NavMenu.razor.css rename to Clients/TgDownloaderBlazor/Features/Layout/NavMenu.razor.css diff --git a/Clients/TgDownloaderBlazor/Components/Pages/AppComponent.razor b/Clients/TgDownloaderBlazor/Features/Pages/AppComponent.razor similarity index 69% rename from Clients/TgDownloaderBlazor/Components/Pages/AppComponent.razor rename to Clients/TgDownloaderBlazor/Features/Pages/AppComponent.razor index de8215d5..1f40aa99 100644 --- a/Clients/TgDownloaderBlazor/Components/Pages/AppComponent.razor +++ b/Clients/TgDownloaderBlazor/Features/Pages/AppComponent.razor @@ -2,11 +2,11 @@ @inject IDbContextFactory DbFactory @inherits TgPageComponent -Apps +@TgLocale.MenuMainApps -

Apps

+

@TgLocale.MenuMainApps

-@if (!Apps.Any()) +@if (!Items.Any()) {

Loading...

} @@ -22,12 +22,12 @@ else - @foreach (var app in Apps) + @foreach (var item in Items) { - @app.ApiHash - @app.ApiId - @app.PhoneNumber + @item.ApiHash + @item.ApiId + @item.PhoneNumber @* @app.Proxy.ToDebugString() *@ } diff --git a/Clients/TgDownloaderBlazor/Components/Pages/AppComponent.razor.cs b/Clients/TgDownloaderBlazor/Features/Pages/AppComponent.razor.cs similarity index 77% rename from Clients/TgDownloaderBlazor/Components/Pages/AppComponent.razor.cs rename to Clients/TgDownloaderBlazor/Features/Pages/AppComponent.razor.cs index ff9fd210..1a0eec7e 100644 --- a/Clients/TgDownloaderBlazor/Components/Pages/AppComponent.razor.cs +++ b/Clients/TgDownloaderBlazor/Features/Pages/AppComponent.razor.cs @@ -1,13 +1,13 @@ // This is an independent project of an individual developer. Dear PVS-Studio, please check it. // PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com -namespace TgDownloaderBlazor.Components.Pages; +namespace TgDownloaderBlazor.Features.Pages; public sealed partial class AppComponent : TgPageComponent { #region Public and private fields, properties, constructor - private IList Apps { get; set; } = new List(); + private IList Items { get; set; } = new List(); #endregion @@ -21,7 +21,7 @@ protected override async Task OnInitializedAsync() #if DEBUG Debug.WriteLine($"Apps page | {dbContext}"); #endif - Apps = dbContext.AppsRepo.GetEnumerable(0).ToList(); + Items = dbContext.AppsRepo.GetEnumerable(0).ToList(); } #endregion diff --git a/Clients/TgDownloaderBlazor/Components/Pages/ErrorComponent.razor b/Clients/TgDownloaderBlazor/Features/Pages/ErrorComponent.razor similarity index 100% rename from Clients/TgDownloaderBlazor/Components/Pages/ErrorComponent.razor rename to Clients/TgDownloaderBlazor/Features/Pages/ErrorComponent.razor diff --git a/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor b/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor new file mode 100644 index 00000000..047f5012 --- /dev/null +++ b/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor @@ -0,0 +1,40 @@ +@page "/filters" +@inject IDbContextFactory DbFactory +@inherits TgPageComponent + +@TgLocale.MenuMainFilters + +

@TgLocale.MenuMainFilters

+ +@if (!Items.Any()) +{ +

Loading...

+} +else +{ + + + + + + + + + + + + + @foreach (var item in Items) + { + + + + + + + + + } + +
@TgLocale.FieldIsEnabled@TgLocale.FieldFilterType@TgLocale.FieldName@TgLocale.FieldMask@TgLocale.FieldSize@TgLocale.FieldSizeType
@item.IsEnabled@item.FilterType@item.Name@item.Mask@item.Size@item.SizeType
+} diff --git a/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor.cs b/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor.cs new file mode 100644 index 00000000..8d3b781b --- /dev/null +++ b/Clients/TgDownloaderBlazor/Features/Pages/FilterComponent.razor.cs @@ -0,0 +1,25 @@ +// This is an independent project of an individual developer. Dear PVS-Studio, please check it. +// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com + +namespace TgDownloaderBlazor.Features.Pages; + +public partial class FilterComponent : TgPageComponent +{ + #region Public and private fields, properties, constructor + + private IList Items { get; set; } = new List(); + + #endregion + + #region Public and private methods + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + + await using var dbContext = await DbFactory.CreateDbContextAsync(); + Items = dbContext.FilterRepo.GetEnumerable(0).ToList(); + } + + #endregion +} \ No newline at end of file diff --git a/Clients/TgDownloaderBlazor/Components/Pages/ProxyComponent.razor b/Clients/TgDownloaderBlazor/Features/Pages/ProxyComponent.razor similarity index 61% rename from Clients/TgDownloaderBlazor/Components/Pages/ProxyComponent.razor rename to Clients/TgDownloaderBlazor/Features/Pages/ProxyComponent.razor index 27237273..1922bb7d 100644 --- a/Clients/TgDownloaderBlazor/Components/Pages/ProxyComponent.razor +++ b/Clients/TgDownloaderBlazor/Features/Pages/ProxyComponent.razor @@ -2,11 +2,11 @@ @inject IDbContextFactory DbFactory @inherits TgPageComponent -Apps +@TgLocale.MenuMainProxies -

Apps

+

@TgLocale.MenuMainProxies

-@if (!Proxies.Any()) +@if (!Items.Any()) {

Loading...

} @@ -24,15 +24,15 @@ else - @foreach (var app in Proxies) + @foreach (var item in Items) { - @app.Type - @app.HostName - @app.Port - @app.UserName - @app.Password - @app.Secret + @item.Type + @item.HostName + @item.Port + @item.UserName + @item.Password + @item.Secret } diff --git a/Clients/TgDownloaderBlazor/Components/Pages/ProxyComponent.razor.cs b/Clients/TgDownloaderBlazor/Features/Pages/ProxyComponent.razor.cs similarity index 73% rename from Clients/TgDownloaderBlazor/Components/Pages/ProxyComponent.razor.cs rename to Clients/TgDownloaderBlazor/Features/Pages/ProxyComponent.razor.cs index 2c2dea19..83a898c7 100644 --- a/Clients/TgDownloaderBlazor/Components/Pages/ProxyComponent.razor.cs +++ b/Clients/TgDownloaderBlazor/Features/Pages/ProxyComponent.razor.cs @@ -1,13 +1,13 @@ // This is an independent project of an individual developer. Dear PVS-Studio, please check it. // PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com -namespace TgDownloaderBlazor.Components.Pages; +namespace TgDownloaderBlazor.Features.Pages; public partial class ProxyComponent : TgPageComponent { #region Public and private fields, properties, constructor - private IList Proxies { get; set; } = new List(); + private IList Items { get; set; } = new List(); #endregion @@ -18,7 +18,7 @@ protected override async Task OnInitializedAsync() await base.OnInitializedAsync(); await using var dbContext = await DbFactory.CreateDbContextAsync(); - Proxies = dbContext.ProxyRepo.GetEnumerable(0).ToList(); + Items = dbContext.ProxyRepo.GetEnumerable(0).ToList(); } #endregion diff --git a/Clients/TgDownloaderBlazor/Components/Pages/WeatherComponent.razor b/Clients/TgDownloaderBlazor/Features/Pages/WeatherComponent.razor similarity index 100% rename from Clients/TgDownloaderBlazor/Components/Pages/WeatherComponent.razor rename to Clients/TgDownloaderBlazor/Features/Pages/WeatherComponent.razor diff --git a/Clients/TgDownloaderBlazor/Features/Routes.razor b/Clients/TgDownloaderBlazor/Features/Routes.razor new file mode 100644 index 00000000..5dfdd455 --- /dev/null +++ b/Clients/TgDownloaderBlazor/Features/Routes.razor @@ -0,0 +1,13 @@ +@using TgDownloaderBlazor.Features.Layout + + + + + + + Not found + +

Sorry, there's nothing at this address.'

+ + + diff --git a/Clients/TgDownloaderBlazor/Components/_Imports.razor b/Clients/TgDownloaderBlazor/Features/_Imports.razor similarity index 90% rename from Clients/TgDownloaderBlazor/Components/_Imports.razor rename to Clients/TgDownloaderBlazor/Features/_Imports.razor index a0107062..7a49d3b6 100644 --- a/Clients/TgDownloaderBlazor/Components/_Imports.razor +++ b/Clients/TgDownloaderBlazor/Features/_Imports.razor @@ -7,4 +7,4 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop @using TgDownloaderBlazor -@using TgDownloaderBlazor.Components +@using TgDownloaderBlazor.Features diff --git a/Clients/TgDownloaderBlazor/GlobalUsings.cs b/Clients/TgDownloaderBlazor/GlobalUsings.cs index 2cb8ccf8..f4a08c73 100644 --- a/Clients/TgDownloaderBlazor/GlobalUsings.cs +++ b/Clients/TgDownloaderBlazor/GlobalUsings.cs @@ -2,17 +2,16 @@ // PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com // Global using directives -global using System.Diagnostics; -global using System.Reflection; global using Microsoft.AspNetCore.Components; -global using Microsoft.AspNetCore.Components.Web; global using Microsoft.EntityFrameworkCore; -global using TgDownloaderBlazor; +global using System.Diagnostics; +global using System.Reflection; global using TgDownloaderBlazor.Common; -global using TgDownloaderBlazor.Components; +global using TgDownloaderBlazor.Features; global using TgEfCore; global using TgEfCore.Domain.Apps; +global using TgEfCore.Domain.Filters; global using TgEfCore.Domain.Proxies; global using TgLocalization.Helpers; global using TgStorage.Helpers; -global using TgStorage.Utils; \ No newline at end of file +global using TgStorage.Utils; diff --git a/Clients/TgDownloaderBlazor/TgDownloaderBlazor.csproj b/Clients/TgDownloaderBlazor/TgDownloaderBlazor.csproj index fb3b73ac..acd22b4b 100644 --- a/Clients/TgDownloaderBlazor/TgDownloaderBlazor.csproj +++ b/Clients/TgDownloaderBlazor/TgDownloaderBlazor.csproj @@ -13,7 +13,7 @@ net8.0 enable enable - 0.4.10.0 + 0.4.30.0 diff --git a/Clients/TgDownloaderConsole/TgDownloaderConsole.csproj b/Clients/TgDownloaderConsole/TgDownloaderConsole.csproj index 4340f533..b016680d 100644 --- a/Clients/TgDownloaderConsole/TgDownloaderConsole.csproj +++ b/Clients/TgDownloaderConsole/TgDownloaderConsole.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.4.10.0 + 0.4.30.0 LICENSE.md AnyCPU;x64;x86 applicationIcon.ico diff --git a/Clients/TgDownloaderWinDesktop/TgDownloaderWinDesktop.csproj b/Clients/TgDownloaderWinDesktop/TgDownloaderWinDesktop.csproj index 5cb0b6ce..9527b7d4 100644 --- a/Clients/TgDownloaderWinDesktop/TgDownloaderWinDesktop.csproj +++ b/Clients/TgDownloaderWinDesktop/TgDownloaderWinDesktop.csproj @@ -7,7 +7,7 @@ app.manifest applicationIcon.ico AnyCPU;x64;x86 - 0.4.10.0 + 0.4.30.0 diff --git a/Core/TgDownloader/TgDownloader.csproj b/Core/TgDownloader/TgDownloader.csproj index 3d6365b4..3d0c5a4a 100644 --- a/Core/TgDownloader/TgDownloader.csproj +++ b/Core/TgDownloader/TgDownloader.csproj @@ -3,7 +3,7 @@ net8.0 enable enable - 0.4.10.0 + 0.4.30.0 AnyCPU;x64;x86 diff --git a/Core/TgEfCore/Domain/Apps/TgEfAppEntity.cs b/Core/TgEfCore/Domain/Apps/TgEfAppEntity.cs index b92a5670..47d799e8 100644 --- a/Core/TgEfCore/Domain/Apps/TgEfAppEntity.cs +++ b/Core/TgEfCore/Domain/Apps/TgEfAppEntity.cs @@ -12,22 +12,26 @@ public sealed class TgEfAppEntity : TgEfEntityBase [DefaultValue("00000000-0000-0000-0000-000000000000")] [ConcurrencyCheck] [Column(TgSqlConstants.ColumnApiHash)] + [SQLite.Indexed] public Guid ApiHash { get; set; } [DefaultValue(0)] [ConcurrencyCheck] [Column(TgSqlConstants.ColumnApiId)] + [SQLite.Indexed] public int ApiId { get; set; } [DefaultValue("")] [ConcurrencyCheck] [MaxLength(16)] [Column(TgSqlConstants.ColumnPhoneNumber)] + [SQLite.Indexed] public string PhoneNumber { get; set; } [DefaultValue("00000000-0000-0000-0000-000000000000")] [ConcurrencyCheck] [Column(TgSqlConstants.ColumnProxyUid)] + [SQLite.Indexed] public Guid ProxyUid { get; set; } public TgEfProxyEntity Proxy { get; set; } diff --git a/Core/TgEfCore/Domain/Apps/TgEfAppRepository.cs b/Core/TgEfCore/Domain/Apps/TgEfAppRepository.cs index 66aab554..aef139d3 100644 --- a/Core/TgEfCore/Domain/Apps/TgEfAppRepository.cs +++ b/Core/TgEfCore/Domain/Apps/TgEfAppRepository.cs @@ -5,14 +5,30 @@ namespace TgEfCore.Domain.Apps; [Table(TgSqlConstants.TableApps)] public sealed class TgEfAppRepository(TgEfContext context) : TgEfRepositoryBase(context), - ITgSqlCreateRepository, ITgEfRepository + ITgEfRepository { #region Public and private methods - public TgEfAppEntity CreateNew(bool isCreateSession) + public TgEfAppEntity CreateNew() { - throw new NotImplementedException(); + using IDbContextTransaction transaction = Context.Database.BeginTransaction(); + try + { + TgEfAppEntity app = new() + { + PhoneNumber = "+00000000000" + }; + Context.Add(app); + Context.SaveChanges(); + transaction.Commit(); + return app; + } + catch (Exception) + { + transaction.Rollback(); + throw; + } } public Task DeleteAsync(TgEfAppEntity item) diff --git a/Core/TgEfCore/Domain/Filters/TgEfFilterEntity.cs b/Core/TgEfCore/Domain/Filters/TgEfFilterEntity.cs new file mode 100644 index 00000000..586069f1 --- /dev/null +++ b/Core/TgEfCore/Domain/Filters/TgEfFilterEntity.cs @@ -0,0 +1,83 @@ +// This is an independent project of an individual developer. Dear PVS-Studio, please check it. +// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com + +namespace TgEfCore.Domain.Filters; + +[DebuggerDisplay("{ToDebugString()}")] +[Table(TgSqlConstants.TableFilters)] +public sealed class TgEfFilterEntity : TgEfEntityBase +{ + #region Public and private fields, properties, constructor + + [DefaultValue(false)] + [ConcurrencyCheck] + [Column(TgSqlConstants.ColumnIsEnabled)] + [SQLite.Indexed] + public bool IsEnabled { get; set; } + + [DefaultValue(TgEnumFilterType.None)] + [ConcurrencyCheck] + [Column(TgSqlConstants.ColumnFilterType)] + [SQLite.Indexed] + public TgEnumFilterType FilterType { get; set; } + + [DefaultValue("Any")] + [ConcurrencyCheck] + [MaxLength(128)] + [Column(TgSqlConstants.ColumnName)] + [SQLite.Indexed] + public string Name { get; set; } + + [DefaultValue("*")] + [ConcurrencyCheck] + [MaxLength(128)] + [Column(TgSqlConstants.ColumnMask)] + [SQLite.Indexed] + public string Mask { get; set; } + + [DefaultValue(0)] + [ConcurrencyCheck] + [Column(TgSqlConstants.ColumnSize)] + [SQLite.Indexed] + public long Size { get; set; } + + [DefaultValue(TgEnumFileSizeType.Bytes)] + [ConcurrencyCheck] + [Column(TgSqlConstants.ColumnSizeType)] + [SQLite.Indexed] + public TgEnumFileSizeType SizeType { get; set; } + + public TgEfFilterEntity() : base() + { + IsEnabled = this.GetPropertyDefaultValueAsGeneric(nameof(IsEnabled)); + FilterType = this.GetPropertyDefaultValueAsGeneric(nameof(FilterType)); + Name = this.GetPropertyDefaultValue(nameof(Name)); + Mask = this.GetPropertyDefaultValue(nameof(Mask)); + Size = this.GetPropertyDefaultValueAsGeneric(nameof(Size)); + SizeType = this.GetPropertyDefaultValueAsGeneric(nameof(SizeType)); + } + + #endregion + + #region Public and private methods + + public override string ToDebugString() => FilterType switch + { + TgEnumFilterType.MinSize or TgEnumFilterType.MaxSize => + $"{TgCommonUtils.GetIsExists(IsExists)} | {Uid} | {TgCommonUtils.GetIsEnabled(IsEnabled)} | {GetStringForFilterType()} | {Name} | {Size} | {SizeType}", + _ => $"{TgCommonUtils.GetIsExists(IsExists)} | {Uid} | {TgCommonUtils.GetIsEnabled(IsEnabled)} | {GetStringForFilterType()} | {Name} | {(string.IsNullOrEmpty(Mask) ? $"<{nameof(string.Empty)}>" : Mask)}", + }; + + private string GetStringForFilterType() => FilterType switch + { + TgEnumFilterType.SingleName => TgLocaleHelper.Instance.MenuFiltersSetSingleName, + TgEnumFilterType.SingleExtension => TgLocaleHelper.Instance.MenuFiltersSetSingleExtension, + TgEnumFilterType.MultiName => TgLocaleHelper.Instance.MenuFiltersSetMultiName, + TgEnumFilterType.MultiExtension => TgLocaleHelper.Instance.MenuFiltersSetMultiExtension, + TgEnumFilterType.MinSize => TgLocaleHelper.Instance.MenuFiltersSetMinSize, + TgEnumFilterType.MaxSize => TgLocaleHelper.Instance.MenuFiltersSetMaxSize, + _ => $"<{TgLocaleHelper.Instance.MenuFiltersError}>", + }; + + #endregion +} \ No newline at end of file diff --git a/Core/TgEfCore/Domain/Filters/TgEfFilterRepository.cs b/Core/TgEfCore/Domain/Filters/TgEfFilterRepository.cs new file mode 100644 index 00000000..00c9494e --- /dev/null +++ b/Core/TgEfCore/Domain/Filters/TgEfFilterRepository.cs @@ -0,0 +1,86 @@ +// This is an independent project of an individual developer. Dear PVS-Studio, please check it. +// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com + +namespace TgEfCore.Domain.Filters; + +[Table(TgSqlConstants.TableApps)] +public sealed class TgEfFilterRepository(TgEfContext context) : TgEfRepositoryBase(context), + ITgEfRepository +{ + #region Public and private methods + + public TgEfFilterEntity CreateNew() + { + using IDbContextTransaction transaction = Context.Database.BeginTransaction(); + try + { + TgEfFilterEntity item = new() + { + IsEnabled = true, + FilterType = TgEnumFilterType.SingleName, + Name = "Any", + Mask = "*", + SizeType = TgEnumFileSizeType.Bytes + }; + Context.Add(item); + Context.SaveChanges(); + transaction.Commit(); + return item; + } + catch (Exception) + { + transaction.Rollback(); + throw; + } + } + + public Task DeleteAsync(TgEfFilterEntity item) + { + throw new NotImplementedException(); + } + + public Task DeleteNewAsync() + { + throw new NotImplementedException(); + } + + public Task SaveAsync(TgEfFilterEntity item, bool isGetByUid = false) + { + throw new NotImplementedException(); + } + + public Task GetAsync(TgEfFilterEntity item) + { + throw new NotImplementedException(); + } + + public Task GetNewAsync() + { + throw new NotImplementedException(); + } + + public Task GetFirstAsync() + { + throw new NotImplementedException(); + } + + public IEnumerable GetEnumerable(TgSqlEnumTableTopRecords topRecords = TgSqlEnumTableTopRecords.All) => + topRecords switch + { + TgSqlEnumTableTopRecords.Top200 => GetEnumerable(200), + TgSqlEnumTableTopRecords.Top1000 => GetEnumerable(1_000), + TgSqlEnumTableTopRecords.Top10000 => GetEnumerable(10_000), + TgSqlEnumTableTopRecords.Top100000 => GetEnumerable(100_000), + TgSqlEnumTableTopRecords.Top1000000 => GetEnumerable(1_000_000), + _ => GetEnumerable(0), + }; + + public IEnumerable GetEnumerable(int count) => + count > 0 ? Context.Filters.AsNoTracking().Select(x => x).Take(count) : Context.Filters.AsNoTracking().Select(x => x); + + public TgEfFilterEntity GetSingle(Guid uid) => Context.Filters.AsNoTracking().Single(x => x.Uid.ToString() == uid.ToString()); + + public async Task GetSingleAsync(Guid uid) => await Context.Filters.AsNoTracking().SingleAsync(x => x.Uid.ToString() == uid.ToString()); + + #endregion +} \ No newline at end of file diff --git a/Core/TgEfCore/Domain/Proxies/TgEfProxyEntity.cs b/Core/TgEfCore/Domain/Proxies/TgEfProxyEntity.cs index 87d51983..30ccfad2 100644 --- a/Core/TgEfCore/Domain/Proxies/TgEfProxyEntity.cs +++ b/Core/TgEfCore/Domain/Proxies/TgEfProxyEntity.cs @@ -12,35 +12,41 @@ public sealed class TgEfProxyEntity : TgEfEntityBase [DefaultValue(TgEnumProxyType.None)] [ConcurrencyCheck] [Column(TgSqlConstants.ColumnType)] + [SQLite.Indexed] public TgEnumProxyType Type { get; set; } [DefaultValue("")] [ConcurrencyCheck] [MaxLength(128)] [Column(TgSqlConstants.ColumnHostName)] + [SQLite.Indexed] public string HostName { get; set; } [DefaultValue(0)] [ConcurrencyCheck] [Column(TgSqlConstants.ColumnPort)] + [SQLite.Indexed] public ushort Port { get; set; } [DefaultValue("")] [ConcurrencyCheck] [MaxLength(128)] [Column(TgSqlConstants.ColumnUserName)] + [SQLite.Indexed] public string UserName { get; set; } [DefaultValue("")] [ConcurrencyCheck] [MaxLength(128)] [Column(TgSqlConstants.ColumnPassword)] + [SQLite.Indexed] public string Password { get; set; } [DefaultValue("")] [ConcurrencyCheck] [MaxLength(128)] [Column(TgSqlConstants.ColumnSecret)] + [SQLite.Indexed] public string Secret { get; set; } public TgEfProxyEntity() : base() diff --git a/Core/TgEfCore/Domain/Proxies/TgEfProxyRepository.cs b/Core/TgEfCore/Domain/Proxies/TgEfProxyRepository.cs index 41276197..09c7bae8 100644 --- a/Core/TgEfCore/Domain/Proxies/TgEfProxyRepository.cs +++ b/Core/TgEfCore/Domain/Proxies/TgEfProxyRepository.cs @@ -5,13 +5,34 @@ namespace TgEfCore.Domain.Proxies; [Table(TgSqlConstants.TableApps)] public sealed class TgEfProxyRepository(TgEfContext context) : TgEfRepositoryBase(context), - ITgSqlCreateRepository, ITgEfRepository + ITgEfRepository { #region Public and private methods - public TgEfProxyEntity CreateNew(bool isCreateSession) + public TgEfProxyEntity CreateNew() { - throw new NotImplementedException(); + using IDbContextTransaction transaction = Context.Database.BeginTransaction(); + try + { + TgEfProxyEntity item = new() + { + Type = TgEnumProxyType.None, + HostName = "No proxy", + Port = 404, + UserName = "No user", + Password = "No password", + Secret = string.Empty + }; + Context.Add(item); + Context.SaveChanges(); + transaction.Commit(); + return item; + } + catch (Exception) + { + transaction.Rollback(); + throw; + } } public Task DeleteAsync(TgEfProxyEntity item) diff --git a/Core/TgEfCore/GlobalUsings.cs b/Core/TgEfCore/GlobalUsings.cs index 0522302e..8906db54 100644 --- a/Core/TgEfCore/GlobalUsings.cs +++ b/Core/TgEfCore/GlobalUsings.cs @@ -7,11 +7,13 @@ global using System.ComponentModel.DataAnnotations.Schema; global using System.Diagnostics; global using Microsoft.EntityFrameworkCore; +global using Microsoft.EntityFrameworkCore.Storage; global using Microsoft.Extensions.Logging; global using TgEfCore.Common; global using TgEfCore.Domain; global using TgEfCore.Domain.Apps; global using TgEfCore.Domain.Proxies; +global using TgLocalization.Helpers; global using TgStorage.Common; global using TgStorage.Helpers; global using TgStorage.Utils; \ No newline at end of file diff --git a/Core/TgEfCore/TgEfContext.cs b/Core/TgEfCore/TgEfContext.cs index 799bb14c..407aedc4 100644 --- a/Core/TgEfCore/TgEfContext.cs +++ b/Core/TgEfCore/TgEfContext.cs @@ -1,6 +1,8 @@ // This is an independent project of an individual developer. Dear PVS-Studio, please check it. // PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com +using TgEfCore.Domain.Filters; + namespace TgEfCore; public class TgEfContext : DbContext @@ -9,11 +11,15 @@ public class TgEfContext : DbContext /// App queries public DbSet Apps { get; set; } + /// Filter queries + public DbSet Filters { get; set; } /// Proxy queries public DbSet Proxies { get; set; } /// App repository public TgEfAppRepository AppsRepo { get; set; } + /// Filter repository + public TgEfFilterRepository FilterRepo { get; set; } /// Proxy repository public TgEfProxyRepository ProxyRepo { get; set; } @@ -39,21 +45,22 @@ private void InitRepositories() Debug.WriteLine($"{nameof(ContextId)} {ContextId}: init repositories"); #endif AppsRepo = new(this); + FilterRepo = new(this); ProxyRepo = new(this); } +#if DEBUG protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { optionsBuilder //.UseSqlite($"Data Source={TgAppSettings.AppXml.FileStorage}") -#if DEBUG .LogTo(message => Debug.WriteLine($"{nameof(ContextId)} {ContextId}: {message}"), LogLevel.Information) .EnableThreadSafetyChecks() .EnableDetailedErrors() .EnableSensitiveDataLogging() -#endif - ; + ; } +#endif // Magic string. //public static readonly string RowVersion = nameof(RowVersion); diff --git a/Core/TgEfCore/TgEfCore.csproj b/Core/TgEfCore/TgEfCore.csproj index 192beeb7..c26462e0 100644 --- a/Core/TgEfCore/TgEfCore.csproj +++ b/Core/TgEfCore/TgEfCore.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.4.10.0 + 0.4.30.0 @@ -27,7 +27,6 @@ - diff --git a/Core/TgLocalization/Helpers/TgLocaleHelper.cs b/Core/TgLocalization/Helpers/TgLocaleHelper.cs index 7f615b3c..d48809bf 100644 --- a/Core/TgLocalization/Helpers/TgLocaleHelper.cs +++ b/Core/TgLocalization/Helpers/TgLocaleHelper.cs @@ -325,8 +325,14 @@ public TgLocaleHelper() #region Fields + public string FieldFilterType => "Filter type"; public string FieldHostname=> "Host name"; + public string FieldIsEnabled => "Enabled"; + public string FieldMask => "Mask"; + public string FieldName => "Name"; public string FieldPort => "Port"; + public string FieldSize=> "Size"; + public string FieldSizeType => "Size type"; public string FieldType => "Type"; public string FieldUserName => "Username"; public string FieldAbout => "About"; diff --git a/Core/TgLocalization/TgLocalization.csproj b/Core/TgLocalization/TgLocalization.csproj index 598f82f6..db0be622 100644 --- a/Core/TgLocalization/TgLocalization.csproj +++ b/Core/TgLocalization/TgLocalization.csproj @@ -4,7 +4,7 @@ enable enable AnyCPU;x86;x64 - 0.4.10.0 + 0.4.30.0 diff --git a/Core/TgStorage/Common/ITgEfRepository.cs b/Core/TgStorage/Common/ITgEfRepository.cs index 4e111e13..b334e12d 100644 --- a/Core/TgStorage/Common/ITgEfRepository.cs +++ b/Core/TgStorage/Common/ITgEfRepository.cs @@ -5,6 +5,7 @@ namespace TgStorage.Common; public interface ITgEfRepository : ITgSqlRepository where T : ITgSqlTable, new() { + public T CreateNew(); public T GetSingle(Guid uid); public Task GetSingleAsync(Guid uid); } \ No newline at end of file diff --git a/Core/TgStorage/Domain/Apps/TgSqlTableAppRepository.cs b/Core/TgStorage/Domain/Apps/TgSqlTableAppRepository.cs index 5db80380..8a28fe97 100644 --- a/Core/TgStorage/Domain/Apps/TgSqlTableAppRepository.cs +++ b/Core/TgStorage/Domain/Apps/TgSqlTableAppRepository.cs @@ -21,10 +21,10 @@ public sealed class TgSqlTableAppRepository : TgSqlRepositoryBase DeleteAsync(TgSqlTableAppModel item) diff --git a/Core/TgStorage/Domain/Filters/TgSqlTableFilterModel.cs b/Core/TgStorage/Domain/Filters/TgSqlTableFilterModel.cs index 3de1761b..c6688c36 100644 --- a/Core/TgStorage/Domain/Filters/TgSqlTableFilterModel.cs +++ b/Core/TgStorage/Domain/Filters/TgSqlTableFilterModel.cs @@ -52,7 +52,6 @@ public sealed class TgSqlTableFilterModel : XPLiteObject, ITgSqlTable private long _size; [DefaultValue(0)] [Persistent(TgSqlConstants.ColumnSize)] - [Size(128)] [Indexed] public long Size { get => _size; set => SetPropertyValue(nameof(_size), ref _size, value); } public long SizeAtBytes => SizeType switch diff --git a/Core/TgStorage/Domain/Filters/TgSqlTableFilterRepository.cs b/Core/TgStorage/Domain/Filters/TgSqlTableFilterRepository.cs index 459ee4f6..8a5400c8 100644 --- a/Core/TgStorage/Domain/Filters/TgSqlTableFilterRepository.cs +++ b/Core/TgStorage/Domain/Filters/TgSqlTableFilterRepository.cs @@ -21,14 +21,14 @@ public sealed class TgSqlTableFilterRepository : TgSqlRepositoryBase DeleteAsync(TgSqlTableFilterModel item) diff --git a/Core/TgStorage/Domain/Messages/TgSqlTableMessageRepository.cs b/Core/TgStorage/Domain/Messages/TgSqlTableMessageRepository.cs index 18f6600b..7c26ee83 100644 --- a/Core/TgStorage/Domain/Messages/TgSqlTableMessageRepository.cs +++ b/Core/TgStorage/Domain/Messages/TgSqlTableMessageRepository.cs @@ -21,16 +21,16 @@ public sealed class TgSqlTableMessageRepository : TgSqlRepositoryBase DeleteAsync(TgSqlTableMessageModel item) diff --git a/Core/TgStorage/Domain/Proxies/TgSqlTableProxyRepository.cs b/Core/TgStorage/Domain/Proxies/TgSqlTableProxyRepository.cs index de0b967e..a0ce54ba 100644 --- a/Core/TgStorage/Domain/Proxies/TgSqlTableProxyRepository.cs +++ b/Core/TgStorage/Domain/Proxies/TgSqlTableProxyRepository.cs @@ -21,15 +21,15 @@ public sealed class TgSqlTableProxyRepository : TgSqlRepositoryBase DeleteAsync(TgSqlTableProxyModel item) diff --git a/Core/TgStorage/Domain/Sources/TgSqlTableSourceRepository.cs b/Core/TgStorage/Domain/Sources/TgSqlTableSourceRepository.cs index d3b652b6..bb49a137 100644 --- a/Core/TgStorage/Domain/Sources/TgSqlTableSourceRepository.cs +++ b/Core/TgStorage/Domain/Sources/TgSqlTableSourceRepository.cs @@ -21,18 +21,18 @@ public sealed class TgSqlTableSourceRepository : TgSqlRepositoryBase new() { Id = id }; diff --git a/Core/TgStorage/Domain/Versions/TgSqlTableVersionRepository.cs b/Core/TgStorage/Domain/Versions/TgSqlTableVersionRepository.cs index 77b20eb1..aeb808fa 100644 --- a/Core/TgStorage/Domain/Versions/TgSqlTableVersionRepository.cs +++ b/Core/TgStorage/Domain/Versions/TgSqlTableVersionRepository.cs @@ -21,11 +21,11 @@ public sealed class TgSqlTableVersionRepository : TgSqlRepositoryBase DeleteAsync(TgSqlTableVersionModel item) diff --git a/Core/TgStorage/TgStorage.csproj b/Core/TgStorage/TgStorage.csproj index 85e28c76..4b0c7632 100644 --- a/Core/TgStorage/TgStorage.csproj +++ b/Core/TgStorage/TgStorage.csproj @@ -3,7 +3,7 @@ net8.0 enable enable - 0.4.10.0 + 0.4.30.0 AnyCPU;x64;x86 diff --git a/Tests/TgAssertCoreTests/TgAssertCoreTests.csproj b/Tests/TgAssertCoreTests/TgAssertCoreTests.csproj index 40723dc7..49c2cd10 100644 --- a/Tests/TgAssertCoreTests/TgAssertCoreTests.csproj +++ b/Tests/TgAssertCoreTests/TgAssertCoreTests.csproj @@ -3,7 +3,7 @@ net8.0 enable enable - 0.4.10.0 + 0.4.30.0 AnyCPU;x64;x86 diff --git a/Tests/TgDownloaderConsoleTest/TgDownloaderConsoleTest.csproj b/Tests/TgDownloaderConsoleTest/TgDownloaderConsoleTest.csproj index aa6b6504..e58f4a22 100644 --- a/Tests/TgDownloaderConsoleTest/TgDownloaderConsoleTest.csproj +++ b/Tests/TgDownloaderConsoleTest/TgDownloaderConsoleTest.csproj @@ -4,7 +4,7 @@ enable enable false - 0.4.10.0 + 0.4.30.0 AnyCPU;x64;x86 diff --git a/Tests/TgDownloaderTest/TgDownloaderTest.csproj b/Tests/TgDownloaderTest/TgDownloaderTest.csproj index f717e629..0751237e 100644 --- a/Tests/TgDownloaderTest/TgDownloaderTest.csproj +++ b/Tests/TgDownloaderTest/TgDownloaderTest.csproj @@ -4,7 +4,7 @@ enable enable false - 0.4.10.0 + 0.4.30.0 AnyCPU;x64;x86 diff --git a/Tests/TgEfCoreTests/Domain/TgDbRepositoryTests.cs b/Tests/TgEfCoreTests/Domain/TgDbRepositoryTests.cs index ffb2bdfb..db653dab 100644 --- a/Tests/TgEfCoreTests/Domain/TgDbRepositoryTests.cs +++ b/Tests/TgEfCoreTests/Domain/TgDbRepositoryTests.cs @@ -8,26 +8,31 @@ internal class TgDbRepositoryTests : TgEfContextBase { #region Public and private methods - private void RepositoryGet(ITgEfRepository repo) where TEntity : TgEfEntityBase, new() + private void GetSingle(ITgEfRepository repo) where TEntity : TgEfEntityBase, new() { Assert.DoesNotThrow(() => { List items = repo.GetEnumerable().ToList(); TestContext.WriteLine($"Found {items.Count} items."); - foreach (TEntity item in items) + + foreach (TEntity item in items) { TEntity itemFind = repo.GetSingle(item.Uid); Assert.IsNotNull(itemFind); - TestContext.WriteLine(itemFind.ToDebugString()); + + TestContext.WriteLine(itemFind.ToDebugString()); } }); } [Test] - public void TgEf_get_apps() => RepositoryGet(DbProdContext.AppsRepo); + public void TgEf_get_app() => GetSingle(DbProdContext.AppsRepo); [Test] - public void TgEf_get_proxies() => RepositoryGet(DbProdContext.ProxyRepo); + public void TgEf_get_filter() => GetSingle(DbProdContext.FilterRepo); + + [Test] + public void TgEf_get_proxy() => GetSingle(DbProdContext.ProxyRepo); #endregion } \ No newline at end of file diff --git a/Tests/TgEfCoreTests/Domain/TgMemoryRepositoryTests.cs b/Tests/TgEfCoreTests/Domain/TgMemoryRepositoryTests.cs new file mode 100644 index 00000000..3a0f6b70 --- /dev/null +++ b/Tests/TgEfCoreTests/Domain/TgMemoryRepositoryTests.cs @@ -0,0 +1,33 @@ +// This is an independent project of an individual developer. Dear PVS-Studio, please check it. +// PVS-Studio Static Code Analyzer for C, C++, C#, and Java: http://www.viva64.com + +namespace TgEfCoreTests.Domain; + +[TestFixture] +internal class TgMemoryRepositoryTests : TgEfContextBase +{ + #region Public and private methods + + private void CreateEntity(ITgEfRepository repo) where TEntity : TgEfEntityBase, new() + { + Assert.DoesNotThrow(() => + { + TEntity item = repo.CreateNew(); + TEntity itemFind = repo.GetSingle(item.Uid); + + Assert.IsNotNull(itemFind); + TestContext.WriteLine(itemFind.ToDebugString()); + }); + } + + [Test] + public void TgEf_create_app() => CreateEntity(MemoryContext.AppsRepo); + + [Test] + public void TgEf_create_filter() => CreateEntity(MemoryContext.FilterRepo); + + [Test] + public void TgEf_create_proxy() => CreateEntity(MemoryContext.ProxyRepo); + + #endregion +} \ No newline at end of file diff --git a/Tests/TgEfCoreTests/TgEfContextBase.cs b/Tests/TgEfCoreTests/TgEfContextBase.cs index d4f4dc34..0bda5e1b 100644 --- a/Tests/TgEfCoreTests/TgEfContextBase.cs +++ b/Tests/TgEfCoreTests/TgEfContextBase.cs @@ -7,9 +7,12 @@ internal class TgEfContextBase { #region Public and private fields, properties, constructor - protected TgEfContext DbProdContext { get; set; } - protected TgEfContext DbTestContext { get; set; } + /// Memory DB context protected TgEfContext MemoryContext { get; set; } + /// Product DB context + protected TgEfContext DbProdContext { get; set; } + /// Test DB context + protected TgEfContext DbTestContext { get; set; } public TgEfContextBase() { @@ -32,8 +35,11 @@ public TgEfContextBase() // Memory context. DbContextOptionsBuilder builderMemory = new DbContextOptionsBuilder() .UseLoggerFactory(factory) - .UseInMemoryDatabase(databaseName: "TgDownloaderMemory"); + //.UseInMemoryDatabase(databaseName: "TgDownloaderMemory") + .UseSqlite("DataSource=:memory:") + ; MemoryContext = new(builderMemory.Options); + TestContext.WriteLine(MemoryContext.Database.GetConnectionString()); } ~TgEfContextBase() diff --git a/Tests/TgEfCoreTests/TgEfCoreTests.csproj b/Tests/TgEfCoreTests/TgEfCoreTests.csproj index 0d136b84..d1449356 100644 --- a/Tests/TgEfCoreTests/TgEfCoreTests.csproj +++ b/Tests/TgEfCoreTests/TgEfCoreTests.csproj @@ -7,7 +7,7 @@ false true - 0.4.10.0 + 0.4.30.0 diff --git a/Tests/TgStorageTest/TgStorageTest.csproj b/Tests/TgStorageTest/TgStorageTest.csproj index 54e631c4..d5346e53 100644 --- a/Tests/TgStorageTest/TgStorageTest.csproj +++ b/Tests/TgStorageTest/TgStorageTest.csproj @@ -4,7 +4,7 @@ enable enable false - 0.4.10.0 + 0.4.30.0 AnyCPU;x64;x86