diff --git a/projects/Version.cs b/projects/Version.cs index 99554e5d..b7bf0ea0 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0811d3")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.0812d1")] \ No newline at end of file diff --git a/projects/projects.sln b/projects/projects.sln index 3f484587..c78a84cd 100644 --- a/projects/projects.sln +++ b/projects/projects.sln @@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTNode", "IoTNode\IoTNode. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoT.Shared", "IoT.Shared\IoT.Shared.csproj", "{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{48C7AE84-0BDC-4F8A-89ED-C6B82EC46C9F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{48C7AE84-0BDC-4F8A-89ED-C6B82EC46C9F}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig NuGet.config = NuGet.config @@ -176,7 +176,7 @@ Global {6E2766D8-9ECF-469E-8662-A20F673E52CC} = {E1681DC3-9AC2-4FF6-B3DE-37EF826E6F8A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_StartDate = 2000/1/1 SolutionGuid = {0B7095FB-5E70-4EF8-805A-CB4A91AE4B0A} + BuildVersion_StartDate = 2000/1/1 EndGlobalSection EndGlobal diff --git a/publish/build.cmd b/publish/build.cmd deleted file mode 100644 index cd1538e4..00000000 --- a/publish/build.cmd +++ /dev/null @@ -1,21 +0,0 @@ -@echo off -set startime=%time% - -rd /q/s "./dist/" - -echo d|xcopy /s /e /y /f /exclude:exclude.txt "./src" "./dist/" - -dotnet publish ../projects/WebMvc/WebMvc.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/WebMVC -dotnet publish ../projects/WebSPA/WebSPA.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/WebSPA -dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/UserCenter -dotnet publish ../projects/JobServer/JobServer.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/JobServer -dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/IoTCenter -dotnet publish ../projects/IoTNode/IoTNode.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/IoTNode - -::dotnet publish ../projects/IoT/IoTServices/WinService/WinService.csproj -c Release -r win-x86 -o "../../publish/dist/win-x86/Program Files (x86)/WinService" -::dotnet publish ../projects/IoT/IoTServices/LiChuangService/LiChuangService.csproj -c Release -o ../../publish/dist/linux-arm64/publish/apps/LiChuangService -::gradle build -p ../projects/IoT/IoTServices/NJWLService - -set endtime=%time% -echo %startime% %endtime% -pause \ No newline at end of file diff --git a/publish/build.ps1 b/publish/build.ps1 new file mode 100644 index 00000000..6b0acf1c --- /dev/null +++ b/publish/build.ps1 @@ -0,0 +1,13 @@ +Remove-Item ./dist/* -recurse -force + +Copy-Item ./src/* ./dist -recurse -Exclude @('.gitignore','debug-start.cmd','debug-stop.cmd','docker-compose.override.yml','nginx.development.conf') + +Remove-Item ./dist/linux-x64/publish/docker/log/* -recurse -force +Remove-Item ./dist/linux-x64/publish/docker/data/* -recurse -force + +dotnet publish ../projects/WebMvc/WebMVC.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/WebMVC +dotnet publish ../projects/WebSPA/WebSPA.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/WebSPA +dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/UserCenter +dotnet publish ../projects/JobServer/JobServer.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/JobServer +dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/IoTCenter +dotnet publish ../projects/IoTNode/IoTNode.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/IoTNode \ No newline at end of file diff --git a/publish/exclude.txt b/publish/exclude.txt deleted file mode 100644 index 9ff7d061..00000000 --- a/publish/exclude.txt +++ /dev/null @@ -1,9 +0,0 @@ -.vscode -.gitignore -log -docker\log\ -docker\data\ -docker-compose.override.yml -debug-start.ps1 -debug-stop.ps1 -nginx.development.conf \ No newline at end of file