Skip to content

Commit

Permalink
Merge pull request #261 from Flexberry/feature-update-logservice
Browse files Browse the repository at this point in the history
Update LogService 2.1.0 -> 2.2.1
  • Loading branch information
Anisimova2020 authored Feb 16, 2024
2 parents a56192a + 5bca771 commit 7458494
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added

### Changed
1. Upgrade NewPlatform.Flexberry.LogService up to 2.2.1.

### Deprecated

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Spatial" Version="7.10.0" />
<PackageReference Include="NewPlatform.Flexberry.LogService" Version="2.1.0" />
<PackageReference Include="NewPlatform.Flexberry.LogService" Version="2.2.1" />
<PackageReference Include="Unity.Abstractions" Version="5.11.6" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ICSSoft.STORMNET.Tools/ICSSoft.STORMNET.Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewPlatform.Flexberry.LogService" Version="2.1.0" />
<PackageReference Include="NewPlatform.Flexberry.LogService" Version="2.2.1" />
<PackageReference Include="SharpZipLib" Version="1.3.3" />
</ItemGroup>

Expand Down
15 changes: 9 additions & 6 deletions NewPlatform.Flexberry.ORM.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Flexberry ORM package.</description>
<releaseNotes>
Changed
1. Upgrade NewPlatform.Flexberry.LogServic up to 2.2.1.

Fixed
1. Fixed order of property processing for objects with details and masters of the same type.
</releaseNotes>
<copyright>Copyright New Platform Ltd 2023</copyright>
<tags>Flexberry ORM</tags>
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="NewPlatform.Flexberry.LogService" version="2.1.0" />
<dependency id="NewPlatform.Flexberry.LogService" version="2.2.1" />
<dependency id="Microsoft.Spatial" version="7.10.0" />
<dependency id="Remotion.Linq" version="2.2.0" />
<dependency id="SharpZipLib" version="1.3.3" />
Expand All @@ -28,7 +31,7 @@
<dependency id="Unity.Container" version="5.11.8" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="NewPlatform.Flexberry.LogService" version="2.1.0" />
<dependency id="NewPlatform.Flexberry.LogService" version="2.2.1" />
<dependency id="Microsoft.Spatial" version="7.10.0" />
<dependency id="Remotion.Linq" version="2.2.0" />
<dependency id="SharpZipLib" version="1.3.3" />
Expand Down Expand Up @@ -63,7 +66,7 @@
<file src="NewPlatform.Flexberry.ORM.CurrentUserService\bin\$configuration$\net45\NewPlatform.Flexberry.ORM.CurrentUserService.xml" target="lib\net45\NewPlatform.Flexberry.ORM.CurrentUserService.xml" />
<file src="NewPlatform.Flexberry.ORM.UnityFactory\bin\$configuration$\net45\NewPlatform.Flexberry.ORM.UnityFactory.dll" target="lib\net45\NewPlatform.Flexberry.ORM.UnityFactory.dll" />
<file src="NewPlatform.Flexberry.ORM.UnityFactory\bin\$configuration$\net45\NewPlatform.Flexberry.ORM.UnityFactory.xml" target="lib\net45\NewPlatform.Flexberry.ORM.UnityFactory.xml" />

<file src="ICSSoft.STORMNET.Business\bin\$configuration$\net461\ICSSoft.STORMNET.Business.dll" target="lib\net461\ICSSoft.STORMNET.Business.dll" />
<file src="ICSSoft.STORMNET.Business\bin\$configuration$\net461\ICSSoft.STORMNET.Business.xml" target="lib\net461\ICSSoft.STORMNET.Business.xml" />
<file src="ICSSoft.STORMNET.Business.ExternalLangDef\bin\$configuration$\net461\ICSSoft.STORMNET.Business.ExternalLangDef.dll" target="lib\net461\ICSSoft.STORMNET.Business.ExternalLangDef.dll" />
Expand Down Expand Up @@ -109,7 +112,7 @@
<file src="NewPlatform.Flexberry.ORM.CurrentUserService\bin\$configuration$\netstandard2.0\NewPlatform.Flexberry.ORM.CurrentUserService.xml" target="lib\netstandard2.0\NewPlatform.Flexberry.ORM.CurrentUserService.xml" />
<file src="NewPlatform.Flexberry.ORM.UnityFactory\bin\$configuration$\netstandard2.0\NewPlatform.Flexberry.ORM.UnityFactory.dll" target="lib\netstandard2.0\NewPlatform.Flexberry.ORM.UnityFactory.dll" />
<file src="NewPlatform.Flexberry.ORM.UnityFactory\bin\$configuration$\netstandard2.0\NewPlatform.Flexberry.ORM.UnityFactory.xml" target="lib\netstandard2.0\NewPlatform.Flexberry.ORM.UnityFactory.xml" />

<file src="ICSSoft.STORMNET.Business\bin\$configuration$\netcoreapp3.1\ICSSoft.STORMNET.Business.dll" target="lib\netcoreapp3.1\ICSSoft.STORMNET.Business.dll" />
<file src="ICSSoft.STORMNET.Business\bin\$configuration$\netcoreapp3.1\ICSSoft.STORMNET.Business.xml" target="lib\netcoreapp3.1\ICSSoft.STORMNET.Business.xml" />
<file src="ICSSoft.STORMNET.Business.ExternalLangDef\bin\$configuration$\netcoreapp3.1\ICSSoft.STORMNET.Business.ExternalLangDef.dll" target="lib\netcoreapp3.1\ICSSoft.STORMNET.Business.ExternalLangDef.dll" />
Expand All @@ -132,7 +135,7 @@
<file src="NewPlatform.Flexberry.ORM.CurrentUserService\bin\$configuration$\netcoreapp3.1\NewPlatform.Flexberry.ORM.CurrentUserService.xml" target="lib\netcoreapp3.1\NewPlatform.Flexberry.ORM.CurrentUserService.xml" />
<file src="NewPlatform.Flexberry.ORM.UnityFactory\bin\$configuration$\netcoreapp3.1\NewPlatform.Flexberry.ORM.UnityFactory.dll" target="lib\netcoreapp3.1\NewPlatform.Flexberry.ORM.UnityFactory.dll" />
<file src="NewPlatform.Flexberry.ORM.UnityFactory\bin\$configuration$\netcoreapp3.1\NewPlatform.Flexberry.ORM.UnityFactory.xml" target="lib\netcoreapp3.1\NewPlatform.Flexberry.ORM.UnityFactory.xml" />

<file src="ICSSoft.STORMNET.Business\bin\$configuration$\net6.0\ICSSoft.STORMNET.Business.dll" target="lib\net6.0\ICSSoft.STORMNET.Business.dll" />
<file src="ICSSoft.STORMNET.Business\bin\$configuration$\net6.0\ICSSoft.STORMNET.Business.xml" target="lib\net6.0\ICSSoft.STORMNET.Business.xml" />
<file src="ICSSoft.STORMNET.Business.ExternalLangDef\bin\$configuration$\net6.0\ICSSoft.STORMNET.Business.ExternalLangDef.dll" target="lib\net6.0\ICSSoft.STORMNET.Business.ExternalLangDef.dll" />
Expand All @@ -155,7 +158,7 @@
<file src="NewPlatform.Flexberry.ORM.CurrentUserService\bin\$configuration$\net6.0\NewPlatform.Flexberry.ORM.CurrentUserService.xml" target="lib\net6.0\NewPlatform.Flexberry.ORM.CurrentUserService.xml" />
<file src="NewPlatform.Flexberry.ORM.UnityFactory\bin\$configuration$\net6.0\NewPlatform.Flexberry.ORM.UnityFactory.dll" target="lib\net6.0\NewPlatform.Flexberry.ORM.UnityFactory.dll" />
<file src="NewPlatform.Flexberry.ORM.UnityFactory\bin\$configuration$\net6.0\NewPlatform.Flexberry.ORM.UnityFactory.xml" target="lib\net6.0\NewPlatform.Flexberry.ORM.UnityFactory.xml" />

<file src="ICSSoft.STORMNET.Business\bin\$configuration$\net7.0\ICSSoft.STORMNET.Business.dll" target="lib\net7.0\ICSSoft.STORMNET.Business.dll" />
<file src="ICSSoft.STORMNET.Business\bin\$configuration$\net7.0\ICSSoft.STORMNET.Business.xml" target="lib\net7.0\ICSSoft.STORMNET.Business.xml" />
<file src="ICSSoft.STORMNET.Business.ExternalLangDef\bin\$configuration$\net7.0\ICSSoft.STORMNET.Business.ExternalLangDef.dll" target="lib\net7.0\ICSSoft.STORMNET.Business.ExternalLangDef.dll" />
Expand Down

0 comments on commit 7458494

Please sign in to comment.