diff --git a/build/install/docker/Dockerfile b/build/install/docker/Dockerfile index 14c066d0b9..660333d9b5 100644 --- a/build/install/docker/Dockerfile +++ b/build/install/docker/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get -y update && \ jq \ git \ yarn \ - dotnet-sdk-3.0 \ + dotnet-sdk-3.1 \ supervisor \ mysql-client \ mysql-server @@ -74,6 +74,14 @@ RUN cd /app/onlyoffice/src/ && \ yarn install --cwd web/ASC.Web.Components --frozen-lockfile > build/ASC.Web.Components.log && \ npm run build --prefix web/ASC.Web.Components && \ yarn pack --cwd web/ASC.Web.Components + +RUN cd /app/onlyoffice/src/ && \ + component=$(ls web/ASC.Web.Components/asc-web-components-v1.*.tgz) && \ + yarn remove asc-web-components --cwd web/ASC.Web.Common --peer && \ + yarn add file:../../$component --cwd web/ASC.Web.Common --cache-folder ../../yarn --peer && \ + yarn install --cwd web/ASC.Web.Common --frozen-lockfile > build/ASC.Web.Common.log && \ + npm run build --prefix web/ASC.Web.Common && \ + yarn pack --cwd web/ASC.Web.Common RUN cd /app/onlyoffice/src/ && \ npm run build:storybook --prefix web/ASC.Web.Components && \ @@ -82,7 +90,10 @@ RUN cd /app/onlyoffice/src/ && \ RUN cd /app/onlyoffice/src/ && \ component=$(ls web/ASC.Web.Components/asc-web-components-v1.*.tgz) && \ + common=$(ls web/ASC.Web.Common/asc-web-common-v1.*.tgz) && \ + yarn remove asc-web-components asc-web-common --cwd web/ASC.Web.Client && \ yarn add ../../$component --cwd web/ASC.Web.Client --cache-folder ../../yarn && \ + yarn add ../../$common --cwd web/ASC.Web.Client --cache-folder ../../yarn && \ yarn install --cwd web/ASC.Web.Client --frozen-lockfile || (cd web/ASC.Web.Client && npm i && cd ../../) && \ npm run build --prefix web/ASC.Web.Client && \ rm -rf /var/www/studio/client/* && \ @@ -91,7 +102,10 @@ RUN cd /app/onlyoffice/src/ && \ RUN cd /app/onlyoffice/src/ && \ component=$(ls web/ASC.Web.Components/asc-web-components-v1.*.tgz) && \ + common=$(ls web/ASC.Web.Common/asc-web-common-v1.*.tgz) && \ + yarn remove asc-web-components asc-web-common --cwd products/ASC.People/Client && \ yarn add ../../../$component --cwd products/ASC.People/Client --cache-folder ../../../yarn && \ + yarn add ../../../$common --cwd products/ASC.People/Client --cache-folder ../../../yarn && \ yarn install --cwd products/ASC.People/Client --frozen-lockfile || (cd products/ASC.People/Client && npm i && cd ../../../) && \ npm run build --prefix products/ASC.People/Client && \ mkdir -p /var/www/products/ASC.People/client && \ diff --git a/common/ASC.Api.Core/ASC.Api.Core.csproj b/common/ASC.Api.Core/ASC.Api.Core.csproj index f119f6cf3b..2afff2c974 100644 --- a/common/ASC.Api.Core/ASC.Api.Core.csproj +++ b/common/ASC.Api.Core/ASC.Api.Core.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 Library @@ -13,7 +13,7 @@ - + diff --git a/common/ASC.Common/ASC.Common.csproj b/common/ASC.Common/ASC.Common.csproj index f2986bf3eb..a6cf5f58c8 100644 --- a/common/ASC.Common/ASC.Common.csproj +++ b/common/ASC.Common/ASC.Common.csproj @@ -32,8 +32,8 @@ - - + + all @@ -42,11 +42,11 @@ - + - - - + + +