From e7a4398346449d8699fe1efd86dcc7d5a48abdb9 Mon Sep 17 00:00:00 2001 From: Bratchikov Igor Date: Sun, 6 Jun 2021 21:40:15 +0500 Subject: [PATCH 1/3] Update ORM to 6.0 --- ...rm.Flexberry.ORM.ODataService.Files.csproj | 2 +- ...m.Flexberry.ORM.ODataService.WebApi.csproj | 4 +- NewPlatform.Flexberry.ORM.ODataService.nuspec | 8 +-- NewPlatform.Flexberry.ORM.ODataService.sln | 11 ++-- ...Platform.Flexberry.ORM.ODataService.csproj | 6 +-- .../ODataServiceSample.AspNet.csproj | 40 +++++++------- .../ODataServiceSample.AspNet/packages.config | 16 +++--- ....ODataService.Tests.BusinessServers.csproj | 6 +-- .../App.config | 17 +++--- ...rm.Flexberry.ORM.ODataService.Tests.csproj | 52 +++++++++---------- .../packages.config | 24 ++++----- ...erry.ORM.ODataService.Tests.Objects.csproj | 6 +-- 12 files changed, 96 insertions(+), 96 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 dc6e1c4f..089a18e7 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 @@ -18,7 +18,7 @@ - + all diff --git a/NewPlatform.Flexberry.ORM.ODataService.WebApi/NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj b/NewPlatform.Flexberry.ORM.ODataService.WebApi/NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj index cf64d501..80cc6237 100644 --- a/NewPlatform.Flexberry.ORM.ODataService.WebApi/NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj +++ b/NewPlatform.Flexberry.ORM.ODataService.WebApi/NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj @@ -15,8 +15,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/NewPlatform.Flexberry.ORM.ODataService.nuspec b/NewPlatform.Flexberry.ORM.ODataService.nuspec index 1e0fbbc0..9f7e9e0e 100644 --- a/NewPlatform.Flexberry.ORM.ODataService.nuspec +++ b/NewPlatform.Flexberry.ORM.ODataService.nuspec @@ -2,7 +2,7 @@ NewPlatform.Flexberry.ORM.ODataService - 6.0.0-beta06 + 6.0.0 Flexberry ORM ODataService New Platform Ltd. New Platform Ltd. @@ -15,7 +15,7 @@ Changed 1. Update dependencies: Microsoft.AspNet.OData to 7.5.1, Microsoft.OData.Core to 7.7.2, ORM to 6.0. - Copyright New Platform Ltd 2020 + Copyright New Platform Ltd 2021 Flexberry ORM OData ODataService @@ -26,8 +26,8 @@ - - + + diff --git a/NewPlatform.Flexberry.ORM.ODataService.sln b/NewPlatform.Flexberry.ORM.ODataService.sln index 78baa41f..0044f415 100644 --- 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/NewPlatform.Flexberry.ORM.ODataService.csproj b/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj index b9ebf61c..8bf96597 100644 --- a/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj +++ b/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj @@ -28,10 +28,10 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Samples/ODataServiceSample.AspNet/ODataServiceSample.AspNet.csproj b/Samples/ODataServiceSample.AspNet/ODataServiceSample.AspNet.csproj index e9456703..15fe68a5 100644 --- a/Samples/ODataServiceSample.AspNet/ODataServiceSample.AspNet.csproj +++ b/Samples/ODataServiceSample.AspNet/ODataServiceSample.AspNet.csproj @@ -46,49 +46,49 @@ ..\..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Business.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Business.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Business.ExternalLangDef.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Business.ExternalLangDef.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Business.LockService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Business.LockService.dll ..\..\packages\NewPlatform.Flexberry.ORM.MSSQLDataService.6.0.0-beta07\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.OracleDataService.6.0.0-beta07\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.OracleDataService.6.0.0\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.PostgresDataService.6.0.0-beta07\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.PostgresDataService.6.0.0\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Collections.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Collections.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.DataObject.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.DataObject.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Tools.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Tools.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll - ..\..\packages\NewPlatform.Flexberry.LogService.Objects.4.0.0-beta01\lib\net45\IIS.Caseberry.Logging.BusinessServers.dll + ..\..\packages\NewPlatform.Flexberry.LogService.Objects.4.0.0\lib\net45\IIS.Caseberry.Logging.BusinessServers.dll - ..\..\packages\NewPlatform.Flexberry.LogService.Objects.4.0.0-beta01\lib\net45\IIS.Caseberry.Logging.Objects.dll + ..\..\packages\NewPlatform.Flexberry.LogService.Objects.4.0.0\lib\net45\IIS.Caseberry.Logging.Objects.dll - - ..\..\packages\log4net.2.0.11\lib\net45\log4net.dll + + ..\..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\..\packages\Microsoft.AspNet.OData.7.5.1\lib\net45\Microsoft.AspNet.OData.dll @@ -116,19 +116,19 @@ ..\..\packages\NewPlatform.Flexberry.AspNet.WebApi.Cors.1.1.1\lib\net45\NewPlatform.Flexberry.AspNet.WebApi.Cors.dll - ..\..\packages\NewPlatform.Flexberry.LockService.3.0.0-beta02\lib\net45\NewPlatform.Flexberry.LockService.dll + ..\..\packages\NewPlatform.Flexberry.LockService.3.0.0\lib\net45\NewPlatform.Flexberry.LockService.dll - ..\..\packages\NewPlatform.Flexberry.LogService.2.0.0-beta03\lib\net45\NewPlatform.Flexberry.LogService.dll + ..\..\packages\NewPlatform.Flexberry.LogService.2.0.0\lib\net45\NewPlatform.Flexberry.LogService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\NewPlatform.Flexberry.ORM.CurrentUserService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\NewPlatform.Flexberry.ORM.CurrentUserService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\NewPlatform.Flexberry.ORM.UnityFactory.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\NewPlatform.Flexberry.ORM.UnityFactory.dll - ..\..\packages\NewPlatform.Flexberry.UserSettingsService.4.0.0-beta02\lib\net45\NewPlatform.Flexberry.UserSettingsService.dll + ..\..\packages\NewPlatform.Flexberry.UserSettingsService.4.0.0\lib\net45\NewPlatform.Flexberry.UserSettingsService.dll ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/Samples/ODataServiceSample.AspNet/packages.config b/Samples/ODataServiceSample.AspNet/packages.config index 3965ad32..3442627a 100644 --- a/Samples/ODataServiceSample.AspNet/packages.config +++ b/Samples/ODataServiceSample.AspNet/packages.config @@ -1,6 +1,6 @@  - + @@ -15,14 +15,14 @@ - - - - + + + + - - - + + + diff --git a/Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj b/Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj index 9a673985..5884c03f 100644 --- a/Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj +++ b/Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj @@ -14,12 +14,12 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/App.config b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/App.config index ed6aa6e9..36ac3246 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/App.config +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/App.config @@ -18,7 +18,6 @@ - + + + + + + @@ -97,10 +102,6 @@ - - - - @@ -145,7 +146,7 @@ - + @@ -171,7 +172,7 @@ - + @@ -230,4 +231,4 @@ - + \ No newline at end of file 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 fb3b4bfd..a47bce19 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 @@ -65,46 +65,46 @@ ..\..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Business.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Business.dll - ..\..\packages\NewPlatform.Flexberry.Audit.4.0.0-beta03\lib\net45\ICSSoft.STORMNET.Business.Audit.dll + ..\..\packages\NewPlatform.Flexberry.Audit.4.0.0\lib\net45\ICSSoft.STORMNET.Business.Audit.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Business.ExternalLangDef.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Business.ExternalLangDef.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Business.LockService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Business.LockService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.MSSQLDataService.6.0.0-beta07\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.MSSQLDataService.6.0.0\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.OracleDataService.6.0.0-beta07\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.OracleDataService.6.0.0\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.PostgresDataService.6.0.0-beta07\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.PostgresDataService.6.0.0\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Collections.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Collections.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.DataObject.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.DataObject.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.Tools.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.Tools.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll - - ..\..\packages\log4net.2.0.11\lib\net45\log4net.dll + + ..\..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\..\packages\Microsoft.AspNet.OData.7.5.1\lib\net45\Microsoft.AspNet.OData.dll @@ -134,40 +134,40 @@ ..\..\packages\Moq.4.5.21\lib\net45\Moq.dll - ..\..\packages\NewPlatform.Flexberry.Caching.2.0.0-beta03\lib\net45\NewPlatform.Flexberry.Caching.dll + ..\..\packages\NewPlatform.Flexberry.Caching.2.0.0\lib\net45\NewPlatform.Flexberry.Caching.dll - ..\..\packages\NewPlatform.Flexberry.LockService.3.0.0-beta02\lib\net45\NewPlatform.Flexberry.LockService.dll + ..\..\packages\NewPlatform.Flexberry.LockService.3.0.0\lib\net45\NewPlatform.Flexberry.LockService.dll - ..\..\packages\NewPlatform.Flexberry.LogService.2.0.0-beta03\lib\net45\NewPlatform.Flexberry.LogService.dll + ..\..\packages\NewPlatform.Flexberry.LogService.2.0.0\lib\net45\NewPlatform.Flexberry.LogService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\NewPlatform.Flexberry.ORM.CurrentUserService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\NewPlatform.Flexberry.ORM.CurrentUserService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.GisMSSQLDataService.2.0.0-beta01\lib\net45\NewPlatform.Flexberry.ORM.GisMSSQLDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.GisMSSQLDataService.2.0.0\lib\net45\NewPlatform.Flexberry.ORM.GisMSSQLDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.GisPostgresDataService.2.0.0-beta01\lib\net45\NewPlatform.Flexberry.ORM.GisPostgresDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.GisPostgresDataService.2.0.0\lib\net45\NewPlatform.Flexberry.ORM.GisPostgresDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0-beta11\lib\net45\NewPlatform.Flexberry.ORM.UnityFactory.dll + ..\..\packages\NewPlatform.Flexberry.ORM.6.0.0\lib\net45\NewPlatform.Flexberry.ORM.UnityFactory.dll ..\..\packages\NewPlatform.Flexberry.Reports.ExportToExcel.2.0.0-beta02\lib\net45\NewPlatform.Flexberry.Reports.ExportToExcel.dll - ..\..\packages\NewPlatform.Flexberry.Security.3.0.0-beta03\lib\net45\NewPlatform.Flexberry.Security.dll + ..\..\packages\NewPlatform.Flexberry.Security.3.0.0\lib\net45\NewPlatform.Flexberry.Security.dll - ..\..\packages\NewPlatform.Flexberry.Security.3.0.0-beta03\lib\net45\NewPlatform.Flexberry.Security.AspNetProviders.dll + ..\..\packages\NewPlatform.Flexberry.Security.3.0.0\lib\net45\NewPlatform.Flexberry.Security.AspNetProviders.dll - ..\..\packages\NewPlatform.Flexberry.Security.3.0.0-beta03\lib\net45\NewPlatform.Flexberry.Security.BusinessServers.dll + ..\..\packages\NewPlatform.Flexberry.Security.3.0.0\lib\net45\NewPlatform.Flexberry.Security.BusinessServers.dll - ..\..\packages\NewPlatform.Flexberry.Security.3.0.0-beta03\lib\net45\NewPlatform.Flexberry.Security.Objects.dll + ..\..\packages\NewPlatform.Flexberry.Security.3.0.0\lib\net45\NewPlatform.Flexberry.Security.Objects.dll ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/packages.config b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/packages.config index 214ef8a6..1560580d 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/packages.config +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/packages.config @@ -2,7 +2,7 @@ - + @@ -19,18 +19,18 @@ - - - - - - - - - - + + + + + + + + + + - + diff --git a/Tests/Objects/NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj b/Tests/Objects/NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj index 5cd3bbde..918d2bde 100644 --- a/Tests/Objects/NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj +++ b/Tests/Objects/NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj @@ -14,12 +14,12 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From a9a2a7210e9497b0870bd565275d405dd33e935a Mon Sep 17 00:00:00 2001 From: Bratchikov Igor Date: Sun, 6 Jun 2021 21:52:49 +0500 Subject: [PATCH 2/3] Get latest changes from 5.2 --- .../Controllers/DataObjectController.ModifyData.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/NewPlatform.Flexberry.ORM.ODataService/Controllers/DataObjectController.ModifyData.cs b/NewPlatform.Flexberry.ORM.ODataService/Controllers/DataObjectController.ModifyData.cs index 4a20daac..89501da7 100644 --- 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); From 5597c9504ef05eb2ced627948e6f2bce6802a81d Mon Sep 17 00:00:00 2001 From: Bratchikov Igor Date: Sun, 6 Jun 2021 21:56:37 +0500 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 53 ++++++++++++++++--- NewPlatform.Flexberry.ORM.ODataService.nuspec | 2 +- README.md | 6 +-- 3 files changed, 50 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 953f525e..19d754b9 100644 --- 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/NewPlatform.Flexberry.ORM.ODataService.nuspec b/NewPlatform.Flexberry.ORM.ODataService.nuspec index 9f7e9e0e..dd3eab42 100644 --- a/NewPlatform.Flexberry.ORM.ODataService.nuspec +++ b/NewPlatform.Flexberry.ORM.ODataService.nuspec @@ -7,7 +7,7 @@ New Platform Ltd. New Platform Ltd. http://flexberry.ru/License-FlexberryOrm-Runtime - http://flexberry.net/FlexberryORM + https://flexberry.net/ru/developers-flexberry-orm.html https://flexberry.net/img/logo-color.png true Flexberry ORM OData Service Package. diff --git a/README.md b/README.md index e334d328..ca87a8e5 100644 --- 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. ## Ключевые особенности