Merge pull request #99 from Flexberry/develop-nuspec-upgrade

Package release
Flexberry · Jun 30, 2023 · c757aed · c757aed
2 parents 783a8c0 + a4c84dd
commit c757aed
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 44 deletions.
diff --git a/Docker/flexberry-service-bus/Dockerfile b/Docker/flexberry-service-bus/Dockerfile
@@ -1,6 +1,6 @@
 FROM mono:latest as mono
 
-ARG TAG=1.2.1-beta04-service
+ARG TAG=2.0.0-beta01-service
 RUN mono --version && \
     apt update && \
 	apt install -y git && \

diff --git a/NewPlatform.Flexberry.ServiceBus.ClientTools.nuspec b/NewPlatform.Flexberry.ServiceBus.ClientTools.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ServiceBus.ClientTools</id>
-    <version>1.2.1</version>
+    <version>2.0.0-beta01</version>
     <title>Flexberry Service Bus ClientTools</title>
     <authors>New Platform Ltd.</authors>
     <owners>New Platform Ltd.</owners>
@@ -12,11 +12,13 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Client tools for Flexberry Service Bus.</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright © New Platform Ltd. 2018</copyright>
+    <copyright>Copyright © New Platform Ltd. 2021</copyright>
     <tags>Flexberry Service Bus</tags>
   </metadata>
   <files>
-    <file src="NewPlatform.Flexberry.ServiceBus.ClientTools.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.ClientTools.dll" />
-    <file src="NewPlatform.Flexberry.ServiceBus.ClientTools.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.ClientTools.xml" />
+    <file src="net45\NewPlatform.Flexberry.ServiceBus.ClientTools.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.ClientTools.dll" />
+    <file src="net45\NewPlatform.Flexberry.ServiceBus.ClientTools.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.ClientTools.xml" />
+    <file src="netstandard2.0\NewPlatform.Flexberry.ServiceBus.ClientTools.dll" target="lib\netstandard2.0\NewPlatform.Flexberry.ServiceBus.ClientTools.dll" />
+    <file src="netstandard2.0\NewPlatform.Flexberry.ServiceBus.ClientTools.xml" target="lib\netstandard2.0\NewPlatform.Flexberry.ServiceBus.ClientTools.xml" />
   </files>
 </package>
diff --git a/NewPlatform.Flexberry.ServiceBus.Components.nuspec b/NewPlatform.Flexberry.ServiceBus.Components.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ServiceBus.Components</id>
-    <version>1.2.1-beta04</version>
+    <version>2.0.0-beta01</version>
     <title>Flexberry Service Bus Components</title>
     <authors>New Platform Ltd.</authors>
     <owners>New Platform Ltd.</owners>
@@ -12,15 +12,25 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Components interfaces for Flexberry Service Bus.</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright © New Platform Ltd. 2018</copyright>
+    <copyright>Copyright © New Platform Ltd. 2021</copyright>
     <tags>Flexberry Service Bus</tags>
     <dependencies>
-      <dependency id="NewPlatform.Flexberry.ServiceBus.ClientTools" version="1.2.0" />
-      <dependency id="NewPlatform.Flexberry.ServiceBus.Objects" version="1.2.0" />
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
+        <dependency id="NewPlatform.Flexberry.ServiceBus.ClientTools" version="2.0.0-beta01" />
+        <dependency id="NewPlatform.Flexberry.ServiceBus.Objects" version="2.0.0-beta01" />
+      </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
+        <dependency id="NewPlatform.Flexberry.ServiceBus.ClientTools" version="2.0.0-beta01" />
+        <dependency id="NewPlatform.Flexberry.ServiceBus.Objects" version="2.0.0-beta01" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="NewPlatform.Flexberry.ServiceBus.Components.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.Components.dll" />
-    <file src="NewPlatform.Flexberry.ServiceBus.Components.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.Components.xml" />
+    <file src="net45\NewPlatform.Flexberry.ServiceBus.Components.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.Components.dll" />
+    <file src="net45\NewPlatform.Flexberry.ServiceBus.Components.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.Components.xml" />
+    <file src="netstandard2.0\NewPlatform.Flexberry.ServiceBus.Components.dll" target="lib\netstandard2.0\NewPlatform.Flexberry.ServiceBus.Components.dll" />
+    <file src="netstandard2.0\NewPlatform.Flexberry.ServiceBus.Components.xml" target="lib\netstandard2.0\NewPlatform.Flexberry.ServiceBus.Components.xml" />
   </files>
 </package>
diff --git a/NewPlatform.Flexberry.ServiceBus.ConsoleHost/App.config b/NewPlatform.Flexberry.ServiceBus.ConsoleHost/App.config
@@ -369,6 +369,10 @@
         <assemblyIdentity name="Unity.Container" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.11.8.0" newVersion="5.11.8.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.web>

diff --git a/...form.Flexberry.ServiceBus.ConsoleHost/NewPlatform.Flexberry.ServiceBus.ConsoleHost.csproj b/...form.Flexberry.ServiceBus.ConsoleHost/NewPlatform.Flexberry.ServiceBus.ConsoleHost.csproj
@@ -121,6 +121,12 @@
     <Reference Include="ICSSoft.STORMNET.Business.LockService, Version=1.0.0.1, Culture=neutral, PublicKeyToken=68ac0e47b5ef94d8, processorArchitecture=MSIL">
       <HintPath>..\packages\NewPlatform.Flexberry.ORM.6.0.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.MSSQLDataService.6.0.0\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.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.PostgresDataService.6.0.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.6.0.0\lib\net45\ICSSoft.STORMNET.Collections.dll</HintPath>
     </Reference>
@@ -175,6 +181,9 @@
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Npgsql, Version=3.2.6.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Npgsql.3.2.6\lib\net451\Npgsql.dll</HintPath>
+    </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
       <Private>True</Private>

diff --git a/NewPlatform.Flexberry.ServiceBus.ConsoleHost/packages.config b/NewPlatform.Flexberry.ServiceBus.ConsoleHost/packages.config
@@ -17,7 +17,10 @@
   <package id="NewPlatform.Flexberry.LogService" version="2.0.0" targetFramework="net452" />
   <package id="NewPlatform.Flexberry.LogService.Objects" version="4.0.0" targetFramework="net452" />
   <package id="NewPlatform.Flexberry.ORM" version="6.0.0" targetFramework="net452" />
+  <package id="NewPlatform.Flexberry.ORM.MSSQLDataService" version="6.0.0" targetFramework="net452" />
+  <package id="NewPlatform.Flexberry.ORM.PostgresDataService" version="6.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net452" />
+  <package id="Npgsql" version="3.2.6" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="RabbitMQ.Client" version="5.1.0" targetFramework="net452" />
   <package id="Remotion.Linq" version="2.2.0" targetFramework="net452" />

diff --git a/...us.IntegratedTests/Components/StatisticsService/DefaultStatisticsCompressorServiceTest.cs b/...us.IntegratedTests/Components/StatisticsService/DefaultStatisticsCompressorServiceTest.cs
@@ -32,7 +32,7 @@ public void TestPartCompression()
                     NextCompressTime = DateTime.Now,
                 };
                 var dataObjects = new DataObject[100];
-                var date = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour - 1, 0, 0, 0);
+                var date = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, 0, 0, 0).AddHours(-1);
                 for (int i = 0; i < 100; i++)
                 {
                     dataObjects[i] = new StatisticsRecord()

diff --git a/NewPlatform.Flexberry.ServiceBus.Objects.nuspec b/NewPlatform.Flexberry.ServiceBus.Objects.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ServiceBus.Objects</id>
-    <version>1.2.1-beta04</version>
+    <version>2.0.0-beta01</version>
     <title>Flexberry Service Bus Objects</title>
     <authors>New Platform Ltd.</authors>
     <owners>New Platform Ltd.</owners>
@@ -12,16 +12,25 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Objects for Flexberry Service Bus.</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright © New Platform Ltd. 2018</copyright>
+    <copyright>Copyright © New Platform Ltd. 2021</copyright>
     <tags>Flexberry Service Bus</tags>
     <dependencies>
-      <dependency id="NewPlatform.Flexberry.ORM" version="5.0.0" />
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
+      </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="NewPlatform.Flexberry.ServiceBus.Objects.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.Objects.dll" />
-    <file src="NewPlatform.Flexberry.ServiceBus.Objects.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.Objects.xml" />
-    <file src="NewPlatform.Flexberry.ServiceBus.BusinessServers.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.BusinessServers.dll" />
-    <file src="NewPlatform.Flexberry.ServiceBus.BusinessServers.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.BusinessServers.xml" />
+    <file src="net45\NewPlatform.Flexberry.ServiceBus.Objects.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.Objects.dll" />
+    <file src="net45\NewPlatform.Flexberry.ServiceBus.Objects.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.Objects.xml" />
+    <file src="net45\NewPlatform.Flexberry.ServiceBus.BusinessServers.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.BusinessServers.dll" />
+    <file src="net45\NewPlatform.Flexberry.ServiceBus.BusinessServers.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.BusinessServers.xml" />
+    <file src="netstandard2.0\NewPlatform.Flexberry.ServiceBus.Objects.dll" target="lib\netstandard2.0\NewPlatform.Flexberry.ServiceBus.Objects.dll" />
+    <file src="netstandard2.0\NewPlatform.Flexberry.ServiceBus.Objects.xml" target="lib\netstandard2.0\NewPlatform.Flexberry.ServiceBus.Objects.xml" />
+    <file src="netstandard2.0\NewPlatform.Flexberry.ServiceBus.BusinessServers.dll" target="lib\netstandard2.0\NewPlatform.Flexberry.ServiceBus.BusinessServers.dll" />
+    <file src="netstandard2.0\NewPlatform.Flexberry.ServiceBus.BusinessServers.xml" target="lib\netstandard2.0\NewPlatform.Flexberry.ServiceBus.BusinessServers.xml" />
   </files>
 </package>
diff --git a/NewPlatform.Flexberry.ServiceBus.RabbitMQ.nuspec b/NewPlatform.Flexberry.ServiceBus.RabbitMQ.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ServiceBus.RabbitMQ</id>
-    <version>1.2.3-beta01</version>
+    <version>2.0.0-beta01</version>
     <title>Flexberry Service Bus RabbitMQ</title>
     <authors>New Platform Ltd.</authors>
     <owners>New Platform Ltd.</owners>
@@ -12,21 +12,22 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>RabbitMQ for Flexberry Service Bus.</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright © New Platform Ltd. 2018</copyright>
+    <copyright>Copyright © New Platform Ltd. 2021</copyright>
     <tags>Flexberry Service Bus</tags>
     <dependencies>
-      <dependency id="NewPlatform.Flexberry.ServiceBus.ClientTools" version="1.2.0" />
-      <dependency id="NewPlatform.Flexberry.ServiceBus.Objects" version="1.2.0" />
-      <dependency id="NewPlatform.Flexberry.ServiceBus.Components" version="1.2.0" />
-      <dependency id="NewPlatform.Flexberry.ServiceBus" version="1.2.0" />
-
-      <dependency id="Newtonsoft.Json" version="9.0.0" />
-      <dependency id="RabbitMQ.Client" version="5.1.0" />
-      <dependency id="NewPlatform.Flexberry.EasyNetQ.Management.Client" version="1.0.0" />
+      <group targetFramework=".NETFramework4.5.2">
+        <dependency id="NewPlatform.Flexberry.EasyNetQ.Management.Client" version="1.0.0" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
+        <dependency id="NewPlatform.Flexberry.ServiceBus.ClientTools" version="2.0.0-beta01" />
+        <dependency id="NewPlatform.Flexberry.ServiceBus.Objects" version="2.0.0-beta01" />
+        <dependency id="NewPlatform.Flexberry.ServiceBus.Components" version="2.0.0-beta01" />
+        <dependency id="NewPlatform.Flexberry.ServiceBus" version="2.0.0-beta01" />
+        <dependency id="RabbitMQ.Client" version="5.1.0" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="NewPlatform.Flexberry.ServiceBus.RabbitMQ.dll" target="lib\net45\NewPlatform.Flexberry.ServiceBus.RabbitMQ.dll" />
-    <file src="NewPlatform.Flexberry.ServiceBus.RabbitMQ.xml" target="lib\net45\NewPlatform.Flexberry.ServiceBus.RabbitMQ.xml" />
+    <file src="net452\NewPlatform.Flexberry.ServiceBus.RabbitMQ.dll" target="lib\net452\NewPlatform.Flexberry.ServiceBus.RabbitMQ.dll" />
+    <file src="net452\NewPlatform.Flexberry.ServiceBus.RabbitMQ.xml" target="lib\net452\NewPlatform.Flexberry.ServiceBus.RabbitMQ.xml" />
   </files>
 </package>
diff --git a/NewPlatform.Flexberry.ServiceBus.WinServiceHost/App.config b/NewPlatform.Flexberry.ServiceBus.WinServiceHost/App.config
@@ -90,6 +90,10 @@
         <assemblyIdentity name="Unity.Container" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.11.8.0" newVersion="5.11.8.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.web>

diff --git a/...lexberry.ServiceBus.WinServiceHost/NewPlatform.Flexberry.ServiceBus.WinServiceHost.csproj b/...lexberry.ServiceBus.WinServiceHost/NewPlatform.Flexberry.ServiceBus.WinServiceHost.csproj
@@ -121,6 +121,12 @@
     <Reference Include="ICSSoft.STORMNET.Business.LockService, Version=1.0.0.1, Culture=neutral, PublicKeyToken=68ac0e47b5ef94d8, processorArchitecture=MSIL">
       <HintPath>..\packages\NewPlatform.Flexberry.ORM.6.0.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.MSSQLDataService.6.0.0\lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.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.PostgresDataService.6.0.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.6.0.0\lib\net45\ICSSoft.STORMNET.Collections.dll</HintPath>
     </Reference>
@@ -175,6 +181,9 @@
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Npgsql, Version=3.2.6.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Npgsql.3.2.6\lib\net451\Npgsql.dll</HintPath>
+    </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
       <Private>True</Private>

diff --git a/NewPlatform.Flexberry.ServiceBus.WinServiceHost/packages.config b/NewPlatform.Flexberry.ServiceBus.WinServiceHost/packages.config
@@ -18,7 +18,10 @@
   <package id="NewPlatform.Flexberry.LogService" version="2.0.0" targetFramework="net452" />
   <package id="NewPlatform.Flexberry.LogService.Objects" version="4.0.0" targetFramework="net452" />
   <package id="NewPlatform.Flexberry.ORM" version="6.0.0" targetFramework="net452" />
+  <package id="NewPlatform.Flexberry.ORM.MSSQLDataService" version="6.0.0" targetFramework="net452" />
+  <package id="NewPlatform.Flexberry.ORM.PostgresDataService" version="6.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net452" />
+  <package id="Npgsql" version="3.2.6" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="RabbitMQ.Client" version="5.1.0" targetFramework="net452" />
   <package id="Remotion.Linq" version="2.2.0" targetFramework="net452" />