Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to version 7.2.0 #298

Merged
merged 92 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
d0a2207
Upgrade to .NET 6.0
Jun 2, 2022
ed7edb2
Fix serialization
Jun 3, 2022
79f1f6d
Remove samples from main sln, create Samples sln.
Jun 23, 2022
6e54086
Fix web app factory.
Jun 23, 2022
56fe935
Override ReadAsync() method in ExtendedODataEntityDeserializer. (#258)
leoleopon Jun 30, 2022
b768731
Fix config files
Jul 10, 2022
61fdf41
Small fixes for export to excel functionality
hvostya Dec 12, 2022
2d8e9e4
Update Microsoft.AspNet.OData to 7.6.1, NewPlatform.Flexberry.AspNetC…
hvostya Dec 12, 2022
d5bde06
Add net6 and net7 as target frameworks
hvostya Dec 13, 2022
27f529a
Fixed problem with unit test on .Net6
hvostya Dec 14, 2022
f239ac6
Merge branch 'develop' of https://github.com/Flexberry/NewPlatform.Fl…
hvostya Dec 14, 2022
137ed5d
Updated NewPlatform.Flexberry.ORM.ODataService nuspec to 6.3.0-alpha02
hvostya Dec 15, 2022
9405811
Removed net7 for fast build
hvostya Dec 15, 2022
5379e46
Fixed mistyped version of dependency
hvostya Dec 15, 2022
bfb6dc7
Added net6.0 to other projects
hvostya Dec 19, 2022
06815f4
Added changes for namespace forming if Publish Name is set
hvostya Jan 13, 2023
7f35297
Changed version at nuspec up to 6.3.0-alpha03
hvostya Jan 16, 2023
708df13
Added forgotten comment
hvostya Jan 16, 2023
edd2af9
Added net7 to target frameworks
hvostya Jan 19, 2023
edc0fd4
Update build.yml to add .net7
Anisimova2020 Jan 20, 2023
255f751
Added net 7 to nuspek file
hvostya Feb 7, 2023
54c328a
Merge branch 'feature-update-to-net6' of https://github.com/Flexberry…
hvostya Feb 7, 2023
b407175
Updated nuspek to 6.3.0-alpha04
hvostya Feb 7, 2023
8642a19
Updated to 7.0.0-beta01
hvostya Feb 7, 2023
d176a66
Updated packages on sample project
hvostya Feb 7, 2023
2b67445
Merge with develop
Anisimova2020 Feb 17, 2023
d30f84a
Update depending NewPlatform.Flexberry.AspNetCore.OData up to 7.6.2
Anisimova2020 Feb 17, 2023
a55db21
Update NewPlatform.Flexberry.ORM up to 7.0.0
Anisimova2020 Feb 17, 2023
8a29fc7
Update NewPlatform.Flexberry.ORM.ODataService up to 7.0.0
Anisimova2020 Feb 17, 2023
8587d23
Merge pull request #272 from Flexberry/feature-update-to-net6
Anisimova2020 Feb 17, 2023
13e5ee0
Updated NewPlatform.Flexberry.ORM up to 7.1.0
Anisimova2020 Apr 12, 2023
a94ccd5
Updated version of Flexberry ORM ODataService up to 7.1.0
Anisimova2020 Apr 12, 2023
2a1b18c
Merge pull request #277 from Flexberry/feature-231428-OData-7.1.0
Anisimova2020 Apr 12, 2023
1a4dce9
Updates NewPlatform.Flexberry.ORM up to 7.1.1-beta01
Anisimova2020 Apr 15, 2023
0d35e69
Changed objects for new test on ORM
Anisimova2020 Apr 15, 2023
d29705a
Reverse previous changes
Anisimova2020 Apr 15, 2023
0c0c70d
Added filter on response
Anisimova2020 Apr 15, 2023
8be8eba
Added test on wrong symbols on get
Anisimova2020 Apr 15, 2023
f85c0af
Fixed problems with NullReference on response update
Anisimova2020 Apr 17, 2023
cb02c66
Updated on nuspek NewPlatform.Flexberry.ORM.ODataService up to 7.1.1-…
Anisimova2020 Apr 17, 2023
5652085
Changed test object value for test fixing
Anisimova2020 Apr 17, 2023
24ca683
Removed commented code
Anisimova2020 Apr 17, 2023
62ad75a
Added support of removing extra symbols from response for net4.5
Anisimova2020 Apr 18, 2023
029aa1e
Changed version of NewPlatform.Flexberry.ORM.ODataService up to
Anisimova2020 Apr 18, 2023
0486e30
Fixed NullReference on closed stream
Anisimova2020 Apr 18, 2023
da84a8b
Merge pull request #278 from Flexberry/fix-232024-remove-designer-bugs
Anisimova2020 Apr 21, 2023
ef0f340
delete try catch, for view error
s-andrey May 11, 2023
c399027
Merge pull request #279 from Flexberry/fix-error-log
Anisimova2020 May 16, 2023
2df9215
Fix safe load details with complex type usage hierarchy
bratchikov May 19, 2023
c3ed1a3
Merge pull request #281 from Flexberry/fix-232541-type-usage-in-safe-…
bratchikov May 22, 2023
fddc683
Changed version of NewPlatform.Flexberry.ORM.ODataService up to 7.1.1
Anisimova2020 Jun 8, 2023
ee49b2b
Merge pull request #287 from Flexberry/feature-release-7-1-1
Anisimova2020 Jun 9, 2023
4687a07
Добавлен тест на удаление, когда детейл и мастер одного типа
hvostya Feb 7, 2024
b1d19cd
Добавлена догрузка объекта при сложной структуре (TODO: переделать на…
hvostya Feb 7, 2024
5b434b8
Added new objects for tests
hvostya Feb 13, 2024
b55156f
Added test for situation of difficult batch
hvostya Feb 13, 2024
3fdcda2
Correction of master and detail loading without cache damage
hvostya Feb 14, 2024
cf9a4b4
Updated Flexberry ODataService up to 7.2.0-beta01
hvostya Feb 14, 2024
bf54819
Fixed batch test for .net4.5
hvostya Feb 14, 2024
3b3f366
Changes by CR
hvostya Feb 14, 2024
adeb59b
Merge pull request #294 from Flexberry/feature-26-fix-batch-safe
Anisimova2020 Feb 14, 2024
17a495a
Merge branch 'develop' of https://github.com/Flexberry/NewPlatform.Fl…
hvostya Feb 16, 2024
e173233
Full regeneration of objects
hvostya Feb 16, 2024
95b9418
Updated Flexberry ORM up to 7.2.0-beta01
hvostya Feb 16, 2024
ecf82c2
Changed version of NewPlatform.Flexberry.ORM.ODataService up to 7.2.0…
hvostya Feb 16, 2024
21c6af6
Added comment for variables
hvostya Feb 16, 2024
166a064
Changes be CR
hvostya Feb 19, 2024
798e05a
Merge pull request #295 from Flexberry/feature-5-delete-with-same-det…
Anisimova2020 Feb 19, 2024
361c3e1
Перегенерация Медведя и Берлоги 2024 год
Jan 17, 2024
252324d
Возможность задать UpdateView + тесты
Jan 23, 2024
5d79d73
Исправлен Assert в UpdateViewsTest
Jan 23, 2024
883e232
Добавлена возможность указать Startup в тестах
turbcool Jan 25, 2024
fa03e02
Исправлен тест для MS SQL
turbcool Jan 25, 2024
2957a3e
Исправления замечаний
turbcool Jan 25, 2024
ba83fe5
Исправления замечаний 2
Jan 25, 2024
62086b0
Исправления по замечаниям
Jan 29, 2024
504989b
fix проверки класса объекта в UpdateView
Jan 29, 2024
2bc0c00
changelog и nuspec файл - 7.2.0-alpha02
Jan 29, 2024
bfeca1a
Исправления PR
Feb 2, 2024
4d90a68
Удалено лишнее из changelog
turbcool Feb 19, 2024
127e7b4
Опечатка
turbcool Mar 4, 2024
e0fe974
Исправлен билд
turbcool Mar 4, 2024
db06e78
Лишние файлы
turbcool Mar 4, 2024
bd419f0
test
turbcool Mar 4, 2024
c9805d9
Медведь LF -> CRLF
turbcool Mar 11, 2024
d9e430d
Обновлён crp (UpdateViews)
turbcool Mar 11, 2024
c356535
Merge pull request #292 from Flexberry/feature-update-views
Anisimova2020 Mar 11, 2024
8d9198d
Try to fix sonar build
hvostya Mar 11, 2024
236b5f6
Merge pull request #296 from Flexberry/fix-sonar-build
bratchikov Mar 11, 2024
8fcf322
Updated Flexberry ORM up to 7.2.0
hvostya Mar 21, 2024
cc828aa
Updated to version 7.2.0
hvostya Mar 27, 2024
7fb4f45
Merge pull request #297 from Flexberry/feature-release-7.2.0
Anisimova2020 Mar 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 52 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,40 @@ jobs:
with:
dotnet-version: 3.1.x

# Building requires an up-to-date .NET SDK.

- name: Install .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x

# Building requires an up-to-date .NET SDK.

- name: Install .NET 7.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x

- name: Restore NewPlatform.Flexberry.ORM.ODataService.sln
run: nuget restore NewPlatform.Flexberry.ORM.ODataService.sln -NonInteractive
run: dotnet restore NewPlatform.Flexberry.ORM.ODataService.sln

- name: Install xunit.runner.console
run: nuget install xunit.runner.console -Version 2.4.1 -OutputDirectory testrunner
run: nuget install xunit.runner.console -Version $XUNIT_RUNNER -OutputDirectory testrunner

- name: Compile code
run: msbuild /verbosity:quiet /p:WarningLevel=0 /p:Configuration=Debug NewPlatform.Flexberry.ORM.ODataService.sln
run: dotnet build --no-restore -v q /p:WarningLevel=0 -c $CONFIGURATION NewPlatform.Flexberry.ORM.ODataService.sln

- name: Test under mono
run: mono ./testrunner/xunit.runner.console.2.4.1/tools/net461/xunit.console.exe ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/Debug/net461/NewPlatform.Flexberry.ORM.ODataService.Tests.dll
- name: Test on dotnet 3.1
run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/netcoreapp3.1/NewPlatform.Flexberry.ORM.ODataService.Tests.dll

- name: Test under dotnet
run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/Debug/netcoreapp3.1/NewPlatform.Flexberry.ORM.ODataService.Tests.dll
- name: Test on dotnet 6.0
run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net6.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll

- name: Test on dotnet 7.0
run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net7.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll

- name: Test under mono
run: mono ./testrunner/xunit.runner.console.$XUNIT_RUNNER/tools/net461/xunit.console.exe ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net461/NewPlatform.Flexberry.ORM.ODataService.Tests.dll

- name: Cleanup
if: always()
Expand Down Expand Up @@ -117,20 +137,38 @@ jobs:
with:
dotnet-version: 3.1.x

# Building requires an up-to-date .NET SDK.

- name: Install .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x

- name: Install .NET 7.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x

- name: Restore NewPlatform.Flexberry.ORM.ODataService.sln
run: nuget restore NewPlatform.Flexberry.ORM.ODataService.sln -NonInteractive
run: dotnet restore NewPlatform.Flexberry.ORM.ODataService.sln

- name: Install xunit.runner.console
run: nuget install xunit.runner.console -Version 2.4.1 -OutputDirectory testrunner
run: nuget install xunit.runner.console -Version $XUNIT_RUNNER -OutputDirectory testrunner

- name: Compile code
run: msbuild /verbosity:quiet /p:WarningLevel=0 /p:Configuration=Debug NewPlatform.Flexberry.ORM.ODataService.sln
run: dotnet build --no-restore -v q /p:WarningLevel=0 -c $CONFIGURATION NewPlatform.Flexberry.ORM.ODataService.sln

- name: Test under mono
run: mono ./testrunner/xunit.runner.console.2.4.1/tools/net461/xunit.console.exe ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/Debug/net461/NewPlatform.Flexberry.ORM.ODataService.Tests.dll
- name: Test on dotnet 3.1
run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/netcoreapp3.1/NewPlatform.Flexberry.ORM.ODataService.Tests.dll

- name: Test under dotnet
run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/Debug/netcoreapp3.1/NewPlatform.Flexberry.ORM.ODataService.Tests.dll
- name: Test on dotnet 6.0
run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net6.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll

- name: Test on dotnet 7.0
run: dotnet test ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net7.0/NewPlatform.Flexberry.ORM.ODataService.Tests.dll

- name: Test under mono
run: mono ./testrunner/xunit.runner.console.$XUNIT_RUNNER/tools/net461/xunit.console.exe ./Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/bin/$CONFIGURATION/net461/NewPlatform.Flexberry.ORM.ODataService.Tests.dll

- name: Cleanup
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
name: Build and analyze
runs-on: windows-latest
steps:
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 1.11
java-version: '17'
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
Expand Down
44 changes: 40 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Flexberry ORM ODataService Changelog
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Added
Expand All @@ -10,6 +9,43 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

## [7.2.0] - 2024.03.27

### Added
1. `updateViews` parameter of `DefaultDataObjectEdmModelBuilder` class. It allows to change update views for data objects (update view is used for loading a data object during OData update requests).

### Changed
1. Updated Flexberry ORM up to 7.2.0.

### Fixed
1. Fixed loading of object with crushing of already loaded masters.
2. Fixed loading of details.

## [7.1.1] - 2023.06.08

### Changed
1. Updated `NewPlatform.Flexberry.ORM` up to `7.1.1`.
2. Get properties from objects for send it to frontend always rethrow exception now.

### Fixed
1. Fixed problem with metadata when inheritance and PublishName is used.
2. Safe load details with complex type usage hierarchy.

## [7.1.0] - 2023.04.12

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

## [7.0.0] - 2023.02.17

### 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`

## [6.2.0] - 2023.02.16

### Added
Expand Down Expand Up @@ -78,7 +114,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
3. Support for limits on master details.
4. Support for limits on pseudodetails.
5. Decode Excel export column name.
6. HttpConfiguretion MapDataObjectRoute() extension method.
6. HttpConfiguretion MapDataObjectRoute() extension method.

### Changed

Expand Down Expand Up @@ -132,13 +168,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45;net461;netcoreapp3.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net45;net461;netcoreapp3.1;netstandard2.0;net6.0;net7.0</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<LangVersion>latest</LangVersion>
<RootNamespace>NewPlatform.Flexberry.ORM.ODataService.Files</RootNamespace>
Expand All @@ -21,7 +21,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="6.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -40,7 +40,7 @@
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' ">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -12,30 +12,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet Package Properties",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A94D831A-7B5D-40C6-B76B-2B8B6335DB3E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewPlatform.Flexberry.ORM.ODataService.Tests", "Tests\NewPlatform.Flexberry.ORM.ODataService.Tests\NewPlatform.Flexberry.ORM.ODataService.Tests.csproj", "{8E43819E-6643-4E5F-A3A2-B1C212033DE6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataService.Tests", "Tests\NewPlatform.Flexberry.ORM.ODataService.Tests\NewPlatform.Flexberry.ORM.ODataService.Tests.csproj", "{8E43819E-6643-4E5F-A3A2-B1C212033DE6}"
ProjectSection(ProjectDependencies) = postProject
{5090ACBA-7CD6-4AA7-88A2-15D541573988} = {5090ACBA-7CD6-4AA7-88A2-15D541573988}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewPlatform.Flexberry.ORM.ODataService.Tests.Objects", "Tests\Objects\NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj", "{10CE2502-3EEF-4285-935F-E18F5F623C6D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataService.Tests.Objects", "Tests\Objects\NewPlatform.Flexberry.ORM.ODataService.Tests.Objects.csproj", "{10CE2502-3EEF-4285-935F-E18F5F623C6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers", "Tests\BusinessServers\NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj", "{BFB771C3-51D8-4804-BB0F-A0B4BD7981D9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers", "Tests\BusinessServers\NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj", "{BFB771C3-51D8-4804-BB0F-A0B4BD7981D9}"
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
.github\workflows\build.yml = .github\workflows\build.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}"
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.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.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.WebApi", "NewPlatform.Flexberry.ORM.ODataService.WebApi\NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj", "{D3EBD348-D0F8-4C1E-BDC0-6C77D9D443CB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataServiceSample.AspNet", "Samples\ODataServiceSample.AspNet\ODataServiceSample.AspNet.csproj", "{D1CE223D-844E-45FF-BDAD-6252A3F3A4EA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataServiceCore.Common", "NewPlatform.Flexberry.ORM.ODataServiceCore.Common\NewPlatform.Flexberry.ORM.ODataServiceCore.Common.csproj", "{2C84BB80-78BD-4771-BA5A-32D32DB568DE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi", "NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi\NewPlatform.Flexberry.ORM.ODataServiceCore.WebApi.csproj", "{B9E13B47-4A51-4D47-B5B1-2C1A3A8008B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ODataServiceSample.AspNetCore", "Samples\ODataServiceSample.AspNetCore\ODataServiceSample.AspNetCore.csproj", "{5090ACBA-7CD6-4AA7-88A2-15D541573988}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{DE953BA7-BD14-48DA-AAAA-E835DC84497A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -66,14 +75,22 @@ Global
{D3EBD348-D0F8-4C1E-BDC0-6C77D9D443CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3EBD348-D0F8-4C1E-BDC0-6C77D9D443CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3EBD348-D0F8-4C1E-BDC0-6C77D9D443CB}.Release|Any CPU.Build.0 = Release|Any CPU
{225422F1-D9A8-4B35-9AE3-68C2C1BAAD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{225422F1-D9A8-4B35-9AE3-68C2C1BAAD22}.Debug|Any CPU.Build.0 = Debug|Any CPU
{225422F1-D9A8-4B35-9AE3-68C2C1BAAD22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{225422F1-D9A8-4B35-9AE3-68C2C1BAAD22}.Release|Any CPU.Build.0 = Release|Any CPU
{D1CE223D-844E-45FF-BDAD-6252A3F3A4EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1CE223D-844E-45FF-BDAD-6252A3F3A4EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1CE223D-844E-45FF-BDAD-6252A3F3A4EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1CE223D-844E-45FF-BDAD-6252A3F3A4EA}.Release|Any CPU.Build.0 = Release|Any CPU
{2C84BB80-78BD-4771-BA5A-32D32DB568DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C84BB80-78BD-4771-BA5A-32D32DB568DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C84BB80-78BD-4771-BA5A-32D32DB568DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C84BB80-78BD-4771-BA5A-32D32DB568DE}.Release|Any CPU.Build.0 = Release|Any CPU
{B9E13B47-4A51-4D47-B5B1-2C1A3A8008B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B9E13B47-4A51-4D47-B5B1-2C1A3A8008B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B9E13B47-4A51-4D47-B5B1-2C1A3A8008B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B9E13B47-4A51-4D47-B5B1-2C1A3A8008B1}.Release|Any CPU.Build.0 = Release|Any CPU
{5090ACBA-7CD6-4AA7-88A2-15D541573988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5090ACBA-7CD6-4AA7-88A2-15D541573988}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5090ACBA-7CD6-4AA7-88A2-15D541573988}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5090ACBA-7CD6-4AA7-88A2-15D541573988}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -82,9 +99,10 @@ Global
{8E43819E-6643-4E5F-A3A2-B1C212033DE6} = {A94D831A-7B5D-40C6-B76B-2B8B6335DB3E}
{10CE2502-3EEF-4285-935F-E18F5F623C6D} = {A94D831A-7B5D-40C6-B76B-2B8B6335DB3E}
{BFB771C3-51D8-4804-BB0F-A0B4BD7981D9} = {A94D831A-7B5D-40C6-B76B-2B8B6335DB3E}
{D1CE223D-844E-45FF-BDAD-6252A3F3A4EA} = {DE953BA7-BD14-48DA-AAAA-E835DC84497A}
{5090ACBA-7CD6-4AA7-88A2-15D541573988} = {DE953BA7-BD14-48DA-AAAA-E835DC84497A}
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}
EndGlobalSection
EndGlobal
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="6.1.0" />
<PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Loading
Loading