From 290ecd8a99fa7ce5f628c7c021f9ae89fa6a93bb Mon Sep 17 00:00:00 2001 From: Maria Tkacheva Date: Tue, 4 Jun 2024 14:38:51 +0500 Subject: [PATCH 1/6] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BD=D0=B0=20NET=208.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...atform.Flexberry.ORM.ODataService.Files.csproj | 4 ++-- NewPlatform.Flexberry.ORM.ODataService.nuspec | 15 +++++++++++++++ .../NewPlatform.Flexberry.ORM.ODataService.csproj | 8 ++++---- ...m.Flexberry.ORM.ODataServiceCore.Common.csproj | 4 ++-- ...m.Flexberry.ORM.ODataServiceCore.WebApi.csproj | 4 ++-- ...atform.Flexberry.ORM.ODataService.Tests.csproj | 4 ++-- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/NewPlatform.Flexberry.ORM.ODataService.Files/NewPlatform.Flexberry.ORM.ODataService.Files.csproj b/NewPlatform.Flexberry.ORM.ODataService.Files/NewPlatform.Flexberry.ORM.ODataService.Files.csproj index d021e67b..9d62dea5 100644 --- a/NewPlatform.Flexberry.ORM.ODataService.Files/NewPlatform.Flexberry.ORM.ODataService.Files.csproj +++ b/NewPlatform.Flexberry.ORM.ODataService.Files/NewPlatform.Flexberry.ORM.ODataService.Files.csproj @@ -1,7 +1,7 @@  - net45;net461;netcoreapp3.1;netstandard2.0;net6.0;net7.0 + net45;net461;netcoreapp3.1;netstandard2.0;net6.0;net7.0;net8.0 Debug;Release latest NewPlatform.Flexberry.ORM.ODataService.Files @@ -40,7 +40,7 @@ - + diff --git a/NewPlatform.Flexberry.ORM.ODataService.nuspec b/NewPlatform.Flexberry.ORM.ODataService.nuspec index 5073fcf5..6837646f 100644 --- a/NewPlatform.Flexberry.ORM.ODataService.nuspec +++ b/NewPlatform.Flexberry.ORM.ODataService.nuspec @@ -59,6 +59,12 @@ + + + + + + @@ -111,5 +117,14 @@ + + + + + + + + + diff --git a/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj b/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj index afdca984..1eee1baa 100644 --- a/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj +++ b/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj @@ -1,7 +1,7 @@  - net45;net461;netcoreapp3.1;netstandard2.0;net6.0;net7.0 + net45;net461;netcoreapp3.1;netstandard2.0;net6.0;net7.0;net8.0 Debug;Release latest NewPlatform.Flexberry.ORM.ODataService @@ -15,7 +15,7 @@ 1.0.0.0 - + $(DefineConstants);NETSTANDARD @@ -46,7 +46,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/NewPlatform.Flexberry.ORM.ODataServiceCore.Common/NewPlatform.Flexberry.ORM.ODataServiceCore.Common.csproj b/NewPlatform.Flexberry.ORM.ODataServiceCore.Common/NewPlatform.Flexberry.ORM.ODataServiceCore.Common.csproj index 4597e80f..a03ff6e3 100644 --- a/NewPlatform.Flexberry.ORM.ODataServiceCore.Common/NewPlatform.Flexberry.ORM.ODataServiceCore.Common.csproj +++ b/NewPlatform.Flexberry.ORM.ODataServiceCore.Common/NewPlatform.Flexberry.ORM.ODataServiceCore.Common.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;netstandard2.0;net6.0;net7.0 + netcoreapp3.1;netstandard2.0;net6.0;net7.0;net8.0 Debug;Release latest NewPlatform.Flexberry.ORM.ODataServiceCore.Common @@ -15,7 +15,7 @@ 1.0.0.0 - + diff --git a/NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi/NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.csproj b/NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi/NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.csproj index 9b08254f..87cd4ca8 100644 --- a/NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi/NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.csproj +++ b/NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi/NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;netstandard2.0;net6.0;net7.0 + netcoreapp3.1;netstandard2.0;net6.0;net7.0;net8.0 Debug;Release latest NewPlatform.Flexberry.ORM.ODataService.WebApi @@ -15,7 +15,7 @@ 1.0.0.0 - + diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/NewPlatform.Flexberry.ORM.ODataService.Tests.csproj b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/NewPlatform.Flexberry.ORM.ODataService.Tests.csproj index 3a4ed92a..65e48a69 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/NewPlatform.Flexberry.ORM.ODataService.Tests.csproj +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/NewPlatform.Flexberry.ORM.ODataService.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net461;netcoreapp3.1;net7.0 + net6.0;net461;netcoreapp3.1;net7.0;net8.0 Debug;Release latest NewPlatform.Flexberry.ORM.ODataService.Tests @@ -57,7 +57,7 @@ - + From d835c825e90cc59769df165aad874bd5e6184c52 Mon Sep 17 00:00:00 2001 From: Bratchikov Igor Date: Wed, 11 Sep 2024 11:50:22 +0500 Subject: [PATCH 2/6] Fix tests binary formatter --- .../NewPlatform.Flexberry.ORM.ODataService.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/NewPlatform.Flexberry.ORM.ODataService.Tests.csproj b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/NewPlatform.Flexberry.ORM.ODataService.Tests.csproj index 65e48a69..fa5853ff 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/NewPlatform.Flexberry.ORM.ODataService.Tests.csproj +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/NewPlatform.Flexberry.ORM.ODataService.Tests.csproj @@ -12,6 +12,7 @@ ..\..\Flexberry.ruleset 1.0.0.0 1.0.0.0 + true From f8c27b5307c4455ac46fd4b9b993483474d26855 Mon Sep 17 00:00:00 2001 From: Bratchikov Igor Date: Wed, 11 Sep 2024 13:05:39 +0500 Subject: [PATCH 3/6] Add MSSQL docker compose for tests --- .../README.md | 78 ++++++++++++------- .../docker-compose-mssql.yml | 15 ++++ 2 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/docker-compose-mssql.yml diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/README.md b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/README.md index 95ea1dc3..78c868ac 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/README.md +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/README.md @@ -1,26 +1,52 @@ -# Integration Tests - -## Tests run - -Before start test run please fill connection string `ConnectionStringPostgres` in `App.config` like this: - -```xml - -``` -Install [Docker](https://docker.com) if it not installed yet and start Docker. - -Then start Docker container with PostgreSQL by command from root folder this repository: - -```sh -docker-compose up -``` - -Tests ready to run. Do it now. - -When the database is no longer needed for tests, run the command: - -```sh -docker-compose down -``` - -Also perform undo in App.config before commit changes. +# Integration Tests + +## Tests run Postgres + +Before start test run please fill connection string `ConnectionStringPostgres` in `App.config` like this: + +```xml + +``` +Install [Docker](https://docker.com) if it not installed yet and start Docker. + +Then start Docker container with PostgreSQL by command from root folder this repository: + +```sh +docker-compose up -d +``` + +Tests ready to run. Do it now. + +When the database is no longer needed for tests, run the command: + +```sh +docker-compose down +``` + +Also perform undo in App.config before commit changes. + +## Test run MSSQL + +Before start test run please fill connection string `ConnectionStringMssql` in `App.config` like this: + +```xml + +``` + +Install [Docker](https://docker.com) if it not installed yet and start Docker. + +Then start Docker container with Microsoft SQL Server by command from root folder this repository: + +```sh +docker-compose -f docker-compose-mssql.yml up -d +``` + +Tests ready to run. Do it now. + +When the database is no longer needed for tests, run the command: + +```sh +docker-compose down +``` + +Also perform undo in App.config before commit changes. \ No newline at end of file diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/docker-compose-mssql.yml b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/docker-compose-mssql.yml new file mode 100644 index 00000000..8398651c --- /dev/null +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/docker-compose-mssql.yml @@ -0,0 +1,15 @@ +version: '3.2' + +services: + mssql: + image: mcr.microsoft.com/mssql/server:2022-latest + environment: + - ACCEPT_EULA=Y + - MSSQL_SA_PASSWORD=p@ssw0rd + ports: + - 1433:1433 + volumes: + - mssqldb:/var/opt/mssql + +volumes: + mssqldb: From 5d2c75aacdc26577979bcca2c3f46b741a4ba507 Mon Sep 17 00:00:00 2001 From: Bratchikov Igor <837035+bratchikov@users.noreply.github.com> Date: Wed, 9 Oct 2024 23:44:51 +0500 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f0aac0ab..20c66dab 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ ### Доработка -Исправление ошибок приветствуется, технические детали можно выяснить в [чате](https://gitter.im/Flexberry/PlatformDevelopment) или непосредственно в описании Issue. +Исправление ошибок приветствуется, технические детали можно выяснить в [чате](https://t.me/flexberry) или непосредственно в описании Issue. Добавление новой функциональности рекомендуется согласовывать с авторами, поскольку принятие Pool Request в этом случае может быть затруднено. ### Техническая поддержка From 108cec3f2e21e31a97d1eea9b1d3d8a996d64935 Mon Sep 17 00:00:00 2001 From: tanisimova Date: Thu, 24 Oct 2024 11:05:17 +0500 Subject: [PATCH 5/6] Change mssql image on fixed --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d64d2953..d6589fbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,7 +114,7 @@ jobs: # Label used to access the service container mssql: # Docker Hub image - image: mcr.microsoft.com/mssql/server:2022-latest + image: mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-20.04 # Provide the password for mssql env: ACCEPT_EULA: Y From 7a6ca3318e33e9c7ea7770613da5836a1b0e7d70 Mon Sep 17 00:00:00 2001 From: tanisimova Date: Thu, 24 Oct 2024 12:37:30 +0500 Subject: [PATCH 6/6] Change mssql image on fixed on docker-compose --- .../docker-compose-mssql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/docker-compose-mssql.yml b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/docker-compose-mssql.yml index 8398651c..ade766ee 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/docker-compose-mssql.yml +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/docker-compose-mssql.yml @@ -2,7 +2,7 @@ version: '3.2' services: mssql: - image: mcr.microsoft.com/mssql/server:2022-latest + image: mcr.microsoft.com/mssql/server:2022-CU10-ubuntu-20.04 environment: - ACCEPT_EULA=Y - MSSQL_SA_PASSWORD=p@ssw0rd