diff --git a/CHANGELOG.md b/CHANGELOG.md index 747b10c5..96e33533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,24 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed +## [4.1.0] - 2018.02.27 +### Added +1. Add support user function geo.intersects. +2. Add support LoadingCustomizationStruct in user functions. +3. Add support actions. +4. Add handler, called after exception appears. +5. In user functions and actions add possibility to return collections of primitive types and enums. In actions add possibility to use primitive types and enums as parameters. + +### Fixed +1. Fix reading properties of files. +2. Fix error which occured in Mono in method `DefaultODataPathHandler.Parse(IEdmModel model, string serviceRoot, string odataPath)`. +3. Fix errors in work of user functions. +4. Fix error in association object enumeration filtration. + +### Changed +1. Update dependencies. +2. Update ODataService package version to according ORM package version. + ## [2.0.0-beta.5] - 2017-09-02 ### Added * diff --git a/NewPlatform.Flexberry.ORM.ODataService.nuspec b/NewPlatform.Flexberry.ORM.ODataService.nuspec index a5351deb..312a3ef5 100644 --- a/NewPlatform.Flexberry.ORM.ODataService.nuspec +++ b/NewPlatform.Flexberry.ORM.ODataService.nuspec @@ -2,7 +2,7 @@ NewPlatform.Flexberry.ORM.ODataService - 2.0.1-alpha15 + 4.1.0 Flexberry ORM ODataService New Platform Ltd. New Platform Ltd. @@ -12,9 +12,22 @@ true Flexberry ORM OData Service Package. - 1) Add support user function geo.intersects. - 2) Add support LoadingCustomizationStruct in user functions. - 3) Add support actions. + Added + 1. Add support user function geo.intersects. + 2. Add support LoadingCustomizationStruct in user functions. + 3. Add support actions. + 4. Add handler, called after exception appears. + 5. In user functions and actions add possibility to return collections of primitive types and enums. In actions add possibility to use primitive types and enums as parameters. + + Fixed + 1. Fix reading properties of files. + 2. Fix error which occured in Mono in method DefaultODataPathHandler.Parse(IEdmModel model, string serviceRoot, string odataPath). + 3. Fix errors in work of user functions. + 4. Fix error in association object enumeration filtration. + + Changed + 1. Update dependencies. + 2. Update ODataService package version to according ORM package version. Copyright New Platform Ltd 2018 Flexberry ORM OData ODataService @@ -27,9 +40,9 @@ - - - + + + diff --git a/NewPlatform.Flexberry.ORM.ODataService.sln b/NewPlatform.Flexberry.ORM.ODataService.sln index 57cac65b..1df8afca 100644 --- a/NewPlatform.Flexberry.ORM.ODataService.sln +++ b/NewPlatform.Flexberry.ORM.ODataService.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2026 +VisualStudioVersion = 15.0.27130.2036 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}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet Package", "NuGet Package", "{EF5F8D62-3B41-44F8-B748-E5CE1CBF00A9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet Package Properties", "NuGet Package Properties", "{EF5F8D62-3B41-44F8-B748-E5CE1CBF00A9}" ProjectSection(SolutionItems) = preProject NewPlatform.Flexberry.ORM.ODataService.nuspec = NewPlatform.Flexberry.ORM.ODataService.nuspec EndProjectSection @@ -60,7 +60,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 c3005a80..f0190e59 100644 --- a/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj +++ b/NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj @@ -136,59 +136,59 @@ - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ChangesToSqlBTMonitor.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ChangesToSqlBTMonitor.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ExternalLangDef.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ExternalLangDef.dll ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll True - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.CurrentUserService.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.CurrentUserService.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.UnityFactory.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.UnityFactory.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LockService.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LockService.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Collections.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Collections.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.DataObject.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.DataObject.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Tools.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Tools.dll - ..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll + ..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll @@ -230,7 +230,7 @@ True - ..\packages\NewPlatform.Flexberry.LockService.1.0.0-alpha03\lib\net45\NewPlatform.Flexberry.LockService.dll + ..\packages\NewPlatform.Flexberry.LockService.1.0.0\lib\net45\NewPlatform.Flexberry.LockService.dll ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll @@ -280,8 +280,7 @@ - ..\packages\NewPlatform.Flexberry.UserSettingsService.1.1.0\lib\net35\UserSettingsService.dll - True + ..\packages\NewPlatform.Flexberry.UserSettingsService.2.0.0\lib\net35\UserSettingsService.dll @@ -402,4 +401,4 @@ - + \ No newline at end of file diff --git a/NewPlatform.Flexberry.ORM.ODataService/packages.config b/NewPlatform.Flexberry.ORM.ODataService/packages.config index 5117655e..5a40faf0 100644 --- a/NewPlatform.Flexberry.ORM.ODataService/packages.config +++ b/NewPlatform.Flexberry.ORM.ODataService/packages.config @@ -11,10 +11,10 @@ - + - - + + diff --git a/README.md b/README.md index 846cd488..40c5bff8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # 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) + +[![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`. ## Ключевые особенности diff --git a/Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj b/Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj index 08887b26..6d586042 100644 --- a/Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj +++ b/Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj @@ -40,55 +40,55 @@ - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ChangesToSqlBTMonitor.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ChangesToSqlBTMonitor.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ExternalLangDef.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ExternalLangDef.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.CurrentUserService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.CurrentUserService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.UnityFactory.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.UnityFactory.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LockService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LockService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Collections.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Collections.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.DataObject.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.DataObject.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Tools.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Tools.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll diff --git a/Tests/BusinessServers/packages.config b/Tests/BusinessServers/packages.config index 69373e8a..aa1a64b0 100644 --- a/Tests/BusinessServers/packages.config +++ b/Tests/BusinessServers/packages.config @@ -5,7 +5,7 @@ - + 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 1e063ceb..ea411f7e 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 @@ -58,7 +58,7 @@ True - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ChangesToSqlBTMonitor.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ChangesToSqlBTMonitor.dll ..\..\packages\NewPlatform.Flexberry.Security.1.7.0\lib\net35\CheckingLibrary.dll @@ -68,66 +68,65 @@ True - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ExternalLangDef.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ExternalLangDef.dll ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll True - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.CurrentUserService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.CurrentUserService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.UnityFactory.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.UnityFactory.dll ..\..\packages\NewPlatform.Flexberry.Security.1.7.0\lib\net35\ICSSoft.STORMNET.AzManBridge.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.dll - ..\..\packages\NewPlatform.Flexberry.Audit.1.3.0\lib\net35\ICSSoft.STORMNET.Business.Audit.dll - True + ..\..\packages\NewPlatform.Flexberry.Audit.2.0.0\lib\net35\ICSSoft.STORMNET.Business.Audit.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LockService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LockService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Collections.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Collections.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.DataObject.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.DataObject.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll ..\..\packages\NewPlatform.Flexberry.Security.1.7.0\lib\net35\ICSSoft.STORMNET.RightManager.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Tools.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Tools.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll ..\..\packages\NewPlatform.Flexberry.Security.1.7.0\lib\net35\Interop.ActiveDs.dll @@ -185,7 +184,6 @@ ..\..\packages\NewPlatform.Flexberry.LockService.1.0.0\lib\net45\NewPlatform.Flexberry.LockService.dll - True ..\..\packages\NewPlatform.Flexberry.ORM.GisMSSQLDataService.1.0.0-alpha09\lib\net45\NewPlatform.Flexberry.ORM.GisMSSQLDataService.dll diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/packages.config b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/packages.config index 5f130734..5a5aae00 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/packages.config +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/packages.config @@ -16,10 +16,10 @@ - - + + - + diff --git a/Tests/Objects/NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj b/Tests/Objects/NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj index 1914175f..a79e7759 100644 --- a/Tests/Objects/NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj +++ b/Tests/Objects/NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj @@ -46,55 +46,55 @@ - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ChangesToSqlBTMonitor.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ChangesToSqlBTMonitor.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ExternalLangDef.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ExternalLangDef.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.CurrentUserService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.CurrentUserService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.UnityFactory.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.UnityFactory.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LockService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LockService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Collections.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Collections.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.DataObject.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.DataObject.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Tools.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Tools.dll - ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll + ..\..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll diff --git a/Tests/Objects/packages.config b/Tests/Objects/packages.config index 69373e8a..aa1a64b0 100644 --- a/Tests/Objects/packages.config +++ b/Tests/Objects/packages.config @@ -5,7 +5,7 @@ - +