Merge pull request #234 from Flexberry/feature-update-to-7.0.0

Anisimova2020 · web-flow · commit f67f9eb1b5b8 · 2023-02-17T14:27:07.000+05:00
Update to 7.0.0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,6 +64,11 @@ jobs:
         with:
           dotnet-version: 6.0.x
 
+      - name: Install .NET 7.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 7.0.x
+
       - name: NuGet Restore
         run: dotnet restore "Flexberry ORM.sln"
         
@@ -79,12 +84,18 @@ jobs:
       - name: Test on dotnet 6.0
         run: dotnet test ./NewPlatform.Flexberry.ORM.Tests/bin/Debug/net6.0/NewPlatform.Flexberry.ORM.Tests.dll
 
+      - name: Test on dotnet 7.0
+        run: dotnet test ./NewPlatform.Flexberry.ORM.Tests/bin/Debug/net7.0/NewPlatform.Flexberry.ORM.Tests.dll
+
       - name: Test under mono
         run: mono ./testrunner/xunit.runner.console.$XUNIT_RUNNER/tools/net461/xunit.console.exe ./NewPlatform.Flexberry.ORM.Tests/bin/Debug/net461/NewPlatform.Flexberry.ORM.Tests.dll
 
       - name: Integration test on dotnet 6.0
         run: dotnet test ./NewPlatform.Flexberry.ORM.IntegratedTests/bin/Debug/net6.0/NewPlatform.Flexberry.ORM.IntegratedTests.dll
 
+      - name: Integration test on dotnet 7.0
+        run: dotnet test ./NewPlatform.Flexberry.ORM.IntegratedTests/bin/Debug/net7.0/NewPlatform.Flexberry.ORM.IntegratedTests.dll
+
       - name: Integration test under mono
         run: mono ./testrunner/xunit.runner.console.$XUNIT_RUNNER/tools/net461/xunit.console.exe ./NewPlatform.Flexberry.ORM.IntegratedTests/bin/Debug/net461/NewPlatform.Flexberry.ORM.IntegratedTests.dll
         
@@ -138,6 +149,11 @@ jobs:
         with:
           dotnet-version: 6.0.x
 
+      - name: Install .NET 7.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 7.0.x
+
       - name: NuGet Restore
         run: dotnet restore "Flexberry ORM.sln"
         
@@ -153,12 +169,18 @@ jobs:
       - name: Test on dotnet 6.0
         run: dotnet test ./NewPlatform.Flexberry.ORM.Tests/bin/Debug/net6.0/NewPlatform.Flexberry.ORM.Tests.dll
 
+      - name: Test on dotnet 7.0
+        run: dotnet test ./NewPlatform.Flexberry.ORM.Tests/bin/Debug/net7.0/NewPlatform.Flexberry.ORM.Tests.dll
+
       - name: Test under mono
         run: mono ./testrunner/xunit.runner.console.$XUNIT_RUNNER/tools/net461/xunit.console.exe ./NewPlatform.Flexberry.ORM.Tests/bin/Debug/net461/NewPlatform.Flexberry.ORM.Tests.dll
 
       - name: Integration test on dotnet 6.0
         run: dotnet test ./NewPlatform.Flexberry.ORM.IntegratedTests/bin/Debug/net6.0/NewPlatform.Flexberry.ORM.IntegratedTests.dll
 
+      - name: Integration test on dotnet 7.0
+        run: dotnet test ./NewPlatform.Flexberry.ORM.IntegratedTests/bin/Debug/net7.0/NewPlatform.Flexberry.ORM.IntegratedTests.dll
+
       - name: Integration test under mono
         run: mono ./testrunner/xunit.runner.console.$XUNIT_RUNNER/tools/net461/xunit.console.exe ./NewPlatform.Flexberry.ORM.IntegratedTests/bin/Debug/net461/NewPlatform.Flexberry.ORM.IntegratedTests.dll
         
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Added
+1. Building under .net6 and .net7.
 
 ### Changed
+1. Update Microsoft.Spatial up to 7.10.0.
 
 ### Deprecated
 
diff --git a/ICSSoft.STORMNET.Business.ExternalLangDef/ICSSoft.STORMNET.Business.ExternalLangDef.csproj b/ICSSoft.STORMNET.Business.ExternalLangDef/ICSSoft.STORMNET.Business.ExternalLangDef.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ExternalLangDef</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Business.ExternalLangDef</AssemblyName>
     <AssemblyOriginatorKeyFile>ExternalLangDef.snk</AssemblyOriginatorKeyFile>
diff --git a/ICSSoft.STORMNET.Business.LINQProvider/ICSSoft.STORMNET.Business.LINQProvider.csproj b/ICSSoft.STORMNET.Business.LINQProvider/ICSSoft.STORMNET.Business.LINQProvider.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.Business.LINQProvider</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Business.LINQProvider</AssemblyName>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Spatial" Version="7.7.2" />
+    <PackageReference Include="Microsoft.Spatial" Version="7.10.0" />
     <PackageReference Include="Remotion.Linq" Version="2.2.0" />
   </ItemGroup>
 
diff --git a/ICSSoft.STORMNET.Business.LockService/ICSSoft.STORMNET.Business.LockService.csproj b/ICSSoft.STORMNET.Business.LockService/ICSSoft.STORMNET.Business.LockService.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.Business</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Business.LockService</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.Business.LockService.snk</AssemblyOriginatorKeyFile>
diff --git a/ICSSoft.STORMNET.Business.MSSQLDataService/ICSSoft.STORMNET.Business.MSSQLDataService.csproj b/ICSSoft.STORMNET.Business.MSSQLDataService/ICSSoft.STORMNET.Business.MSSQLDataService.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.Business</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Business.MSSQLDataService</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.Business.MSSQLDataService.snk</AssemblyOriginatorKeyFile>
@@ -10,11 +10,11 @@
     <FileVersion>1.0.0.1</FileVersion>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' ">
     <Reference Include="System.Data" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0'  Or '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
   </ItemGroup>
 
diff --git a/ICSSoft.STORMNET.Business.OracleDataService/ICSSoft.STORMNET.Business.OracleDataService.csproj b/ICSSoft.STORMNET.Business.OracleDataService/ICSSoft.STORMNET.Business.OracleDataService.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.Business</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Business.OracleDataService</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.Business.OracleDataService.snk</AssemblyOriginatorKeyFile>
@@ -10,11 +10,11 @@
     <FileVersion>1.0.0.1</FileVersion>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' ">
     <PackageReference Include="Oracle.ManagedDataAccess" Version="12.1.22" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0'  Or '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.3" />
   </ItemGroup>
 
diff --git a/ICSSoft.STORMNET.Business.PostgresDataService/ICSSoft.STORMNET.Business.PostgresDataService.csproj b/ICSSoft.STORMNET.Business.PostgresDataService/ICSSoft.STORMNET.Business.PostgresDataService.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.Business</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Business.PostgresDataService</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.Business.PostgresDataService.snk</AssemblyOriginatorKeyFile>
diff --git a/ICSSoft.STORMNET.Business/ICSSoft.STORMNET.Business.csproj b/ICSSoft.STORMNET.Business/ICSSoft.STORMNET.Business.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.Business</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Business</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.Business.snk</AssemblyOriginatorKeyFile>
diff --git a/ICSSoft.STORMNET.Collections/ICSSoft.STORMNET.Collections.csproj b/ICSSoft.STORMNET.Collections/ICSSoft.STORMNET.Collections.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.Collections</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Collections</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.Collections.snk</AssemblyOriginatorKeyFile>
diff --git a/ICSSoft.STORMNET.DataObject/ICSSoft.STORMNET.DataObject.csproj b/ICSSoft.STORMNET.DataObject/ICSSoft.STORMNET.DataObject.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.DataObject</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.DataObject.snk</AssemblyOriginatorKeyFile>
@@ -11,12 +11,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Spatial" Version="7.7.2" />
+    <PackageReference Include="Microsoft.Spatial" Version="7.10.0" />
     <PackageReference Include="NewPlatform.Flexberry.LogService" Version="2.1.0" />
     <PackageReference Include="Unity.Abstractions" Version="5.11.6" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0'  Or '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.6.0" />
   </ItemGroup>
 
diff --git a/ICSSoft.STORMNET.FunctionalLanguage/ICSSoft.STORMNET.FunctionalLanguage.csproj b/ICSSoft.STORMNET.FunctionalLanguage/ICSSoft.STORMNET.FunctionalLanguage.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.FunctionalLanguage</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.FunctionalLanguage</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.FunctionalLanguage.snk</AssemblyOriginatorKeyFile>
diff --git a/ICSSoft.STORMNET.Tools/ICSSoft.STORMNET.Tools.csproj b/ICSSoft.STORMNET.Tools/ICSSoft.STORMNET.Tools.csproj
@@ -1,25 +1,26 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.Tools</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.Tools</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.Tools.snk</AssemblyOriginatorKeyFile>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <AssemblyVersion>1.0.0.1</AssemblyVersion>
     <FileVersion>1.0.0.1</FileVersion>
+	<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NewPlatform.Flexberry.LogService" Version="2.1.0" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' ">
     <Reference Include="System.DirectoryServices" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0'  Or '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="System.DirectoryServices" Version="4.5.0" />
   </ItemGroup>
 
diff --git a/ICSSoft.STORMNET.UserDataTypes/ICSSoft.STORMNET.UserDataTypes.csproj b/ICSSoft.STORMNET.UserDataTypes/ICSSoft.STORMNET.UserDataTypes.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.STORMNET.UserDataTypes</RootNamespace>
     <AssemblyName>ICSSoft.STORMNET.UserDataTypes</AssemblyName>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
diff --git a/NewPlatform.Flexberry.ORM.CurrentUserService/NewPlatform.Flexberry.ORM.CurrentUserService.csproj b/NewPlatform.Flexberry.ORM.CurrentUserService/NewPlatform.Flexberry.ORM.CurrentUserService.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>ICSSoft.Services</RootNamespace>
     <AssemblyName>NewPlatform.Flexberry.ORM.CurrentUserService</AssemblyName>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
diff --git a/NewPlatform.Flexberry.ORM.IntegratedTests/NewPlatform.Flexberry.ORM.IntegratedTests.csproj b/NewPlatform.Flexberry.ORM.IntegratedTests/NewPlatform.Flexberry.ORM.IntegratedTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <RootNamespace>NewPlatform.Flexberry.ORM.IntegratedTests</RootNamespace>
     <AssemblyName>NewPlatform.Flexberry.ORM.IntegratedTests</AssemblyName>
     <AssemblyOriginatorKeyFile>ICSSoft.STORMNET.Tests.snk</AssemblyOriginatorKeyFile>
diff --git a/NewPlatform.Flexberry.ORM.MSSQLDataService.nuspec b/NewPlatform.Flexberry.ORM.MSSQLDataService.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ORM.MSSQLDataService</id>
-    <version>6.1.0</version>
+    <version>7.0.0</version>
     <title>Flexberry ORM</title>
     <authors>New Platform Ltd</authors>
     <owners>New Platform Ltd</owners>
@@ -13,24 +13,37 @@
     <description>Flexberry ORM package.</description>
     <releaseNotes>
       Added
-      1. DbProviderFactory
+      1. Building under .net6 and .net7.
     </releaseNotes>
     <copyright>Copyright New Platform Ltd 2023</copyright>
     <tags>Flexberry ORM</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="NewPlatform.Flexberry.ORM" version="6.1.0" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.0.0" />
       </group>
       <group targetFramework=".NETStandard2.0">
-        <dependency id="NewPlatform.Flexberry.ORM" version="6.1.0" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.0.0" />
         <dependency id="System.Data.SqlClient" version="4.6.1" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll" target="lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.dll" />
     <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\net45\ICSSoft.STORMNET.Business.MSSQLDataService.xml" target="lib\net45\ICSSoft.STORMNET.Business.MSSQLDataService.xml" />
+	
+	  <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\net461\ICSSoft.STORMNET.Business.MSSQLDataService.dll" target="lib\net461\ICSSoft.STORMNET.Business.MSSQLDataService.dll" />
+    <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\net461\ICSSoft.STORMNET.Business.MSSQLDataService.xml" target="lib\net461\ICSSoft.STORMNET.Business.MSSQLDataService.xml" />
+	
     <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\netstandard2.0\ICSSoft.STORMNET.Business.MSSQLDataService.dll" target="lib\netstandard2.0\ICSSoft.STORMNET.Business.MSSQLDataService.dll" />
     <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\netstandard2.0\ICSSoft.STORMNET.Business.MSSQLDataService.xml" target="lib\netstandard2.0\ICSSoft.STORMNET.Business.MSSQLDataService.xml" />
+	
+	  <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\netcoreapp3.1\ICSSoft.STORMNET.Business.MSSQLDataService.dll" target="lib\netcoreapp3.1\ICSSoft.STORMNET.Business.MSSQLDataService.dll" />
+    <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\netcoreapp3.1\ICSSoft.STORMNET.Business.MSSQLDataService.xml" target="lib\netcoreapp3.1\ICSSoft.STORMNET.Business.MSSQLDataService.xml" />
+	
+	  <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\net6.0\ICSSoft.STORMNET.Business.MSSQLDataService.dll" target="lib\net6.0\ICSSoft.STORMNET.Business.MSSQLDataService.dll" />
+    <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\net6.0\ICSSoft.STORMNET.Business.MSSQLDataService.xml" target="lib\net6.0\ICSSoft.STORMNET.Business.MSSQLDataService.xml" />
+	
+	  <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\net7.0\ICSSoft.STORMNET.Business.MSSQLDataService.dll" target="lib\net7.0\ICSSoft.STORMNET.Business.MSSQLDataService.dll" />
+    <file src="ICSSoft.STORMNET.Business.MSSQLDataService\bin\$configuration$\net7.0\ICSSoft.STORMNET.Business.MSSQLDataService.xml" target="lib\net7.0\ICSSoft.STORMNET.Business.MSSQLDataService.xml" />
   </files>
 </package>
diff --git a/NewPlatform.Flexberry.ORM.OracleDataService.nuspec b/NewPlatform.Flexberry.ORM.OracleDataService.nuspec
diff --git a/NewPlatform.Flexberry.ORM.PostgresDataService.nuspec b/NewPlatform.Flexberry.ORM.PostgresDataService.nuspec
diff --git a/NewPlatform.Flexberry.ORM.Test.Objects/NewPlatform.Flexberry.ORM.Tests.Objects.csproj b/NewPlatform.Flexberry.ORM.Test.Objects/NewPlatform.Flexberry.ORM.Tests.Objects.csproj
diff --git a/NewPlatform.Flexberry.ORM.Tests.BusinessServers/NewPlatform.Flexberry.ORM.Tests.BusinessServers.csproj b/NewPlatform.Flexberry.ORM.Tests.BusinessServers/NewPlatform.Flexberry.ORM.Tests.BusinessServers.csproj
diff --git a/NewPlatform.Flexberry.ORM.Tests/NewPlatform.Flexberry.ORM.Tests.csproj b/NewPlatform.Flexberry.ORM.Tests/NewPlatform.Flexberry.ORM.Tests.csproj
diff --git a/NewPlatform.Flexberry.ORM.UnityFactory/NewPlatform.Flexberry.ORM.UnityFactory.csproj b/NewPlatform.Flexberry.ORM.UnityFactory/NewPlatform.Flexberry.ORM.UnityFactory.csproj
diff --git a/NewPlatform.Flexberry.ORM.nuspec b/NewPlatform.Flexberry.ORM.nuspec
