Skip to content

Commit 19e2ee0

Browse files
committed
Merge branch 'develop'
2 parents 2b14aeb + 59d28be commit 19e2ee0

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install .NET Core
2828
uses: actions/setup-dotnet@v3
2929
with:
30-
dotnet-version: 6.0.x
30+
dotnet-version: 8.0.x
3131

3232
- name: Install dependencies
3333
run: dotnet restore ${{env.SOLUTION}}

src/Preview/Preview.Controller/Packaging/Steps/PreviewCleaner.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
using System.Collections.Generic;
44
using System.Data;
55
using System.Data.Common;
6-
using System.Data.SqlClient;
76
using System.Linq;
87
using System.Runtime.Caching;
98
using System.Text;
109
using System.Threading;
1110
using System.Threading.Tasks;
1211
using System.Threading.Tasks.Dataflow;
13-
using SenseNet.ContentRepository.Search.Indexing;
12+
using Microsoft.Data.SqlClient;
1413
using SenseNet.ContentRepository.Storage;
1514
using SenseNet.ContentRepository.Storage.Data;
1615
using SenseNet.Diagnostics;

src/Preview/Preview.Controller/Preview.Controller.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<PackageId>SenseNet.Preview.Controller</PackageId>
55
<AssemblyName>SenseNet.Preview.Controller</AssemblyName>
66
<RootNamespace>SenseNet.Preview.Controller</RootNamespace>
7-
<TargetFramework>netstandard2.0</TargetFramework>
8-
<Version>7.3.7</Version>
7+
<TargetFramework>net8.0</TargetFramework>
8+
<Version>7.4.0</Version>
99
<Authors>kavics,tusmester,aniko,lajos,bezoo</Authors>
1010
<Company>Sense/Net Inc.</Company>
1111
<Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -19,10 +19,12 @@
1919
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2020
<Product>sensenet Preview</Product>
2121
<Description>sensenet Preview Controller contains the server-side components of the preview functionality.</Description>
22+
<IncludeSymbols>true</IncludeSymbols>
23+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2224
</PropertyGroup>
2325

2426
<ItemGroup>
25-
<PackageReference Include="SenseNet.ContentRepository" Version="7.7.42" />
27+
<PackageReference Include="SenseNet.ContentRepository" Version="7.8.0" />
2628
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
2729
</ItemGroup>
2830

src/Preview/Preview.Install/Preview.Install.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<PackageId>SenseNet.Preview.Install</PackageId>
55
<AssemblyName>SenseNet.Preview.Install</AssemblyName>
66
<RootNamespace>SenseNet.Preview.Install</RootNamespace>
7-
<TargetFramework>netstandard2.0</TargetFramework>
8-
<Version>7.3.5</Version>
7+
<TargetFramework>net8.0</TargetFramework>
8+
<Version>7.4.0</Version>
99
<Authors>kavics,tusmester,aniko</Authors>
1010
<Company>Sense/Net Inc.</Company>
1111
<Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -19,6 +19,8 @@
1919
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2020
<Product>sensenet Preview</Product>
2121
<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>
22+
<IncludeSymbols>true</IncludeSymbols>
23+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2224
</PropertyGroup>
2325

2426
<ItemGroup>

src/Preview/Preview/Preview.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>SenseNet.Preview</AssemblyName>
66
<RootNamespace>SenseNet.Preview</RootNamespace>
7-
<Version>7.2.4</Version>
7+
<Version>7.3.0</Version>
88
<Company>Sense/Net Inc.</Company>
99
<Description>General document preview library for the sensenet platform containing common interfaces.</Description>
1010
<PackageId>SenseNet.Preview</PackageId>
@@ -18,10 +18,12 @@
1818
<PackageIconUrl>https://raw.githubusercontent.com/SenseNet/sn-resources/master/images/sn-icon/sensenet-icon-64.png</PackageIconUrl>
1919
<Authors>kavics,aniko,lajos,tusmester</Authors>
2020
<Copyright>Copyright © Sense/Net Inc.</Copyright>
21+
<IncludeSymbols>true</IncludeSymbols>
22+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2123
</PropertyGroup>
2224

2325
<ItemGroup>
24-
<PackageReference Include="SenseNet.Tools" Version="3.2.13" />
26+
<PackageReference Include="SenseNet.Tools" Version="3.3.0" />
2527
</ItemGroup>
2628

2729
</Project>

src/Preview/SenseNet.Preview.sln

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30002.166
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35527.113 d17.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{378DDF9F-0FA8-4F81-9E03-0A6AD51973AB}"
77
ProjectSection(SolutionItems) = preProject
@@ -14,8 +14,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview", "Preview\Preview.
1414
EndProject
1515
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.Controller", "Preview.Controller\Preview.Controller.csproj", "{64FFBB21-44DB-4354-9379-757AEBE2FA74}"
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.Tests", "Preview.Tests\Preview.Tests.csproj", "{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}"
18-
EndProject
1917
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.Install", "Preview.Install\Preview.Install.csproj", "{C6D86AA2-C8A4-4E33-966C-4A0C1D1F029E}"
2018
EndProject
2119
Global
@@ -32,10 +30,6 @@ Global
3230
{64FFBB21-44DB-4354-9379-757AEBE2FA74}.Debug|Any CPU.Build.0 = Debug|Any CPU
3331
{64FFBB21-44DB-4354-9379-757AEBE2FA74}.Release|Any CPU.ActiveCfg = Release|Any CPU
3432
{64FFBB21-44DB-4354-9379-757AEBE2FA74}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{4A13AFF8-67B6-4D4A-B008-DC4A0E89DE4B}.Release|Any CPU.Build.0 = Release|Any CPU
3933
{C6D86AA2-C8A4-4E33-966C-4A0C1D1F029E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4034
{C6D86AA2-C8A4-4E33-966C-4A0C1D1F029E}.Debug|Any CPU.Build.0 = Debug|Any CPU
4135
{C6D86AA2-C8A4-4E33-966C-4A0C1D1F029E}.Release|Any CPU.ActiveCfg = Release|Any CPU

0 commit comments

Comments
 (0)