Skip to content

Commit 8d6f33a

Browse files
committed
core
1 parent 061a681 commit 8d6f33a

25 files changed

+220
-201
lines changed

net452/SiteServer.API.Tests/SiteServer.API.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
<Reference Include="QueryBuilder, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
7474
<HintPath>..\..\packages\SqlKata.1.1.7\lib\net45\QueryBuilder.dll</HintPath>
7575
</Reference>
76-
<Reference Include="SiteServer.Plugin, Version=2.2.13.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\SiteServer.Plugin.2.2.13-beta\lib\net452\SiteServer.Plugin.dll</HintPath>
76+
<Reference Include="SiteServer.Plugin, Version=2.2.14.0, Culture=neutral, processorArchitecture=MSIL">
77+
<HintPath>..\..\packages\SiteServer.Plugin.2.2.14-beta\lib\net452\SiteServer.Plugin.dll</HintPath>
7878
</Reference>
7979
<Reference Include="System" />
8080
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

net452/SiteServer.API.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
1313
<package id="Npgsql" version="4.0.5" targetFramework="net461" />
1414
<package id="Oracle.ManagedDataAccess" version="18.6.0" targetFramework="net461" />
15-
<package id="SiteServer.Plugin" version="2.2.13-beta" targetFramework="net461" />
15+
<package id="SiteServer.Plugin" version="2.2.14-beta" targetFramework="net461" />
1616
<package id="SqlKata" version="1.1.7" targetFramework="net452" />
1717
<package id="System.Buffers" version="4.4.0" targetFramework="net461" />
1818
<package id="System.Memory" version="4.5.2" targetFramework="net461" />

net452/SiteServer.BackgroundPages/SiteServer.BackgroundPages.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<Reference Include="QueryBuilder, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
6262
<HintPath>..\..\packages\SqlKata.1.1.7\lib\net45\QueryBuilder.dll</HintPath>
6363
</Reference>
64-
<Reference Include="SiteServer.Plugin, Version=2.2.13.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\SiteServer.Plugin.2.2.13-beta\lib\net452\SiteServer.Plugin.dll</HintPath>
64+
<Reference Include="SiteServer.Plugin, Version=2.2.14.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\SiteServer.Plugin.2.2.14-beta\lib\net452\SiteServer.Plugin.dll</HintPath>
6666
</Reference>
6767
<Reference Include="System" />
6868
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

net452/SiteServer.BackgroundPages/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" />
1313
<package id="Npgsql" version="4.0.5" targetFramework="net461" />
1414
<package id="Oracle.ManagedDataAccess" version="18.6.0" targetFramework="net461" />
15-
<package id="SiteServer.Plugin" version="2.2.13-beta" targetFramework="net452" />
15+
<package id="SiteServer.Plugin" version="2.2.14-beta" targetFramework="net452" />
1616
<package id="SqlKata" version="1.1.7" targetFramework="net452" />
1717
<package id="System.Buffers" version="4.4.0" targetFramework="net461" requireReinstallation="true" />
1818
<package id="System.Memory" version="4.5.2" targetFramework="net461" requireReinstallation="true" />

net452/SiteServer.CMS.Tests/SiteServer.CMS.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
<Reference Include="QueryBuilder, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
8080
<HintPath>..\..\packages\SqlKata.1.1.7\lib\net45\QueryBuilder.dll</HintPath>
8181
</Reference>
82-
<Reference Include="SiteServer.Plugin, Version=2.2.12.0, Culture=neutral, processorArchitecture=MSIL">
83-
<HintPath>..\..\packages\SiteServer.Plugin.2.2.12-beta\lib\net452\SiteServer.Plugin.dll</HintPath>
82+
<Reference Include="SiteServer.Plugin, Version=2.2.14.0, Culture=neutral, processorArchitecture=MSIL">
83+
<HintPath>..\..\packages\SiteServer.Plugin.2.2.14-beta\lib\net452\SiteServer.Plugin.dll</HintPath>
8484
</Reference>
8585
<Reference Include="System" />
8686
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

net452/SiteServer.CMS.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
1515
<package id="Npgsql" version="4.0.5" targetFramework="net461" />
1616
<package id="Oracle.ManagedDataAccess" version="18.6.0" targetFramework="net461" />
17-
<package id="SiteServer.Plugin" version="2.2.12-beta" targetFramework="net461" />
17+
<package id="SiteServer.Plugin" version="2.2.14-beta" targetFramework="net461" />
1818
<package id="SqlKata" version="1.1.7" targetFramework="net452" />
1919
<package id="System.Buffers" version="4.4.0" targetFramework="net461" />
2020
<package id="System.Memory" version="4.5.2" targetFramework="net461" />

net452/SiteServer.CMS/Apis/UtilsApi.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,16 @@ public void ExtractZip(string zipFilePath, string directoryPath)
111111
ZipUtils.ExtractZip(zipFilePath, directoryPath);
112112
}
113113

114+
public string JsonSerialize(object obj)
115+
{
116+
return TranslateUtils.JsonSerialize(obj);
117+
}
118+
119+
public T JsonDeserialize<T>(string json, T defaultValue = default(T))
120+
{
121+
return TranslateUtils.JsonDeserialize(json, defaultValue);
122+
}
123+
114124
public IAuthenticatedRequest GetAuthenticatedRequest(HttpRequestMessage request)
115125
{
116126
if (request.Properties.ContainsKey("AuthenticatedRequest"))

net452/SiteServer.CMS/Core/RestRoutes/V1/ApiContentsParameters.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Net.Http;
44
using SiteServer.CMS.Fx;
55
using SiteServer.CMS.Plugin.Impl;
6+
using SiteServer.Plugin;
67
using SiteServer.Utils;
78

89
namespace SiteServer.CMS.Core.RestRoutes.V1

net452/SiteServer.CMS/SiteServer.CMS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
<Reference Include="QueryBuilder, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
8383
<HintPath>..\..\packages\SqlKata.1.1.7\lib\net45\QueryBuilder.dll</HintPath>
8484
</Reference>
85-
<Reference Include="SiteServer.Plugin, Version=2.2.13.0, Culture=neutral, processorArchitecture=MSIL">
86-
<HintPath>..\..\packages\SiteServer.Plugin.2.2.13-beta\lib\net452\SiteServer.Plugin.dll</HintPath>
85+
<Reference Include="SiteServer.Plugin, Version=2.2.14.0, Culture=neutral, processorArchitecture=MSIL">
86+
<HintPath>..\..\packages\SiteServer.Plugin.2.2.14-beta\lib\net452\SiteServer.Plugin.dll</HintPath>
8787
</Reference>
8888
<Reference Include="System" />
8989
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

net452/SiteServer.CMS/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<package id="NuGet.Packaging.Core" version="4.5.0" targetFramework="net461" />
2020
<package id="NuGet.Versioning" version="4.5.0" targetFramework="net461" />
2121
<package id="Oracle.ManagedDataAccess" version="18.6.0" targetFramework="net461" />
22-
<package id="SiteServer.Plugin" version="2.2.13-beta" targetFramework="net452" />
22+
<package id="SiteServer.Plugin" version="2.2.14-beta" targetFramework="net452" />
2323
<package id="SqlKata" version="1.1.7" targetFramework="net452" />
2424
<package id="System.Buffers" version="4.4.0" targetFramework="net461" />
2525
<package id="System.Data.Common" version="4.3.0" targetFramework="net452" />

0 commit comments

Comments
 (0)