From 28a5d1fc628b6de574edba6281ca1e861f2f2d2b Mon Sep 17 00:00:00 2001 From: "Atsuta, Ivan" Date: Thu, 16 Apr 2026 13:25:54 +0200 Subject: [PATCH 1/2] fix-csproj-ProjectReference --- .github/copilot-instructions.md | 25 +++++++++++++++++++ .../NHibDal.cs | 3 +-- .../Framework.Database.NHibernate.csproj | 1 + src/Directory.Packages.props | 2 +- ...amework.Infrastructure.Abstractions.csproj | 2 +- .../Framework.Infrastructure.csproj | 1 - .../AuthorizationGenerationEnvironment.cs | 3 +-- src/__SolutionItems/CommonAssemblyInfo.cs | 6 ++--- 8 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 .github/copilot-instructions.md diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 000000000..421d0d092 --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,25 @@ +- Always answer in Russian unless the prompt explicitly asks for another language. +- Use concise technical language. +- Keep code comments in English. +- Do not add comments to code that is already clear from its names and structure. +- Add comments only when they provide non-obvious context, intent, constraints, or business rationale. +- Always follow formatting, naming, and code style rules from `..\.editorconfig` when generating or modifying code. +- Also follow the effective formatting, naming, and code style rules resolved by ReSharper from the available settings layers, including `*.DotSettings` and `*.DotSettings.user`. +- If the same rule is defined in both sources, prefer `..\.editorconfig`. +- For SQL statements: + - use lower-case keywords such as `select`, `join`, `where`, `order by`; + - use the shortest reasonable table aliases; one-letter aliases are allowed; + - prefer `join` over `inner join`; + - use the `app` schema for domain tables; + - use lower camel case for column names that correspond to domain object properties, for example `salesOrderId`; + - compare uniqueidentifier columns to constants without cast; + - always start these clauses on a new line: from, join (all types), where, order by; + - otherwise, do not split lines shorter than 180 characters; + - do not add extra empty lines within a single SQL statement. +- Requirements for writing unit tests: + - adhere to the existing naming convention for tests; + - follow the AAA structure for tests with comments: Arrange, Act, Assert; + - use FluentDateTimeExtensions instead of new DateTime; + - do not use calculated values as expected values in the Assert section; + - in one test, only one Should() is allowed; complex assertions with .And are permitted; + - do not create derived classes for mocks; use the capabilities of mocking frameworks instead. \ No newline at end of file diff --git a/src/Database/Framework.Database.NHibernate.Legacy/NHibDal.cs b/src/Database/Framework.Database.NHibernate.Legacy/NHibDal.cs index 411fd9e83..700d0ebf0 100644 --- a/src/Database/Framework.Database.NHibernate.Legacy/NHibDal.cs +++ b/src/Database/Framework.Database.NHibernate.Legacy/NHibDal.cs @@ -3,7 +3,6 @@ using CommonFramework; using CommonFramework.ExpressionEvaluate; -using Framework.Application.Domain; using Framework.Core; using Framework.Database.Domain; using Framework.Database.NHibernate.DAL.Revisions; @@ -22,7 +21,7 @@ namespace Framework.Database.NHibernate; public class NHibDal(INHibSession session, IAsyncDal asyncDal) : IDAL - where TDomainObject : class, IIdentityObject + where TDomainObject : class { private static readonly LambdaCompileCache LambdaCompileCache = new(LambdaCompileMode.None); diff --git a/src/Database/Framework.Database.NHibernate/Framework.Database.NHibernate.csproj b/src/Database/Framework.Database.NHibernate/Framework.Database.NHibernate.csproj index cf709221e..a9b07c55b 100644 --- a/src/Database/Framework.Database.NHibernate/Framework.Database.NHibernate.csproj +++ b/src/Database/Framework.Database.NHibernate/Framework.Database.NHibernate.csproj @@ -9,6 +9,7 @@ + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 63bcea040..0e479db93 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -2,7 +2,7 @@ true false - 3.3.1.0 + 3.3.2.0 [1.6.2] diff --git a/src/Infrastructure/Framework.Infrastructure.Abstractions/Framework.Infrastructure.Abstractions.csproj b/src/Infrastructure/Framework.Infrastructure.Abstractions/Framework.Infrastructure.Abstractions.csproj index 3e1b19bcb..ce28c6476 100644 --- a/src/Infrastructure/Framework.Infrastructure.Abstractions/Framework.Infrastructure.Abstractions.csproj +++ b/src/Infrastructure/Framework.Infrastructure.Abstractions/Framework.Infrastructure.Abstractions.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Infrastructure/Framework.Infrastructure/Framework.Infrastructure.csproj b/src/Infrastructure/Framework.Infrastructure/Framework.Infrastructure.csproj index d28030fe8..21f6bd451 100644 --- a/src/Infrastructure/Framework.Infrastructure/Framework.Infrastructure.csproj +++ b/src/Infrastructure/Framework.Infrastructure/Framework.Infrastructure.csproj @@ -19,7 +19,6 @@ - diff --git a/src/_Authorization/Framework.Authorization.TestGenerate/Configurations/AuthorizationGenerationEnvironment.cs b/src/_Authorization/Framework.Authorization.TestGenerate/Configurations/AuthorizationGenerationEnvironment.cs index b18c1d07b..55c790284 100644 --- a/src/_Authorization/Framework.Authorization.TestGenerate/Configurations/AuthorizationGenerationEnvironment.cs +++ b/src/_Authorization/Framework.Authorization.TestGenerate/Configurations/AuthorizationGenerationEnvironment.cs @@ -64,8 +64,7 @@ protected override IEnumerable GetExtendedAttributeSour .Add(tb => tb.AddAttribute(new BLLViewRoleAttribute()) .AddProperty(v => v.Permissions, pb => pb.AddAttribute(new CustomSerializationAttribute(CustomSerializationMode.Ignore))) - .AddProperty(v => v.Description, pb => pb.AddAttribute(new CustomSerializationAttribute(CustomSerializationMode.ReadOnly))) - ) + .AddProperty(v => v.Description, pb => pb.AddAttribute(new CustomSerializationAttribute(CustomSerializationMode.ReadOnly)))) .Add(tb => tb.AddAttribute(new BLLViewRoleAttribute()) diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs index 01f502181..524db8dfc 100644 --- a/src/__SolutionItems/CommonAssemblyInfo.cs +++ b/src/__SolutionItems/CommonAssemblyInfo.cs @@ -4,9 +4,9 @@ [assembly: AssemblyCompany("Luxoft")] [assembly: AssemblyCopyright("Copyright © Luxoft 2009-2026")] -[assembly: AssemblyVersion("27.0.2.0")] -[assembly: AssemblyFileVersion("27.0.2.0")] -[assembly: AssemblyInformationalVersion("27.0.2.0")] +[assembly: AssemblyVersion("27.0.3.0")] +[assembly: AssemblyFileVersion("27.0.3.0")] +[assembly: AssemblyInformationalVersion("27.0.3.0")] #if DEBUG [assembly: AssemblyConfiguration("Debug")] From 0fe8474111650663aa5104e699baae2b4a00473f Mon Sep 17 00:00:00 2001 From: "Atsuta, Ivan" Date: Thu, 16 Apr 2026 13:33:02 +0200 Subject: [PATCH 2/2] upd --- .github/copilot-instructions.md | 25 ------------------------- .gitignore | 1 + 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 .github/copilot-instructions.md diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md deleted file mode 100644 index 421d0d092..000000000 --- a/.github/copilot-instructions.md +++ /dev/null @@ -1,25 +0,0 @@ -- Always answer in Russian unless the prompt explicitly asks for another language. -- Use concise technical language. -- Keep code comments in English. -- Do not add comments to code that is already clear from its names and structure. -- Add comments only when they provide non-obvious context, intent, constraints, or business rationale. -- Always follow formatting, naming, and code style rules from `..\.editorconfig` when generating or modifying code. -- Also follow the effective formatting, naming, and code style rules resolved by ReSharper from the available settings layers, including `*.DotSettings` and `*.DotSettings.user`. -- If the same rule is defined in both sources, prefer `..\.editorconfig`. -- For SQL statements: - - use lower-case keywords such as `select`, `join`, `where`, `order by`; - - use the shortest reasonable table aliases; one-letter aliases are allowed; - - prefer `join` over `inner join`; - - use the `app` schema for domain tables; - - use lower camel case for column names that correspond to domain object properties, for example `salesOrderId`; - - compare uniqueidentifier columns to constants without cast; - - always start these clauses on a new line: from, join (all types), where, order by; - - otherwise, do not split lines shorter than 180 characters; - - do not add extra empty lines within a single SQL statement. -- Requirements for writing unit tests: - - adhere to the existing naming convention for tests; - - follow the AAA structure for tests with comments: Arrange, Act, Assert; - - use FluentDateTimeExtensions instead of new DateTime; - - do not use calculated values as expected values in the Assert section; - - in one test, only one Should() is allowed; complex assertions with .And are permitted; - - do not create derived classes for mocks; use the capabilities of mocking frameworks instead. \ No newline at end of file diff --git a/.gitignore b/.gitignore index 6f4e829d1..ccde618f9 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,4 @@ ModelManifest.xml # Javascript files and source maps *.js.map *.js +/.github/copilot-instructions.md