Merge branch 'develop'

SenseNet · Feb 10, 2025 · 19e2ee0 · 19e2ee0
2 parents 2b14aeb + 59d28be
commit 19e2ee0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore ${{env.SOLUTION}}

diff --git a/src/Preview/Preview.Controller/Packaging/Steps/PreviewCleaner.cs b/src/Preview/Preview.Controller/Packaging/Steps/PreviewCleaner.cs
@@ -3,14 +3,13 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Runtime.Caching;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
-using SenseNet.ContentRepository.Search.Indexing;
+using Microsoft.Data.SqlClient;
 using SenseNet.ContentRepository.Storage;
 using SenseNet.ContentRepository.Storage.Data;
 using SenseNet.Diagnostics;

diff --git a/src/Preview/Preview.Controller/Preview.Controller.csproj b/src/Preview/Preview.Controller/Preview.Controller.csproj
@@ -4,8 +4,8 @@
     <PackageId>SenseNet.Preview.Controller</PackageId>
     <AssemblyName>SenseNet.Preview.Controller</AssemblyName>
     <RootNamespace>SenseNet.Preview.Controller</RootNamespace>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>7.3.7</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>7.4.0</Version>
     <Authors>kavics,tusmester,aniko,lajos,bezoo</Authors>
     <Company>Sense/Net Inc.</Company>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -19,10 +19,12 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Product>sensenet Preview</Product>
     <Description>sensenet Preview Controller contains the server-side components of the preview functionality.</Description>
+	<IncludeSymbols>true</IncludeSymbols>
+	<SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SenseNet.ContentRepository" Version="7.7.42" />
+    <PackageReference Include="SenseNet.ContentRepository" Version="7.8.0" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
   </ItemGroup>
 

diff --git a/src/Preview/Preview.Install/Preview.Install.csproj b/src/Preview/Preview.Install/Preview.Install.csproj
@@ -4,8 +4,8 @@
     <PackageId>SenseNet.Preview.Install</PackageId>
     <AssemblyName>SenseNet.Preview.Install</AssemblyName>
     <RootNamespace>SenseNet.Preview.Install</RootNamespace>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>7.3.5</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>7.4.0</Version>
     <Authors>kavics,tusmester,aniko</Authors>
     <Company>Sense/Net Inc.</Company>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -19,6 +19,8 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Product>sensenet Preview</Product>
     <Description>sensenet Preview installer contains the install content for the Preview functionality in sensenet. This package should be installed only in a single project.</Description>
+	<IncludeSymbols>true</IncludeSymbols>
+	<SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Preview/Preview/Preview.csproj b/src/Preview/Preview/Preview.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>SenseNet.Preview</AssemblyName>
     <RootNamespace>SenseNet.Preview</RootNamespace>
-    <Version>7.2.4</Version>
+    <Version>7.3.0</Version>
     <Company>Sense/Net Inc.</Company>
     <Description>General document preview library for the sensenet platform containing common interfaces.</Description>
     <PackageId>SenseNet.Preview</PackageId>
@@ -18,10 +18,12 @@
     <PackageIconUrl>https://raw.githubusercontent.com/SenseNet/sn-resources/master/images/sn-icon/sensenet-icon-64.png</PackageIconUrl>
     <Authors>kavics,aniko,lajos,tusmester</Authors>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
+	<IncludeSymbols>true</IncludeSymbols>
+	<SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SenseNet.Tools" Version="3.2.13" />
+	<PackageReference Include="SenseNet.Tools" Version="3.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Preview/SenseNet.Preview.sln b/src/Preview/SenseNet.Preview.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30002.166
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35527.113 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{378DDF9F-0FA8-4F81-9E03-0A6AD51973AB}"
 	ProjectSection(SolutionItems) = preProject
@@ -14,8 +14,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview", "Preview\Preview.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.Controller", "Preview.Controller\Preview.Controller.csproj", "{64FFBB21-44DB-4354-9379-757AEBE2FA74}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.Tests", "Preview.Tests\Preview.Tests.csproj", "{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.Install", "Preview.Install\Preview.Install.csproj", "{C6D86AA2-C8A4-4E33-966C-4A0C1D1F029E}"
 EndProject
 Global
@@ -32,10 +30,6 @@ Global
 		{64FFBB21-44DB-4354-9379-757AEBE2FA74}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{64FFBB21-44DB-4354-9379-757AEBE2FA74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64FFBB21-44DB-4354-9379-757AEBE2FA74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6D86AA2-C8A4-4E33-966C-4A0C1D1F029E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C6D86AA2-C8A4-4E33-966C-4A0C1D1F029E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6D86AA2-C8A4-4E33-966C-4A0C1D1F029E}.Release|Any CPU.ActiveCfg = Release|Any CPU