Skip to content

Commit 2e90a3d

Browse files
DmitrijOkeanijDmitrijOkeanij
committed
Sections fix
1 parent 2122851 commit 2e90a3d

11 files changed

Lines changed: 24 additions & 15 deletions

File tree

‎Client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sunengine-client",
3-
"version": "2.12.0",
3+
"version": "2.12.1",
44
"description": "SunEngine - web engine with support of blog, forum and articles functionality",
55
"productName": "SunEngine",
66
"author": "Dmitrij Polianin",

‎README.RU.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# SunEngine
1111

12-
<a href="#"><img src="https://img.shields.io/static/v1?label=%D0%92%D0%B5%D1%80%D1%81%D0%B8%D1%8F&message=v2.12.0&color=green"></a>
12+
<a href="#"><img src="https://img.shields.io/static/v1?label=%D0%92%D0%B5%D1%80%D1%81%D0%B8%D1%8F&message=v2.12.1&color=green"></a>
1313
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
1414
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
1515
<br/>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build on AspNet Core, VueJS, Quasar.</h3>
88

99
# SunEngine
1010

11-
<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.12.0&color=green"></a>
11+
<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.12.1&color=green"></a>
1212
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
1313
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
1414
<br/>

‎Scripts/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ SERVER_PATH="${PROJECT_ROOT}/Server"
66
CLIENT_PATH="${PROJECT_ROOT}/Client"
77
CONFIG_PATH="${PROJECT_ROOT}/Config.server.template"
88
BUILD_PATH="${PROJECT_ROOT}/build"
9-
NPM_UTIL="yarn"
9+
NPM_UTIL="npm"
1010

‎Scripts/publish.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,25 @@ echo -e "${GREEN} REMOTE_SYSTEMD_SERVICE_NAME = ${REMOTE_SYSTEMD_SERVICE_NAME} $
5151

5252
echo -e "\n${GREEN}Syncing build ${NC}\n"
5353

54+
echo "rsync"
55+
echo "rsync -arvzhe ssh --progress --stats --exclude 'Config' $LOCAL_BUILD_PATH/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY"
56+
57+
#rsync -arvzhe ssh --progress --stats --exclude 'Config' $LOCAL_BUILD_PATH/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY
5458
rsync -arvzhe ssh --progress --stats --exclude 'Config' --chown=$REMOTE_DIRECTORY_OWNER:$REMOTE_DIRECTORY_GROUP $LOCAL_BUILD_PATH/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY
5559

60+
5661
echo -e "\n${GREEN}Syncing Config ignore-existing ${NC}\n"
5762

63+
#rsync -arvzhe ssh --progress --stats --ignore-existing $LOCAL_BUILD_PATH/Config/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY/Config
5864
rsync -arvzhe ssh --progress --stats --ignore-existing --chown=$REMOTE_DIRECTORY_OWNER:$REMOTE_DIRECTORY_GROUP $LOCAL_BUILD_PATH/Config/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY/Config
5965

66+
6067
echo -e "\n${GREEN}Restarting systemd service and reload nginx ${NC}\n"
6168

6269
ssh ${REMOTE_USER}@${REMOTE_HOST} << EOF
6370
71+
#chown $REMOTE_DIRECTORY_OWNER:$REMOTE_DIRECTORY_GROUP $REMOTE_DIRECTORY/*
72+
6473
cd ${REMOTE_DIRECTORY}/Server
6574
if dotnet SunEngine.dll test-db-con nologo; then
6675
{

‎Server/SunEngine.Admin/SunEngine.Admin.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="NJsonSchema" Version="10.3.2" />
9+
<PackageReference Include="NJsonSchema" Version="10.3.3" />
1010
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
1111
<PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
1212
</ItemGroup>

‎Server/SunEngine.Cli/SunEngine.Cli.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
6-
<Version>2.12.0</Version>
6+
<Version>2.12.1</Version>
77
<Title>SunEngine</Title>
88
<Authors>Dmitrij Polianin</Authors>
99
<Description>Site engine with blog, forum and articles functionalities on Asp.Net Core and Vue.Js.</Description>

‎Server/SunEngine.Core/Cache/Services/SectionsCache.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public void Initialize()
7171
try
7272
{
7373
serverSectionsTmp.Add(section.Name,
74-
new SectionServerCached(section, sectionTypes.Sections[section.Name].ServerSectionType, rolesCache));
75-
clientSectionsTmp.Add(new SectionClientCached(section, sectionTypes.Sections[section.Name].ClientSectionType, rolesCache));
74+
new SectionServerCached(section, sectionTypes.Sections[section.Type].ServerSectionType, rolesCache));
75+
clientSectionsTmp.Add(new SectionClientCached(section, sectionTypes.Sections[section.Type].ClientSectionType, rolesCache));
7676
}
7777
catch
7878
{
@@ -83,4 +83,4 @@ public void Initialize()
8383
ClientSections = clientSectionsTmp.ToImmutableList();
8484
}
8585
}
86-
}
86+
}

‎Server/SunEngine.Core/SunEngine.Core.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
<PropertyGroup>
44
<TargetFramework>net5.0</TargetFramework>
5-
<Version>2.12.0</Version>
5+
<Version>2.12.1</Version>
66
<LangVersion>default</LangVersion>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<PackageReference Include="Flurl" Version="3.0.1" />
11-
<PackageReference Include="HtmlSanitizer" Version="5.0.372" />
11+
<PackageReference Include="HtmlSanitizer" Version="5.0.376" />
1212
<PackageReference Include="linq2db" Version="3.2.3" />
1313
<PackageReference Include="linq2db.Identity" Version="3.2.0" />
1414
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
1515
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
1616
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.1" />
18+
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.2" />
1919
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
2020
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
21-
<PackageReference Include="NJsonSchema" Version="10.3.2" />
21+
<PackageReference Include="NJsonSchema" Version="10.3.3" />
2222
<PackageReference Include="Npgsql" Version="5.0.1.1" />
2323
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0013" />
2424
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />

‎Server/SunEngine.DataSeed/SunEngine.DataSeed.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="linq2db" Version="3.2.3" />
1010
<PackageReference Include="linq2db.Identity" Version="3.2.0" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
12-
<PackageReference Include="NJsonSchema" Version="10.3.2" />
12+
<PackageReference Include="NJsonSchema" Version="10.3.3" />
1313
<PackageReference Include="Npgsql" Version="5.0.1.1" />
1414
</ItemGroup>
1515

0 commit comments

Comments
 (0)