Merge pull request #230 from Flexberry/release-6.0.0

Release 6.0.0
Flexberry · Jun 6, 2021 · eba26e8 · eba26e8
2 parents e142f0d + 5597c95
commit eba26e8
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 115 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,14 +6,55 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+### Changed
+
+### Fixed
+
+## [6.0.0] - 2021.06.06
+
+### Changed
+
+ 1. Update dependencies: `Microsoft.AspNet.OData` to `7.5.1`, `Microsoft.OData.Core` to `7.7.2`, `NewPlatform.Flexberry.ORM` to `6.0`.
+
+## [5.2.0] - 2021.06.03
+
+### Added
+ 1. Microsoft .NET Framework 4.6.1 compiled assemblies.
+ 2. Batch update MessageQuotas.MaxOperationsPerChangeset and MessageQuotas.MaxReceivedMessageSize parameters.
+
+### Changed
+ 1. Removing files through file providers.
+ 2. Add additional edm mapping into model builder.
+
+### Fixed
+ 1. Batch update InternalServerError event handling.
+ 2. SafeLoadDetails for models with TypeUsage.
+ 3. Batch update CallbackAfterCreate, CallbackAfterUpdate, CallbackAfterDelete call.
+ 4. SafeLoadDetails for partial loaded agregator.
+
+## [5.1.1] - 2020.08.21
+
+### Added
+
+1. The maximum number of top level query operations and changesets allowed in a single batch parameter, set default as 1000.
+
+### Fixed
+
+1. Update and delete details by batch update.
+2. Exponential format for numeric values serialization issue.
+3. SafeLoadDetails add details DataCopy to DataCopy DetailArray.
+4. Load emty agregators in SafeLoadDetails.
+
+## [5.1.0] - 2020.05.03
+
+### Added
+
 1. Handle httpResponseException with OdataError wrapped in targetInvocationException.
 2. Support $batch request for transactional update data objects.
 3. Support for limits on master details.
 4. Support for limits on pseudodetails.
 5. Decode Excel export column name.
 6. HttpConfiguretion MapDataObjectRoute() extension method. 
-7. Removing files through file providers.
-8. Add additional edm mapping into model builder.
 
 ### Changed
 
@@ -24,11 +65,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 5. [BREAKINGCHANGE] Details BS not apply changes in agregator. Use BS for agregator when details changed.
 6. Refactor `DataObjectControllerActivator` to simplify overriding DOC initialization.
 7. Mapping only selected properties on getting objects.
-8. [BREAKINGCHANGE] The namespace of api-extensions is changed to NewPlatform.Flexberry.ORM.ODataService.WebApi.Extensions .
-9. [BREAKINGCHANGE] The namespace of api-controllers is changed to NewPlatform.Flexberry.ORM.ODataService.WebApi.Controllers .
-10. [BREAKINGCHANGE] The namespace of GenericCorsPolicyProvider is changed to NewPlatform.Flexberry.ORM.ODataService.Cors .
+8. [BREAKINGCHANGE] The namespace of api-extensions is changed to NewPlatform.Flexberry.ORM.ODataService.WebApi.Extensions.
+9. [BREAKINGCHANGE] The namespace of api-controllers is changed to NewPlatform.Flexberry.ORM.ODataService.WebApi.Controllers.
+10. [BREAKINGCHANGE] The namespace of GenericCorsPolicyProvider is changed to NewPlatform.Flexberry.ORM.ODataService.Cors.
 11. [BREAKINGCHANGE] HttpConfiguration MapODataServiceDataObjectRoute extension method is marked obsolete.
-12. Code unification with Microsoft.AspNetCore.OData .
+12. Code unification with Microsoft.AspNetCore.OData.
 
 ### Fixed
 

diff --git a/...form.Flexberry.ORM.ODataService.Files/NewPlatform.Flexberry.ORM.ODataService.Files.csproj b/...form.Flexberry.ORM.ODataService.Files/NewPlatform.Flexberry.ORM.ODataService.Files.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="6.0.0-beta11" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>

diff --git a/...rm.Flexberry.ORM.ODataService.WebApi/NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj b/...rm.Flexberry.ORM.ODataService.WebApi/NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj
@@ -15,8 +15,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.7" />
-    <PackageReference Include="NewPlatform.Flexberry.LockService" Version="3.0.0-beta02" />
-    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="6.0.0-beta11" />
+    <PackageReference Include="NewPlatform.Flexberry.LockService" Version="3.0.0" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="6.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/NewPlatform.Flexberry.ORM.ODataService.nuspec b/NewPlatform.Flexberry.ORM.ODataService.nuspec
@@ -2,20 +2,20 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ORM.ODataService</id>
-    <version>6.0.0-beta06</version>
+    <version>6.0.0</version>
     <title>Flexberry ORM ODataService</title>
     <authors>New Platform Ltd.</authors>
     <owners>New Platform Ltd.</owners>
     <licenseUrl>http://flexberry.ru/License-FlexberryOrm-Runtime</licenseUrl>
-    <projectUrl>http://flexberry.net/FlexberryORM</projectUrl>
+    <projectUrl>https://flexberry.net/ru/developers-flexberry-orm.html</projectUrl>
     <iconUrl>https://flexberry.net/img/logo-color.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Flexberry ORM OData Service Package.</description>
     <releaseNotes>
       Changed
       1. Update dependencies: Microsoft.AspNet.OData to 7.5.1, Microsoft.OData.Core to 7.7.2, ORM to 6.0.
     </releaseNotes>
-    <copyright>Copyright New Platform Ltd 2020</copyright>
+    <copyright>Copyright New Platform Ltd 2021</copyright>
     <tags>Flexberry ORM OData ODataService</tags>
     <dependencies>
       <dependency id="Microsoft.AspNet.Cors" version="5.2.7" />
@@ -26,8 +26,8 @@
       <dependency id="Microsoft.OData.Core" version="7.7.2" />
       <dependency id="Microsoft.OData.Edm" version="7.7.2" />
       <dependency id="Microsoft.Spatial" version="7.7.2" />
-      <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0-beta02" />
-      <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0-beta11" />
+      <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
+      <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
       <dependency id="Newtonsoft.Json" version="8.0.3" />
     </dependencies>
   </metadata>

diff --git a/NewPlatform.Flexberry.ORM.ODataService.sln b/NewPlatform.Flexberry.ORM.ODataService.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewPlatform.Flexberry.ORM.ODataService", "NewPlatform.Flexberry.ORM.ODataService\NewPlatform.Flexberry.ORM.ODataService.csproj", "{01BBE45A-3A3F-4EA5-9457-8C62167B5E99}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataService", "NewPlatform.Flexberry.ORM.ODataService\NewPlatform.Flexberry.ORM.ODataService.csproj", "{01BBE45A-3A3F-4EA5-9457-8C62167B5E99}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet Package Properties", "NuGet Package Properties", "{EF5F8D62-3B41-44F8-B748-E5CE1CBF00A9}"
 	ProjectSection(SolutionItems) = preProject
@@ -21,18 +21,17 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Open Source", "Open Source", "{DB00E5CF-65B6-4A94-8C83-A80DB75E9B02}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		.travis.yml = .travis.yml
 		CHANGELOG.md = CHANGELOG.md
 		ConfigTuner.ps1 = ConfigTuner.ps1
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewPlatform.Flexberry.ORM.ODataService.Files", "NewPlatform.Flexberry.ORM.ODataService.Files\NewPlatform.Flexberry.ORM.ODataService.Files.csproj", "{22FAA967-EA69-4AE9-9A07-ECEE6C499BBB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataService.Files", "NewPlatform.Flexberry.ORM.ODataService.Files\NewPlatform.Flexberry.ORM.ODataService.Files.csproj", "{22FAA967-EA69-4AE9-9A07-ECEE6C499BBB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewPlatform.Flexberry.ORM.ODataService.WebApi", "NewPlatform.Flexberry.ORM.ODataService.WebApi\NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj", "{D3EBD348-D0F8-4C1E-BDC0-6C77D9D443CB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataService.WebApi", "NewPlatform.Flexberry.ORM.ODataService.WebApi\NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj", "{D3EBD348-D0F8-4C1E-BDC0-6C77D9D443CB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewPlatform.Flexberry.ORM.ODataService.Cors", "NewPlatform.Flexberry.ORM.ODataService.Cors\NewPlatform.Flexberry.ORM.ODataService.Cors.csproj", "{225422F1-D9A8-4B35-9AE3-68C2C1BAAD22}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataService.Cors", "NewPlatform.Flexberry.ORM.ODataService.Cors\NewPlatform.Flexberry.ORM.ODataService.Cors.csproj", "{225422F1-D9A8-4B35-9AE3-68C2C1BAAD22}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataServiceSample.AspNet", "Samples\ODataServiceSample.AspNet\ODataServiceSample.AspNet.csproj", "{D1CE223D-844E-45FF-BDAD-6252A3F3A4EA}"
 EndProject
@@ -84,7 +83,7 @@ Global
 		{BFB771C3-51D8-4804-BB0F-A0B4BD7981D9} = {A94D831A-7B5D-40C6-B76B-2B8B6335DB3E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35;packages\Unity.Interception.2.1.505.0\lib\NET35;packages\EnterpriseLibrary.Common.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Data.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Logging.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Logging.Database.5.0.505.0\lib\NET35
 		SolutionGuid = {611B715C-AD46-45B1-BA4E-36C8F1A1896E}
+		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35;packages\Unity.Interception.2.1.505.0\lib\NET35;packages\EnterpriseLibrary.Common.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Data.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Logging.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Logging.Database.5.0.505.0\lib\NET35
 	EndGlobalSection
 EndGlobal
diff --git a/NewPlatform.Flexberry.ORM.ODataService/Controllers/DataObjectController.ModifyData.cs b/NewPlatform.Flexberry.ORM.ODataService/Controllers/DataObjectController.ModifyData.cs
@@ -545,10 +545,7 @@ private DataObject ReturnDataObject(Type objType, object keyValue)
                             // Вычитывать объект сразу с детейлами нельзя, поскольку в этой же транзакции могут уже оказать отдельные операции с детейлами и перевычитка затрёт эти изменения.
                             View miniView = view.Clone();
                             DetailInView[] miniViewDetails = miniView.Details;
-                            foreach (DetailInView detailInView in miniViewDetails)
-                            {
-                                miniView.RemoveDetail(detailInView.Name);
-                            }
+                            miniView.Details = new DetailInView[0];
 
                             _dataService.LoadObject(miniView, dataObjectFromCache, false, true, _dataObjectCache);
 
@@ -565,10 +562,7 @@ private DataObject ReturnDataObject(Type objType, object keyValue)
                 // Вычитывать объект сразу с детейлами нельзя, поскольку в этой же транзакции могут уже оказать отдельные операции с детейлами и перевычитка затрёт эти изменения.
                 View lightView = view.Clone();
                 DetailInView[] lightViewDetails = lightView.Details;
-                foreach (DetailInView detailInView in lightViewDetails)
-                {
-                    lightView.RemoveDetail(detailInView.Name);
-                }
+                lightView.Details = new DetailInView[0];
 
                 // Проверим существование объекта в базе.
                 LoadingCustomizationStruct lcs = LoadingCustomizationStruct.GetSimpleStruct(objType, lightView);

diff --git a/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj b/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj
@@ -28,10 +28,10 @@
     <PackageReference Include="Microsoft.OData.Core" Version="7.7.2" />
     <PackageReference Include="Microsoft.OData.Edm" Version="7.7.2" />
     <PackageReference Include="Microsoft.Spatial" Version="7.7.2" />
-    <PackageReference Include="NewPlatform.Flexberry.UserSettingsService" Version="4.0.0-beta02" />
+    <PackageReference Include="NewPlatform.Flexberry.UserSettingsService" Version="4.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="8.0.3" />
-    <PackageReference Include="NewPlatform.Flexberry.LockService" Version="3.0.0-beta02" />
-    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="6.0.0-beta11" />
+    <PackageReference Include="NewPlatform.Flexberry.LockService" Version="3.0.0" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="6.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/README.md b/README.md
@@ -1,10 +1,8 @@
 # Flexberry ORM ODataService
 
-[![Build Status Master](https://travis-ci.org/Flexberry/NewPlatform.Flexberry.ORM.ODataService.svg?branch=master)](https://travis-ci.org/Flexberry/NewPlatform.Flexberry.ORM.ODataService)
+[![CI](https://github.com/Flexberry/NewPlatform.Flexberry.ORM.ODataService/actions/workflows/main.yml/badge.svg)](https://github.com/Flexberry/NewPlatform.Flexberry.ORM.ODataService/actions/workflows/main.yml)
 
-[![Build Status Develop](https://travis-ci.org/Flexberry/NewPlatform.Flexberry.ORM.ODataService.svg?branch=develop)](https://travis-ci.org/Flexberry/NewPlatform.Flexberry.ORM.ODataService)
-
-В этом репозитории располагается исходный код `Flexberry ORM ODataService` - серверного компонета для реализации публикации данных по протоколу [OData V4](http://www.odata.org/) для `Microsoft .NET Framework`.
+В этом репозитории располагается исходный код `Flexberry ORM ODataService` - серверного компонета для реализации публикации данных по протоколу [OData V4](http://www.odata.org/) для Microsoft .NET Framework и .NET Core.
 
 ## Ключевые особенности