Skip to content

Commit

Permalink
Merge pull request #277 from Flexberry/feature-231428-OData-7.1.0
Browse files Browse the repository at this point in the history
Release ODataService 7.1.0
  • Loading branch information
Anisimova2020 authored Apr 12, 2023
2 parents 8587d23 + a94ccd5 commit 2a1b18c
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 27 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

## [7.1.0] - 2023.04.12

### Changed
1. Updated `NewPlatform.Flexberry.ORM` up to `7.1.0`.

## [7.0.0] - 2023.02.17

### Added
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.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.0" />
<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.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
19 changes: 7 additions & 12 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.0.0</version>
<version>7.1.0</version>
<title>Flexberry ORM ODataService</title>
<authors>New Platform Ltd.</authors>
<owners>New Platform Ltd.</owners>
Expand All @@ -12,13 +12,8 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Flexberry ORM OData Service Package.</description>
<releaseNotes>
Added
1. Added stubbed namespace for entities with publish name.
2. Added .net6 and .net7 as target frameworks.

Changed
1. Upgrade `Microsoft.AspNet.OData` to `7.6.1`
2. Upgrade `NewPlatform.Flexberry.AspNetCore.OData` to `7.6.2`
1. Updated `NewPlatform.Flexberry.ORM` up to `7.1.0`.
</releaseNotes>
<copyright>Copyright New Platform Ltd 2023</copyright>
<tags>Flexberry ORM OData ODataService</tags>
Expand All @@ -31,31 +26,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.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
<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.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
<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.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
<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.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
<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.0.0" />
<dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
<dependency id="Newtonsoft.Json" version="13.0.1" />
</group>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.0" />
<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 @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.MSSQLDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.OracleDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.PostgresDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.MSSQLDataService" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.OracleDataService" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.PostgresDataService" Version="7.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
<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 @@ -40,9 +40,9 @@
<PackageReference Include="NewPlatform.Flexberry.Audit" Version="4.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.GisMSSQLDataService" Version="2.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.GisPostgresDataService" Version="2.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.MSSQLDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.OracleDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.PostgresDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.MSSQLDataService" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.OracleDataService" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.PostgresDataService" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.Reports.ExportToExcel" Version="2.0.0" />
<PackageReference Include="NewPlatform.Flexberry.Security" Version="3.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.MSSQLDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.OracleDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.PostgresDataService" Version="7.0.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.MSSQLDataService" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.OracleDataService" Version="7.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM.PostgresDataService" Version="7.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit 2a1b18c

Please sign in to comment.