Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore

Conflicts:
	build/build.bat
This commit is contained in:
Alexey Safronov 2019-07-10 11:29:42 +03:00
commit 273c99c414

View File

@ -8,9 +8,8 @@ cd ../ASC.Web.Storybook
call npm ci call npm ci
echo "ASC.Web.Client" echo "ASC.Web.Client"
cd ../../ASC.Web.Client cd ../ASC.Web.Client
call npm ci call npm ci
call npm run build
echo "ASC.Web.People.Client" echo "ASC.Web.People.Client"
cd ../../products/ASC.People/Client cd ../../products/ASC.People/Client
@ -21,12 +20,4 @@ echo "ASC.Web.sln"
cd ../../../ cd ../../../
call dotnet build ASC.Web.sln /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal call dotnet build ASC.Web.sln /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal
rem echo "ASC.People"
rem call dotnet build products/ASC.People/Server --self-contained -r win10-x64 -o build/deploy/products/people /fl1 /flp1:LogFile=build/ASC.People.log;Verbosity=Normal
rem echo "ASC.Web.Api"
rem call dotnet publish web/ASC.Web.Api --self-contained -r win10-x64 -o build/deploy/www/api /fl1 /flp1:LogFile=build/ASC.Web.Api.log;Verbosity=Normal
rem xcopy config\*.* build\deploy\config\ /E /R /Y
pause pause