diff --git a/ASC.Personal.slnf b/ASC.Web.slnf similarity index 98% rename from ASC.Personal.slnf rename to ASC.Web.slnf index 7776733c09..bb39db00f3 100644 --- a/ASC.Personal.slnf +++ b/ASC.Web.slnf @@ -1,37 +1,37 @@ -{ - "solution": { - "path": "ASC.Web.sln", - "projects": [ - "common\\ASC.Api.Core\\ASC.Api.Core.csproj", - "common\\ASC.Common\\ASC.Common.csproj", - "common\\ASC.Core.Common\\ASC.Core.Common.csproj", - "common\\ASC.Data.Backup.Core\\ASC.Data.Backup.Core.csproj", - "common\\ASC.Data.Reassigns\\ASC.Data.Reassigns.csproj", - "common\\ASC.Data.Storage\\ASC.Data.Storage.csproj", - "common\\ASC.FederatedLogin\\ASC.FederatedLogin.csproj", - "common\\ASC.Feed\\ASC.Feed.csproj", - "common\\ASC.IPSecurity\\ASC.IPSecurity.csproj", - "common\\ASC.MessagingSystem\\ASC.MessagingSystem.csproj", - "common\\ASC.Notify.Textile\\ASC.Notify.Textile.csproj", - "common\\ASC.Textile\\ASC.Textile.csproj", - "common\\ASC.VoipService\\ASC.VoipService.csproj", - "common\\services\\ASC.AuditTrail\\ASC.AuditTrail.csproj", - "common\\services\\ASC.ClearEvents\\ASC.ClearEvents.csproj", - "common\\services\\ASC.Data.Backup\\ASC.Data.Backup.csproj", - "common\\services\\ASC.ElasticSearch\\ASC.ElasticSearch.csproj", - "common\\services\\ASC.Feed.Aggregator\\ASC.Feed.Aggregator.csproj", - "common\\services\\ASC.Notify\\ASC.Notify.csproj", - "common\\services\\ASC.Studio.Notify\\ASC.Studio.Notify.csproj", - "common\\services\\ASC.TelegramService\\ASC.TelegramService.csproj", - "common\\services\\ASC.UrlShortener.Svc\\ASC.UrlShortener.Svc.csproj", - "products\\ASC.Files\\Core\\ASC.Files.Core.csproj", - "products\\ASC.Files\\Server\\ASC.Files.csproj", - "products\\ASC.Files\\Service\\ASC.Files.Service.csproj", - "products\\ASC.People\\Server\\ASC.People.csproj", - "web\\ASC.Web.Api\\ASC.Web.Api.csproj", - "web\\ASC.Web.Core\\ASC.Web.Core.csproj", - "web\\ASC.Web.HealthChecks.UI\\ASC.Web.HealthChecks.UI.csproj", - "web\\ASC.Web.Studio\\ASC.Web.Studio.csproj" - ] - } +{ + "solution": { + "path": "ASC.Web.sln", + "projects": [ + "common\\ASC.Api.Core\\ASC.Api.Core.csproj", + "common\\ASC.Common\\ASC.Common.csproj", + "common\\ASC.Core.Common\\ASC.Core.Common.csproj", + "common\\ASC.Data.Backup.Core\\ASC.Data.Backup.Core.csproj", + "common\\ASC.Data.Reassigns\\ASC.Data.Reassigns.csproj", + "common\\ASC.Data.Storage\\ASC.Data.Storage.csproj", + "common\\ASC.FederatedLogin\\ASC.FederatedLogin.csproj", + "common\\ASC.Feed\\ASC.Feed.csproj", + "common\\ASC.IPSecurity\\ASC.IPSecurity.csproj", + "common\\ASC.MessagingSystem\\ASC.MessagingSystem.csproj", + "common\\ASC.Notify.Textile\\ASC.Notify.Textile.csproj", + "common\\ASC.Textile\\ASC.Textile.csproj", + "common\\ASC.VoipService\\ASC.VoipService.csproj", + "common\\services\\ASC.AuditTrail\\ASC.AuditTrail.csproj", + "common\\services\\ASC.ClearEvents\\ASC.ClearEvents.csproj", + "common\\services\\ASC.Data.Backup\\ASC.Data.Backup.csproj", + "common\\services\\ASC.ElasticSearch\\ASC.ElasticSearch.csproj", + "common\\services\\ASC.Feed.Aggregator\\ASC.Feed.Aggregator.csproj", + "common\\services\\ASC.Notify\\ASC.Notify.csproj", + "common\\services\\ASC.Studio.Notify\\ASC.Studio.Notify.csproj", + "common\\services\\ASC.TelegramService\\ASC.TelegramService.csproj", + "common\\services\\ASC.UrlShortener.Svc\\ASC.UrlShortener.Svc.csproj", + "products\\ASC.Files\\Core\\ASC.Files.Core.csproj", + "products\\ASC.Files\\Server\\ASC.Files.csproj", + "products\\ASC.Files\\Service\\ASC.Files.Service.csproj", + "products\\ASC.People\\Server\\ASC.People.csproj", + "web\\ASC.Web.Api\\ASC.Web.Api.csproj", + "web\\ASC.Web.Core\\ASC.Web.Core.csproj", + "web\\ASC.Web.HealthChecks.UI\\ASC.Web.HealthChecks.UI.csproj", + "web\\ASC.Web.Studio\\ASC.Web.Studio.csproj" + ] + } } \ No newline at end of file diff --git a/build/build.backend.bat b/build/build.backend.bat index cf6afed1ef..310491223b 100644 --- a/build/build.backend.bat +++ b/build/build.backend.bat @@ -1,11 +1,18 @@ PUSHD %~dp0.. -dotnet build ASC.Personal.slnf /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal - +dotnet build ASC.Web.slnf /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal @echo off +echo. +echo Install nodejs projects dependencies... +echo. if %errorlevel% == 0 ( for /R "build\scripts\" %%f in (*.bat) do ( - echo "%%~nxf" + echo Run script %%~nxf... + echo. call build\scripts\%%~nxf ) -) \ No newline at end of file +) + +echo. + +pause \ No newline at end of file diff --git a/build/install/install.bat b/build/install/install.bat index 7d2f278d52..8eaecec6b8 100644 --- a/build/install/install.bat +++ b/build/install/install.bat @@ -1,12 +1,15 @@ +@echo off + PUSHD %~dp0..\.. setlocal EnableDelayedExpansion if %errorlevel% == 0 ( for /R "build\run\" %%f in (*.bat) do ( call build\run\%%~nxf - echo !servicepath! - call sc create "Onlyoffice %%~nf" binPath="!servicepath!" + echo service create "Onlyoffice%%~nf" + call sc create "Onlyoffice%%~nf" displayname= "ONLYOFFICE %%~nf" binPath= "!servicepath!" ) ) +echo. pause \ No newline at end of file diff --git a/build/install/uninstall.bat b/build/install/uninstall.bat index 4f85b061f9..e685f037d1 100644 --- a/build/install/uninstall.bat +++ b/build/install/uninstall.bat @@ -1,8 +1,15 @@ +@echo off + PUSHD %~dp0.. call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( for /R "run\" %%f in (*.bat) do ( - call sc delete "Onlyoffice %%~nf" + echo Running service stop & delete "Onlyoffice%%~nf" + call sc stop "Onlyoffice%%~nf" + call sc delete "Onlyoffice%%~nf" ) -) \ No newline at end of file +) + +echo. +pause \ No newline at end of file diff --git a/build/start/restart.bat b/build/start/restart.bat index f454977936..469ac473f7 100644 --- a/build/start/restart.bat +++ b/build/start/restart.bat @@ -1,8 +1,14 @@ +@echo off + PUSHD %~dp0.. call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( - call stop.bat - call stop.bat - call iisreset + for /R "run\" %%f in (*.bat) do ( + call sc stop "Onlyoffice%%~nf" + call sc start "Onlyoffice%%~nf" + ) ) + +echo. +pause \ No newline at end of file diff --git a/build/start/start.bat b/build/start/start.bat index 04a380025b..50f1b06a93 100644 --- a/build/start/start.bat +++ b/build/start/start.bat @@ -1,8 +1,13 @@ +@echo off + PUSHD %~dp0.. call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( for /R "run\" %%f in (*.bat) do ( - call sc start "Onlyoffice %%~nf" + call sc start "Onlyoffice%%~nf" ) -) \ No newline at end of file +) + +echo. +pause \ No newline at end of file diff --git a/build/start/stop.bat b/build/start/stop.bat index 9003b8ba0d..00f79306a9 100644 --- a/build/start/stop.bat +++ b/build/start/stop.bat @@ -1,8 +1,13 @@ +@echo off + PUSHD %~dp0.. call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( for /R "run\" %%f in (*.bat) do ( - call sc stop "Onlyoffice %%~nf" + call sc stop "Onlyoffice%%~nf" ) -) \ No newline at end of file +) + +echo. +pause \ No newline at end of file