Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove UnityFactory #280

Open
wants to merge 47 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
bc14401
Updated NewPlatform.Flexberry.ORM Up to 7.2.0-alpha01
Anisimova2020 Apr 6, 2023
bf342f7
Fast fixes for project building after ORM update
Anisimova2020 Apr 6, 2023
89510de
Fast fixes of unity config after ORM update
Anisimova2020 Apr 6, 2023
6fc1776
Fast fixes of tests after ORM update
Anisimova2020 Apr 10, 2023
c1f06c8
Remove not yet released code
turbcool Apr 28, 2023
b9f585f
Remove UnityFactory from DataObjectEdmModel
turbcool Apr 28, 2023
42906c1
DataObjectEdmModel использует IServiceProvider
turbcool May 19, 2023
c5b8a4c
Убираем UnityFactory из тестов
turbcool May 19, 2023
f229dfa
DataObjectEdmModel uses UnityContainer
turbcool May 19, 2023
806d037
Merge with develop branch
Anisimova2020 May 23, 2023
fd718df
Updated packages to versions changed to DI
Anisimova2020 May 25, 2023
e562f06
Merge branch 'feature-239-use-proper-di' of https://github.com/Flexbe…
Anisimova2020 May 25, 2023
921a215
Rollback
May 30, 2023
49e07cc
Merge pull request #282 from torres6093/feature-239-use-proper-di-rol…
Anisimova2020 May 30, 2023
1226aeb
Register for DefaultDataObjectEdmModelBuilder
May 31, 2023
c6783bc
New class for DataObjectEdmModel dependencies
May 31, 2023
900bf76
Removed RegisterFactory
May 31, 2023
37934d9
Code correction and comments
Jun 1, 2023
243d5c1
Commented new class
Jun 1, 2023
b83e09a
Merge pull request #283 from torres6093/feature-231939-remove-unityfa…
Anisimova2020 Jun 1, 2023
0c93a4a
Added registration for DataObjectEdmModelDependencies (this will be m…
Anisimova2020 Jun 1, 2023
00e4193
Trying to get connection string value
Jun 1, 2023
5a90da9
Fixed extra Unity Containers creation
Anisimova2020 Jun 2, 2023
98c2112
Added proper business server provider initialisation
Anisimova2020 Jun 2, 2023
4d087c2
Code cleanup
Jun 2, 2023
d23e1b5
App.config rollback
Jun 2, 2023
c6aa544
Fix after code review
Jun 2, 2023
5c250f1
Comment for static field
Jun 5, 2023
068e4be
Merge pull request #285 from torres6093/feature-fix-start
Anisimova2020 Jun 5, 2023
f01edf8
Added NuGet.config
Anisimova2020 Jun 5, 2023
d7f7063
Try to fix server tests
Anisimova2020 Jun 5, 2023
4b70a04
Try to fix github build
Anisimova2020 Jun 5, 2023
16ca471
Try to fix github build
Anisimova2020 Jun 5, 2023
3ade9b8
Try to fix github build
Anisimova2020 Jun 5, 2023
9109e48
Try to fix github build
Anisimova2020 Jun 5, 2023
3eb082d
Repair of github build
Anisimova2020 Jun 5, 2023
64c11f4
Fixed error on tests on net7 for github
Anisimova2020 Jun 5, 2023
ba5d6f8
Changed nuget source for github actions
Anisimova2020 Jun 5, 2023
d773553
Fixed tests for net4.5
Anisimova2020 Jun 6, 2023
189ae0e
Moving of serviceprovider creation
Anisimova2020 Jun 6, 2023
b2a4b10
Remove nuget.config
Anisimova2020 Jun 6, 2023
2fcfef0
Updated version of NewPlatform.Flexberry.ORM.ODataService up to 7.2.0…
Anisimova2020 Jun 6, 2023
8fec6f6
Merge with develop
Anisimova2020 Oct 11, 2023
934450a
Merge branch 'develop' of https://github.com/Flexberry/NewPlatform.Fl…
hvostya Mar 28, 2024
34710f5
Генерация файла testhost.dll.config
turbcool Mar 29, 2024
40608e0
Передача UnityContainer в тесты
Mar 29, 2024
5ef36ba
Рефакторинг использования unityContainer в тестах
Apr 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
env:
XUNIT_RUNNER: "2.4.1"
CONFIGURATION: "Debug"
NUPATH: "https://api.nuget.org/v3/index.json"

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down Expand Up @@ -73,10 +74,10 @@ jobs:
dotnet-version: 7.0.x

- name: Restore NewPlatform.Flexberry.ORM.ODataService.sln
run: dotnet restore NewPlatform.Flexberry.ORM.ODataService.sln
run: dotnet restore NewPlatform.Flexberry.ORM.ODataService.sln -s $NUPATH

- name: Install xunit.runner.console
run: nuget install xunit.runner.console -Version $XUNIT_RUNNER -OutputDirectory testrunner
run: nuget install xunit.runner.console -Version $XUNIT_RUNNER -OutputDirectory testrunner -Source $NUPATH

- name: Compile code
run: dotnet build --no-restore -v q /p:WarningLevel=0 -c $CONFIGURATION NewPlatform.Flexberry.ORM.ODataService.sln
Expand Down Expand Up @@ -150,10 +151,10 @@ jobs:
dotnet-version: 7.0.x

- name: Restore NewPlatform.Flexberry.ORM.ODataService.sln
run: dotnet restore NewPlatform.Flexberry.ORM.ODataService.sln
run: dotnet restore NewPlatform.Flexberry.ORM.ODataService.sln -s $NUPATH

- name: Install xunit.runner.console
run: nuget install xunit.runner.console -Version $XUNIT_RUNNER -OutputDirectory testrunner
run: nuget install xunit.runner.console -Version $XUNIT_RUNNER -OutputDirectory testrunner -Source $NUPATH

- name: Compile code
run: dotnet build --no-restore -v q /p:WarningLevel=0 -c $CONFIGURATION NewPlatform.Flexberry.ORM.ODataService.sln
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]

### Added
1. Helper class `DataObjectEdmModelDependencies` (it helps send named settings of Unity to class `DataObjectEdmModel`).

### Changed
1. Updated `NewPlatform.Flexberry.ORM` up to `7.2.0-alpha02`.
2. Constructor of class `DataObjectEdmModel` (it now needs extra DI initialization).
3. Constructor of class `DefaultDataObjectEdmModelBuilder` (it is factory for class `DataObjectEdmModel`).
4. Constructor of class `DefaultOfflineManager`.
5. Constructor of class `OfflineAuditService`.

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 Flexberry PLATFORM
Copyright (c) 2023 Flexberry PLATFORM

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="8.0.0-beta01" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NewPlatform.Flexberry.LockService" Version="3.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="8.0.0-beta01" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
28 changes: 14 additions & 14 deletions NewPlatform.Flexberry.ORM.ODataService.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>NewPlatform.Flexberry.ORM.ODataService</id>
<version>7.2.0</version>
<version>8.0.0-beta01</version>
<title>Flexberry ORM ODataService</title>
<authors>New Platform Ltd.</authors>
<owners>New Platform Ltd.</owners>
Expand All @@ -13,14 +13,14 @@
<description>Flexberry ORM OData Service Package.</description>
<releaseNotes>
Added
1. `updateViews` parameter of `DefaultDataObjectEdmModelBuilder` class. It allows to change update views for data objects (update view is used for loading a data object during OData update requests).
1. Helper class `DataObjectEdmModelDependencies` (it helps send named settings of Unity to class `DataObjectEdmModel`).

Changed
1. Updated Flexberry ORM up to 7.2.0.

Fixed
1. Fixed loading of object with crushing of already loaded masters.
2. Fixed loading of details.
Changed
1. Updated `NewPlatform.Flexberry.ORM` up to `8.0.0-beta01`.
2. Constructor of class `DataObjectEdmModel` (it now needs extra DI initialization).
3. Constructor of class `DefaultDataObjectEdmModelBuilder` (it is factory for class `DataObjectEdmModel`).
4. Constructor of class `DefaultOfflineManager`.
5. Constructor of class `OfflineAuditService`.
</releaseNotes>
<copyright>Copyright New Platform Ltd 2024</copyright>
<tags>Flexberry ORM OData ODataService</tags>
Expand All @@ -33,31 +33,31 @@
<dependency id="Microsoft.OData.Edm" version="7.10.0" />
<dependency id="Microsoft.Spatial" version="7.10.0" />
<dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.2.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="8.0.0-beta01" />
<dependency id="Newtonsoft.Json" version="13.0.1" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.6.2" />
<dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.2.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="8.0.0-beta01" />
<dependency id="Newtonsoft.Json" version="13.0.1" />
</group>
<group targetFramework=".NETCoreApp3.1">
<dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.6.2" />
<dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.2.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="8.0.0-beta01" />
<dependency id="Newtonsoft.Json" version="13.0.1" />
</group>
<group targetFramework=".NET6.0">
<dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.6.2" />
<dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.2.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="8.0.0-beta01" />
<dependency id="Newtonsoft.Json" version="13.0.1" />
</group>
<group targetFramework=".NET7.0">
<dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.6.2" />
<dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.2.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="8.0.0-beta01" />
<dependency id="Newtonsoft.Json" version="13.0.1" />
</group>
</dependencies>
Expand Down Expand Up @@ -102,7 +102,7 @@
<file src="NewPlatform.Flexberry.ORM.ODataServiceCore.Common\bin\$configuration$\net6.0\NewPlatform.Flexberry.ORM.ODataServiceCore.Common.xml" target="lib\net6.0\NewPlatform.Flexberry.ORM.ODataServiceCore.Common.xml" />
<file src="NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi\bin\$configuration$\net6.0\NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.dll" target="lib\net6.0\NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.dll" />
<file src="NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi\bin\$configuration$\net6.0\NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.xml" target="lib\net6.0\NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.xml" />

<file src="NewPlatform.Flexberry.ORM.ODataService\bin\$configuration$\net7.0\NewPlatform.Flexberry.ORM.ODataService.dll" target="lib\net7.0\NewPlatform.Flexberry.ORM.ODataService.dll" />
<file src="NewPlatform.Flexberry.ORM.ODataService\bin\$configuration$\net7.0\NewPlatform.Flexberry.ORM.ODataService.xml" target="lib\net7.0\NewPlatform.Flexberry.ORM.ODataService.xml" />
<file src="NewPlatform.Flexberry.ORM.ODataService.Files\bin\$configuration$\net7.0\NewPlatform.Flexberry.ORM.ODataService.Files.dll" target="lib\net7.0\NewPlatform.Flexberry.ORM.ODataService.Files.dll" />
Expand Down
Loading
Loading