Skip to content

Commit

Permalink
Release 4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bratchikov Igor committed Feb 27, 2018
1 parent 10d16bc commit 284544e
Show file tree
Hide file tree
Showing 12 changed files with 125 additions and 93 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
* <README.md>
Expand Down
27 changes: 20 additions & 7 deletions NewPlatform.Flexberry.ORM.ODataService.nuspec
View file
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>2.0.1-alpha15</version>
<version>4.1.0</version>
<title>Flexberry ORM ODataService</title>
<authors>New Platform Ltd.</authors>
<owners>New Platform Ltd.</owners>
Expand All @@ -12,9 +12,22 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Flexberry ORM OData Service Package.</description>
<releaseNotes>
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.
</releaseNotes>
<copyright>Copyright New Platform Ltd 2018</copyright>
<tags>Flexberry ORM OData ODataService</tags>
Expand All @@ -27,9 +40,9 @@
<dependency id="Microsoft.OData.Core" version="[6.15.0, 7.0.0)" />
<dependency id="Microsoft.OData.Edm" version="6.15.0" />
<dependency id="Microsoft.Spatial" version="6.15.0" />
<dependency id="NewPlatform.Flexberry.LockService" version="1.0.0-alpha03" />
<dependency id="NewPlatform.Flexberry.ORM" version="4.1.0-beta15" />
<dependency id="NewPlatform.Flexberry.UserSettingsService" version="1.1.0" />
<dependency id="NewPlatform.Flexberry.LockService" version="1.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="4.1.0" />
<dependency id="NewPlatform.Flexberry.UserSettingsService" version="2.0.0" />
<dependency id="Newtonsoft.Json" version="8.0.3" />
</dependencies>
</metadata>
Expand Down
6 changes: 3 additions & 3 deletions NewPlatform.Flexberry.ORM.ODataService.sln
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
41 changes: 20 additions & 21 deletions NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,59 +136,59 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ChangesToSqlBTMonitor, Version=1.0.0.1, Culture=neutral, PublicKeyToken=e5ad39f116a43e0b, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ChangesToSqlBTMonitor.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ChangesToSqlBTMonitor.dll</HintPath>
</Reference>
<Reference Include="ExternalLangDef, Version=1.0.0.0, Culture=neutral, PublicKeyToken=50dc27591ed591e6, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ExternalLangDef.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ExternalLangDef.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ICSSoft.Services.CurrentUserService, Version=1.0.0.1, Culture=neutral, PublicKeyToken=087bc7ccdc1b0bb4, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.CurrentUserService.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.CurrentUserService.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.Services.UnityFactory, Version=1.0.0.1, Culture=neutral, PublicKeyToken=6389c2e26f4059bc, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.Services.UnityFactory.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.Services.UnityFactory.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Business, Version=1.0.0.1, Culture=neutral, PublicKeyToken=c17bb360f7843f45, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Business.DRDataService, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cef244157a7f77f7, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.DRDataService.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Business.LINQProvider, Version=1.0.0.0, Culture=neutral, PublicKeyToken=68e48bb6f6293778, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LINQProvider.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Business.LockService, Version=1.0.0.1, Culture=neutral, PublicKeyToken=68ac0e47b5ef94d8, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.LockService.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.LockService.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Business.MSSQLDataService, Version=1.0.0.1, Culture=neutral, PublicKeyToken=49b42003269a4a66, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Business.ODBCDataService, Version=1.0.0.1, Culture=neutral, PublicKeyToken=4c6916a347bdf8b1, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.ODBCDataService.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Business.OracleDataService, Version=1.0.0.1, Culture=neutral, PublicKeyToken=b24b342e1d86de22, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.OracleDataService.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Business.PostgresDataService, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c1da4b21bda90afe, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Business.PostgresDataService.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=898f36b7a907d804, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Collections.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Collections.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.DataObject, Version=1.0.0.1, Culture=neutral, PublicKeyToken=023a90c13b0ca8dc, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.DataObject.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.DataObject.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.FunctionalLanguage, Version=1.0.0.1, Culture=neutral, PublicKeyToken=88efc6f76e5cd161, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.FunctionalLanguage.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.Tools, Version=1.0.0.1, Culture=neutral, PublicKeyToken=c824f5305b237be9, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.Tools.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.Tools.dll</HintPath>
</Reference>
<Reference Include="ICSSoft.STORMNET.UserDataTypes, Version=1.0.0.1, Culture=neutral, PublicKeyToken=bc478021255def29, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0-beta15\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.ORM.4.1.0\lib\net45\ICSSoft.STORMNET.UserDataTypes.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
Expand Down Expand Up @@ -230,7 +230,7 @@
<Private>True</Private>
</Reference>
<Reference Include="NewPlatform.Flexberry.LockService, Version=1.0.0.0, Culture=neutral, PublicKeyToken=90cf813b4f0caf3c, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.LockService.1.0.0-alpha03\lib\net45\NewPlatform.Flexberry.LockService.dll</HintPath>
<HintPath>..\packages\NewPlatform.Flexberry.LockService.1.0.0\lib\net45\NewPlatform.Flexberry.LockService.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand Down Expand Up @@ -280,8 +280,7 @@
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UserSettingsService, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2169f05da5d7fddc, processorArchitecture=MSIL">
<HintPath>..\packages\NewPlatform.Flexberry.UserSettingsService.1.1.0\lib\net35\UserSettingsService.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\NewPlatform.Flexberry.UserSettingsService.2.0.0\lib\net35\UserSettingsService.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -402,4 +401,4 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets" Condition="Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" />
</Project>
</Project>
6 changes: 3 additions & 3 deletions NewPlatform.Flexberry.ORM.ODataService/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<package id="Microsoft.OData.Core" version="6.15.0" targetFramework="net45" />
<package id="Microsoft.OData.Edm" version="6.15.0" targetFramework="net45" />
<package id="Microsoft.Spatial" version="6.15.0" targetFramework="net45" />
<package id="NewPlatform.Flexberry.LockService" version="1.0.0-alpha03" targetFramework="net45" />
<package id="NewPlatform.Flexberry.LockService" version="1.0.0" targetFramework="net45" />
<package id="NewPlatform.Flexberry.LogService" version="1.1.0" targetFramework="net45" />
<package id="NewPlatform.Flexberry.ORM" version="4.1.0-beta15" targetFramework="net45" />
<package id="NewPlatform.Flexberry.UserSettingsService" version="1.1.0" targetFramework="net45" />
<package id="NewPlatform.Flexberry.ORM" version="4.1.0" targetFramework="net45" />
<package id="NewPlatform.Flexberry.UserSettingsService" version="2.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="Npgsql" version="2.2.7" targetFramework="net45" />
<package id="Oracle.ManagedDataAccess" version="12.1.022" targetFramework="net45" />
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -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`.

## Ключевые особенности
Expand Down
Loading

0 comments on commit 284544e

Please sign in to comment.