Mirror
/
SiteServer-CMS
mirror of https://github.com/siteserver/cms.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

bugfix

pull/3740/head
timlai 1 year ago
parent
de4ce61537
commit
cd3b1ec30a
14 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .vscode/launch.json
  2. 4
      azure-pipelines.yml
  3. 8
      docker/Dockerfile.core
  4. 2
      gulpfile.js
  5. 4
      src/Datory/Datory.csproj
  6. 4
      src/SSCMS.Cli/SSCMS.Cli.csproj
  7. 6
      src/SSCMS.Core/SSCMS.Core.csproj
  8. 4
      src/SSCMS.Web/SSCMS.Web.csproj
  9. 6
      src/SSCMS/SSCMS.csproj
  10. 2
      tests/Datory.Tests/Datory.Tests.csproj
  11. 2
      tests/SSCMS.Cli.Tests/SSCMS.Cli.Tests.csproj
  12. 2
      tests/SSCMS.Core.Tests/SSCMS.Core.Tests.csproj
  13. 2
      tests/SSCMS.Tests/SSCMS.Tests.csproj
  14. 2
      tests/SSCMS.Web.Tests/SSCMS.Web.Tests.csproj

4
.vscode/launch.json
View File

@ -6,9 +6,9 @@
"type": "coreclr",
"request": "launch",
// "preLaunchTask": "npm: dotnet-build",
"program": "${workspaceFolder}/src/SSCMS.Web/bin/Debug/net7.0/SSCMS.Web.dll",
"program": "${workspaceFolder}/src/SSCMS.Web/bin/Debug/net8.0/SSCMS.Web.dll",
"args": [],
"cwd": "${workspaceFolder}/src/SSCMS.Web/bin/Debug/net7.0/",
"cwd": "${workspaceFolder}/src/SSCMS.Web/bin/Debug/net8.0/",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",

4
azure-pipelines.yml
View File

@ -7,10 +7,10 @@ trigger:
- master
variables:
netCoreSdkVersion: '7.0.101'
netCoreSdkVersion: '8.0.201'
buildConfiguration: 'Release'
imageName: 'sscms/core'
productVersion: '7.2.2'
productVersion: '7.3.0'
jobs:

8
docker/Dockerfile.core
View File

@ -5,9 +5,9 @@ EXPOSE 443
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /sscms
RUN wget https://dl.sscms.com/cms/7.2.2/sscms-7.2.2-linux-x64.tar.gz
RUN tar -xzf sscms-7.2.2-linux-x64.tar.gz
RUN rm sscms-7.2.2-linux-x64.tar.gz -f
RUN wget https://dl.sscms.com/cms/7.3.0/sscms-7.3.0-linux-x64.tar.gz
RUN tar -xzf sscms-7.3.0-linux-x64.tar.gz
RUN rm sscms-7.3.0-linux-x64.tar.gz -f
RUN mv /sscms/wwwroot /sscms/_wwwroot
RUN echo `date +%Y-%m-%d-%H-%M-%S` > /sscms/_wwwroot/sitefiles/version.txt
@ -16,4 +16,4 @@ WORKDIR /app
COPY --from=build /sscms .
ENTRYPOINT ["dotnet", "SSCMS.Web.dll"]
# docker build -f Dockerfile.core --no-cache -t sscms/core:latest -t sscms/core:7.2.2 .
# docker build -f Dockerfile.core --no-cache -t sscms/core:latest -t sscms/core:7.3.0 .

2
gulpfile.js
View File

@ -11,7 +11,7 @@ const runSequence = require('gulp4-run-sequence');
const ALY = require('aliyun-sdk');
let os = '';
const version = process.env.PRODUCTVERSION || '7.2.2';
const version = process.env.PRODUCTVERSION || '7.3.0';
const timestamp = (new Date()).getTime();
let publishDir = '';
let htmlDict = {};

4
src/Datory/Datory.csproj
View File

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<PackageId>Datory</PackageId>
<Version>7.2.2</Version>
<Version>7.3.0</Version>
<Authors>SSCMS</Authors>
<Company>SSCMS</Company>
<Description>基于 Dapper 及 SqlKata 的通用数据库操作库，支持SqlServer、MySql、PostgreSql、SQLite以及DM8。</Description>

4
src/SSCMS.Cli/SSCMS.Cli.csproj
View File

@ -2,10 +2,10 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<ApplicationIcon>logo.ico</ApplicationIcon>
<Version>7.2.2</Version>
<Version>7.3.0</Version>
<NoWarn>$(NoWarn);1591</NoWarn>
<AssemblyName>SSCMS.Cli</AssemblyName>
<StartupObject>SSCMS.Cli.Program</StartupObject>

6
src/SSCMS.Core/SSCMS.Core.csproj
View File

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>7.2.2</Version>
<Version>7.3.0</Version>
</PropertyGroup>
<ItemGroup>
@ -40,7 +40,7 @@
</ItemGroup>
<ItemGroup>
<!-- <PackageReference Include="SSCMS" Version="7.2.2" /> -->
<!-- <PackageReference Include="SSCMS" Version="7.3.0" /> -->
<ProjectReference Include="..\SSCMS\SSCMS.csproj" />
</ItemGroup>

4
src/SSCMS.Web/SSCMS.Web.csproj
View File

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>7.2.2</Version>
<Version>7.3.0</Version>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext>
<ApplicationIcon>logo.ico</ApplicationIcon>

6
src/SSCMS/SSCMS.csproj
View File

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<PackageId>SSCMS</PackageId>
<Version>7.2.2</Version>
<Version>7.3.0</Version>
<Authors>SSCMS</Authors>
<Company>SSCMS</Company>
<PackageDescription>SSCMS .NET Core abstractions for developers.</PackageDescription>
@ -36,7 +36,7 @@
</ItemGroup>
<ItemGroup>
<!-- <PackageReference Include="Datory" Version="7.2.2" /> -->
<!-- <PackageReference Include="Datory" Version="7.3.0" /> -->
<ProjectReference Include="..\Datory\Datory.csproj" />
</ItemGroup>

2
tests/Datory.Tests/Datory.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

2
tests/SSCMS.Cli.Tests/SSCMS.Cli.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<LangVersion>latest</LangVersion>
<Version>1.0.0.0</Version>

2
tests/SSCMS.Core.Tests/SSCMS.Core.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<LangVersion>latest</LangVersion>
<Version>1.0.0.0</Version>

2
tests/SSCMS.Tests/SSCMS.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<LangVersion>latest</LangVersion>
<Version>1.0.0.0</Version>

2
tests/SSCMS.Web.Tests/SSCMS.Web.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<LangVersion>latest</LangVersion>
<Version>1.0.0.0</Version>

Write Preview
Loading…
Cancel
Save