the version was upgraded up to 10.5.1

ONLYOFFICE · Dec 17, 2019 · f902ec3 · f902ec3
1 parent 0b70d84
commit f902ec3
Show file tree

Hide file tree

Showing 974 changed files with 51,880 additions and 22,917 deletions.
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -16,7 +16,7 @@
  <package id="AWSSDK.SimpleEmail" version="3.3.7.2" />
  <package id="AWSSDK.SimpleNotificationService" version="3.3.2.2" />
  <package id="BouncyCastle" version="1.8.2.0" targetFramework="net45" />
- <package id="Box.V2" version="3.7.0" />
+ <package id="Box.V2" version="3.11.0" />
  <package id="Code.Contract" version="1.0.0" />
  <package id="CommandLineParser" version="1.9.71" />
  <package id="CsvHelper" version="7.1.0" />
@@ -53,7 +53,6 @@
  <package id="LiteDB" version="3.1.0" />
  <package id="log4net" version="2.0.8" />
  <package id="LumenWorksCsvReader" version="3.8.2" />
- <package id="Magnific.Popup" version="1.1.0" />
  <package id="MailKit" version="2.0.4" targetFramework="net462" />
  <package id="Marvin.JsonPatch.Signed" version="0.9.0" />
  <package id="Microsoft.AspNet.Cors" version="5.2.3" />
@@ -120,6 +119,7 @@
  <package id="System.Buffers" version="4.5.0" />
  <package id="System.Diagnostics.PerformanceCounter" version="4.5.0" />
  <package id="System.IdentityModel.Tokens.Jwt" version="5.1.5" />
+ <package id="System.Interactive.Async" version="3.1.1" />
  <package id="System.IO.Pipelines" version="4.5.3" />
  <package id="System.Memory" version="4.5.2" />
  <package id="System.Numerics.Vectors" version="4.5.0" />

diff --git a/build/config/TeamLabSvc.exe.Config b/build/config/TeamLabSvc.exe.Config
@@ -90,11 +90,10 @@
  </appSettings>
  <connectionStrings>
  <clear />
- <add name="default" connectionString="Server=localhost;Database=onlyoffice;User ID=root;Password=;Pooling=True;Character Set=utf8;AutoEnlist=false;SSL Mode=none;Connection Timeout=30;Maximum Pool Size=300;" providerName="MySql.Data.MySqlClient" />
+ <add name="default" connectionString="Server=localhost;Database=onlyoffice;User ID=root;Password=;Pooling=True;Character Set=utf8;AutoEnlist=false;SSL Mode=none;AllowPublicKeyRetrieval=true;Connection Timeout=30;Maximum Pool Size=300;" providerName="MySql.Data.MySqlClient" />
  </connectionStrings>
  <teamlab>
  <services>
- <add type="ASC.Xmpp.Host.XmppServerLauncher, ASC.Xmpp.Host" />
  <add type="ASC.Socket.IO.Svc.Launcher, ASC.Socket.IO.Svc" />
  <add type="ASC.Radicale.Launcher, ASC.Radicale" />
  <add type="ASC.Notify.NotifyServiceLauncher, ASC.Notify" />
@@ -108,54 +107,6 @@
  </services>
  </teamlab>
  <apiClient root="/api/2.0/" scheme="Http" />
- <jabberServer>
- <listeners>
- <add name="Jabber Listener" type="ASC.Xmpp.Server.Gateway.TcpXmppListener">
- <property name="maxpacket" value="1048576" />
- <property name="bindPort" value="5222" />
- <property name="certificate" value="" />
- <property name="certificatePrivateKey" value="" />
- <property name="certificatePassword" value="" />
- <property name="startTls" value="none" />
- </add>
- <add name="Bosh Listener" type="ASC.Xmpp.Server.Gateway.BoshXmppListener">
- <property name="maxpacket" value="1048576" />
- <property name="bind" value="http://*:5280/http-poll/" />
- </add>
- <add name="SignalR Listener" type="ASC.Xmpp.Server.Gateway.SignalRXmppListener, ASC.Xmpp.Server" />
- </listeners>
- <storages>
- <add name="roster" type="ASC.Xmpp.Host.ASCRosterStore, ASC.Xmpp.Host">
- <property name="connectionStringName" value="default" />
- </add>
- <add name="vcard" type="ASC.Xmpp.Host.ASCVCardStore, ASC.Xmpp.Host">
- <property name="connectionStringName" value="default" />
- </add>
- <add name="users" type="ASC.Xmpp.Host.ASCUserStore, ASC.Xmpp.Host" />
- <add name="offline" type="ASC.Xmpp.Server.Storage.DbOfflineStore">
- <property name="connectionStringName" value="default" />
- </add>
- <add name="private" type="ASC.Xmpp.Server.Storage.DbPrivateStore">
- <property name="connectionStringName" value="default" />
- </add>
- <add name="muc" type="ASC.Xmpp.Server.Storage.DbMucStore">
- <property name="connectionStringName" value="default" />
- </add>
- <add name="archive" type="ASC.Xmpp.Server.Storage.DbMessageArchive">
- <property name="connectionStringName" value="default" />
- </add>
- <add name="push" type="ASC.Xmpp.Server.Storage.DbPushStore">
- <property name="connectionStringName" value="default" />
- </add>
- </storages>
- <services>
- <add jid="" name="creator" type="ASC.Xmpp.Host.CreatorService, ASC.Xmpp.Host">
- <property name="" value="ASC.Xmpp.Server.Services.Jabber.JabberService, ASC.Xmpp.Server" />
- <property name="conference" value="ASC.Xmpp.Server.Services.Muc2.MucService, ASC.Xmpp.Server" />
- <property name="multicast" value="ASC.Xmpp.Server.Services.Multicast.MulticastService, ASC.Xmpp.Server" />
- </add>
- </services>
- </jabberServer>
  <notify connectionStringName="default">
  <process maxThreads="2" bufferSize="10" maxAttempts="10" attemptsInterval="0:5:0" />
  <senders>
@@ -185,9 +136,6 @@
  </radicale>
  <system.serviceModel>
  <services>
- <service name="ASC.Xmpp.Host.JabberService" behaviorConfiguration="jabber">
- <endpoint address="net.tcp://0:9865/teamlabJabber" binding="netTcpBinding" contract="ASC.Core.Notify.Jabber.IJabberService" bindingConfiguration="jabber" />
- </service>
  <service name="ASC.ElasticSearch.Service.Service" behaviorConfiguration="default">
  <endpoint address="net.tcp://0:9866/teamlabSearcher" binding="netTcpBinding" contract="ASC.ElasticSearch.Service.IService" bindingConfiguration="index" />
  </service>

diff --git a/build/install/deb/Files/god/conf.d/monoserve.god b/build/install/deb/Files/god/conf.d/monoserve.god
@@ -28,7 +28,7 @@ God.watch do |w|
  w.name = "monoserve"
  w.group = "onlyoffice"
  w.grace = 15.seconds
- w.start = "/bin/bash -c '/etc/init.d/monoserve start; sleep 5s; wget -qO- --retry-connrefused --no-check-certificate --waitretry=15 -t 0 --continue http://localhost/warmup/auth.aspx &> /dev/null'"
+ w.start = "/etc/init.d/monoserve start"
  w.stop = "/etc/init.d/monoserve stop"
  w.restart = "/etc/init.d/monoserve restart"
  w.pid_file = "/tmp/monoserve"
@@ -48,6 +48,13 @@ God.watch do |w|
  c.times = 5
  c.interval = 5.seconds
  end
+ restart.condition(:http_response_code) do |c|
+ c.host = 'localhost'
+ c.path = '/api/2.0/capabilities.json'
+ c.code_is_not = 200
+ c.times = 5
+ c.interval = 5.seconds
+ end
  restart.condition(:cpu_usage) do |c|
  c.above = 90.percent
  c.times = 5

diff --git a/build/install/deb/Files/tools/default-onlyoffice-ssl.sh b/build/install/deb/Files/tools/default-onlyoffice-ssl.sh
@@ -11,7 +11,7 @@ SSL_DHPARAM_PATH="${ROOT_DIR}/dhparam.pem";
 mkdir -p ${ROOT_DIR}
 
 if [ ! -f ${SSL_DHPARAM_PATH} ]; then
- sudo openssl dhparam -out dhparam.pem 2048
+ openssl dhparam -out dhparam.pem 2048
 
  mv dhparam.pem ${SSL_DHPARAM_PATH};
 fi

diff --git a/build/install/deb/debian/postinst b/build/install/deb/debian/postinst
@@ -30,6 +30,7 @@ DB_USER=""
 DB_PWD=""
 DB_NAME=""
 
+
 install_db(){
  db_get {{package_sysname}}-communityserver/db-host || true
  DB_HOST="$RET"
@@ -61,31 +62,43 @@ install_db(){
  if ! grep -q "^sql_mode" ${CNF_PATH}; then
  sed "/\[mysqld\]/a sql_mode = 'NO_ENGINE_SUBSTITUTION'" -i ${CNF_PATH} # disable new STRICT mode in mysql 5.7
  else
- sed "s/sql_mode.*/sql_mode = 'NO_ENGINE_SUBSTITUTION'/" -i ${CNF_PATH} || true # ignore errors
-  fi
+  sed "s/sql_mode.*/sql_mode = 'NO_ENGINE_SUBSTITUTION'/" -i ${CNF_PATH} || true # ignore errors
+ fi
 
  if ! grep -q "^max_connections" ${CNF_PATH}; then
  sed '/\[mysqld\]/a max_connections = 1000' -i ${CNF_PATH}
  else
- sed "s/max_connections.*/max_connections = 1000/" -i ${CNF_PATH} || true # ignore errors
+  sed "s/max_connections.*/max_connections = 1000/" -i ${CNF_PATH} || true # ignore errors
  fi
 
  if ! grep -q "^group_concat_max_len" ${CNF_PATH}; then
  sed '/\[mysqld\]/a group_concat_max_len = 2048' -i ${CNF_PATH}
  else
- sed "s/group_concat_max_len.*/group_concat_max_len = 2048/" -i ${CNF_PATH} || true # ignore errors
+  sed "s/group_concat_max_len.*/group_concat_max_len = 2048/" -i ${CNF_PATH} || true # ignore errors
  fi
 
  if ! grep -q "^max_allowed_packet" ${CNF_PATH}; then
  sed '/\[mysqld\]/a max_allowed_packet = 1048576000' -i ${CNF_PATH}
  else
- sed "s/max_allowed_packet.*/max_allowed_packet = 1048576000/" -i ${CNF_PATH} || true # ignore errors
+  sed "s/max_allowed_packet.*/max_allowed_packet = 1048576000/" -i ${CNF_PATH} || true # ignore errors
  fi
+
+ if ! grep -q "^character_set_server" ${CNF_PATH}; then
+ sed '/\[mysqld\]/a character_set_server = utf8' -i ${CNF_PATH}
+ else
+ sed "s/character_set_server.*/character_set_server = utf8/" -i ${CNF_PATH} || true # ignore errors
+ fi
+
+ if ! grep -q "^collation_server" ${CNF_PATH}; then
+ sed '/\[mysqld\]/a collation_server = utf8_general_ci' -i ${CNF_PATH}
+ else
+ sed "s/collation_server.*/collation_server = utf8_general_ci/" -i ${CNF_PATH} || true # ignore errors
+ fi
 
  if ! grep -q "^default-authentication-plugin" ${CNF_PATH}; then
  sed '/\[mysqld\]/a default-authentication-plugin = mysql_native_password' -i ${CNF_PATH}
  else
- sed "s/default-authentication-plugin.*/default-authentication-plugin = mysql_native_password/" -i ${CNF_PATH} || true # ignore errors
+  sed "s/default-authentication-plugin.*/default-authentication-plugin = mysql_native_password/" -i ${CNF_PATH} || true # ignore errors
  fi
 
  if [ -e ${CNF_SERVICE_PATH} ]; then
@@ -141,7 +154,7 @@ install_db(){
 
 apply_connection_string(){
  if [ "$DB_HOST" != "localhost" ] || [ "$DB_NAME" != "{{package_sysname}}" ] || [ "$DB_USER" != "root" ] || [ "$DB_PWD" != "" ]; then
- find "$DIR/" -type f -name "*.[cC]onfig" -exec sed -i "s/connectionString=.*/connectionString=\"Server=$DB_HOST;Database=$DB_NAME;User ID=$DB_USER;Password=$DB_PWD;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;Connection Timeout=30;Maximum Pool Size=300;\" providerName=\"MySql.Data.MySqlClient\"\/>/" {} \;
+ find "$DIR/" -type f -name "*.[cC]onfig" -exec sed -i "s/connectionString=.*/connectionString=\"Server=$DB_HOST;Database=$DB_NAME;User ID=$DB_USER;Password=$DB_PWD;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;AllowPublicKeyRetrieval=true;Connection Timeout=30;Maximum Pool Size=300;\" providerName=\"MySql.Data.MySqlClient\"\/>/" {} \;
  fi
 }
 
@@ -267,6 +280,7 @@ END
  python3 -m pip install --upgrade radicale
  python3 -m pip install --upgrade $DIR/Tools/radicale/plugins/app_auth_plugin/.
  python3 -m pip install --upgrade $DIR/Tools/radicale/plugins/app_store_plugin/.
+ python3 -m pip install --upgrade $DIR/Tools/radicale/plugins/app_rights_plugin/.
 
 
  #configure elasticsearch
@@ -314,7 +328,11 @@ END
  sed -i "s/thread_pool.write.queue_size.*/thread_pool.write.queue_size: 250/" /etc/elasticsearch/elasticsearch.yml 
  fi
 
- CORE_COUNT=$(expr $(cat /proc/cpuinfo | grep processor | wc -l) / 2)
+ export LC_ALL=C
+
+ CORE_COUNT=$(( $(lscpu | awk '/^Socket\(s\)/{ print $2 }') * $(lscpu | awk '/^Core\(s\) per socket/{ print $4 }') ));
+
+ unset LC_ALL
 
  if [ "$CORE_COUNT" -eq "0" ]; then
  CORE_COUNT=1;

diff --git a/build/install/rpm/Files/tools/default-onlyoffice-ssl.sh b/build/install/rpm/Files/tools/default-onlyoffice-ssl.sh
@@ -11,7 +11,7 @@ SSL_DHPARAM_PATH="${ROOT_DIR}/dhparam.pem";
 mkdir -p ${ROOT_DIR}
 
 if [ ! -f ${SSL_DHPARAM_PATH} ]; then
- sudo openssl dhparam -out dhparam.pem 2048
+ openssl dhparam -out dhparam.pem 4096
 
  mv dhparam.pem ${SSL_DHPARAM_PATH};
 fi
@@ -70,6 +70,6 @@ sed '/mail\.default-api-scheme/s/\(value\s*=\s*\"\).*\"/\1https\"/' -i ${APP_SER
 
 mv -f default-onlyoffice-ssl.conf ${NGINX_CONF_DIR}/onlyoffice.conf
 
-service onlyofficeMailAggregator restart
-service onlyofficeJabber restart
-service nginx restart
+systemctl restart onlyofficeMailAggregator
+systemctl restart onlyofficeJabber
+systemctl restart nginx
diff --git a/build/install/rpm/Files/tools/default-onlyoffice.sh b/build/install/rpm/Files/tools/default-onlyoffice.sh
@@ -15,6 +15,6 @@ sed '/certificate"/s!\(value\s*=\s*\"\).*\"!\1\"!' -i ${APP_SERVICES_ROOT_DIR}/T
 sed '/certificatePassword/s/\(value\s*=\s*\"\).*\"/\1\"/' -i ${APP_SERVICES_ROOT_DIR}/TeamLabSvc/TeamLabSvc.exe.config
 sed '/startTls/s/\(value\s*=\s*\"\).*\"/\1none\"/' -i ${APP_SERVICES_ROOT_DIR}/TeamLabSvc/TeamLabSvc.exe.config;
 
-service onlyofficeJabber restart
-service onlyofficeMailAggregator restart
-service nginx reload
+systemctl restart onlyofficeMailAggregator
+systemctl restart onlyofficeJabber
+systemctl restart nginx
diff --git a/build/install/rpm/common.spec b/build/install/rpm/common.spec
@@ -125,6 +125,7 @@ sed '/web\.controlpanel\.url/s/\(value\s*=\s*\"\)[^\"]*\"/\1\/controlpanel\/\"/'
 sed '/web\.controlpanel\.url/s/\(value\s*=\s*\"\)[^\"]*\"/\1\/controlpanel\/\"/' -i ${APP_SERVICES_ROOT_DIR}/TeamLabSvc/TeamLabSvc.exe.config;
 
 %triggerin -- elasticsearch
+
 ELASTIC_SEARCH_CONF_PATH="/etc/elasticsearch/elasticsearch.yml"
 DIR=/var/www/%{package_sysname}
 APP_DATA_DIR="${DIR}/Data"
@@ -172,8 +173,12 @@ if ! grep -q "thread_pool.write.queue_size" ${ELASTIC_SEARCH_CONF_PATH}; then
 else
  sed -i "s/thread_pool.write.queue_size.*/thread_pool.write.queue_size: 250/" ${ELASTIC_SEARCH_CONF_PATH} 
 fi
-
-CORE_COUNT=$(expr $(cat /proc/cpuinfo | grep processor | wc -l) / 2)
+
+export LC_ALL=C
+
+CORE_COUNT=$(( $(lscpu | awk '/^Socket\(s\)/{ print $2 }') * $(lscpu | awk '/^Core\(s\) per socket/{ print $4 }') ));
+
+unset LC_ALL
 
 if [ "$CORE_COUNT" -eq "0" ]; then
  CORE_COUNT=1;
@@ -216,6 +221,7 @@ python3 -m pip install --upgrade requests
 python3 -m pip install --upgrade radicale
 python3 -m pip install --upgrade $DIR/Tools/radicale/plugins/app_auth_plugin/.
 python3 -m pip install --upgrade $DIR/Tools/radicale/plugins/app_store_plugin/.
+python3 -m pip install --upgrade $DIR/Tools/radicale/plugins/app_rights_plugin/.
 
 %triggerin -- %{package_sysname}-documentserver, %{package_sysname}-documentserver-ie
 

diff --git a/build/msbuild/ASC.Web.Core.BuildTask.dll b/build/msbuild/ASC.Web.Core.BuildTask.dll
diff --git a/build/msbuild/Copyright/crwriter.exe b/build/msbuild/Copyright/crwriter.exe
diff --git a/build/msbuild/MSBuild.Community.Tasks.dll b/build/msbuild/MSBuild.Community.Tasks.dll
diff --git a/build/msbuild/build.proj b/build/msbuild/build.proj
@@ -119,10 +119,10 @@
  <ProjectToBuild Include="$(ASCDir)module\ASC.Api\ASC.Api.Sample\ASC.Api.Sample.csproj"/>
 
  <!-- Talk -->
- <ProjectToBuild Include="$(ASCDir)web\studio\ASC.Web.Studio\addons\talk\ASC.Web.Talk.csproj"/>
- <ProjectToBuild Include="$(ASCDir)module\ASC.Jabber\ASC.Xmpp.Core\ASC.Xmpp.Core.csproj"/>
- <ProjectToBuild Include="$(ASCDir)module\ASC.Jabber\ASC.Xmpp.Server\ASC.Xmpp.Server.csproj"/>
- <ProjectToBuild Include="$(ASCDir)module\ASC.Jabber\ASC.Xmpp.Host\ASC.Xmpp.Host.csproj"/>
+ <ProjectToBuild Include="$(ASCDir)web\studio\ASC.Web.Studio\addons\talk\ASC.Web.Talk.csproj" Condition=" Exists( '$(ASCDir)web\studio\ASC.Web.Studio\addons\talk\' )"/>
+ <ProjectToBuild Include="$(ASCDir)module\ASC.Jabber\ASC.Xmpp.Core\ASC.Xmpp.Core.csproj" Condition=" Exists( '$(ASCDir)module\ASC.Jabber\' )"/>
+ <ProjectToBuild Include="$(ASCDir)module\ASC.Jabber\ASC.Xmpp.Server\ASC.Xmpp.Server.csproj" Condition=" Exists( '$(ASCDir)module\ASC.Jabber\' )"/>
+ <ProjectToBuild Include="$(ASCDir)module\ASC.Jabber\ASC.Xmpp.Host\ASC.Xmpp.Host.csproj" Condition=" Exists( '$(ASCDir)module\ASC.Jabber\' )"/>
 
  <!-- Calendar -->
  <ProjectToBuild Include="$(ASCDir)web\studio\ASC.Web.Studio\addons\calendar\ASC.Web.Calendar.csproj"/>

diff --git a/build/msbuild/deploy.proj b/build/msbuild/deploy.proj
@@ -42,6 +42,7 @@
  <ServiceFiles Include="$(RootDir)module\ASC.Radicale\bin\$(Configuration)\ASC.Radicale.dll" />
  <ServiceFiles Include="$(RootDir)module\ASC.Radicale\radicale.config" />
  <ServiceFiles Include="$(RootDir)module\ASC.Radicale\radicale.log.config" />
+ <ServiceFiles Include="$(RootDir)module\ASC.Radicale\radicale.rights" />
  <ServiceFiles Include="$(RootDir)module\ASC.TeamLabSvc\ASC.TeamLabSvc\bin\$(Configuration)\TeamLabSvc.exe" />
  <ServiceFiles Include="$(RootDir)packages\AjaxPro.2.2.9.17.2\lib\net20\AjaxPro.2.dll" />
  <ServiceFiles Include="$(RootDir)packages\AntiXSS.4.3.0\lib\net40\HtmlSanitizationLibrary.dll" />
@@ -54,7 +55,7 @@
  <ServiceFiles Include="$(RootDir)packages\AWSSDK.S3.3.3.26.2\lib\net45\AWSSDK.S3.dll" />
  <ServiceFiles Include="$(RootDir)packages\AWSSDK.SimpleEmail.3.3.7.2\lib\net45\AWSSDK.SimpleEmail.dll" />
  <ServiceFiles Include="$(RootDir)packages\BouncyCastle.1.8.2\lib\BouncyCastle.Crypto.dll" />
- <ServiceFiles Include="$(RootDir)packages\Box.V2.3.7.0\lib\net45\Box.V2.dll" />
+ <ServiceFiles Include="$(RootDir)packages\Box.V2.3.11.0\lib\net45\Box.V2.dll" />
  <ServiceFiles Include="$(RootDir)packages\Ical.Net.4.0.6.1\lib\net46\Ical.Net.dll" />
  <ServiceFiles Include="$(RootDir)packages\NodaTime.2.0.2\lib\net45\NodaTime.dll" />
  <ServiceFiles Include="$(RootDir)packages\DotNetOpenAuth.Ultimate.4.1.0.12182\lib\net45-full\DotNetOpenAuth.dll" />
@@ -99,8 +100,8 @@
  <ServiceFiles Include="$(RootDir)packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll" />
  <ServiceFiles Include="$(RootDir)packages\Microsoft.SharePoint.Client.dll.15.0.4420.1017\Microsoft.SharePoint.Client.dll" />
  <ServiceFiles Include="$(RootDir)packages\Microsoft.SharePoint.Client.dll.15.0.4420.1017\Microsoft.SharePoint.Client.Runtime.dll" />
- <ServiceFiles Include="$(RootDir)packages\Microsoft.VisualStudio.QualityTools.UnitTestFramework.11.0.50727.1\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
  <ServiceFiles Include="$(RootDir)packages\Microsoft.Web.Administration.7.0.0.0\lib\net20\Microsoft.Web.Administration.dll" />
+ <ServiceFiles Include="$(RootDir)packages\Microsoft.VisualStudio.QualityTools.UnitTestFramework.11.0.50727.1\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
  <ServiceFiles Include="$(RootDir)packages\MimeKit.2.0.4\lib\net45\MimeKit.dll" />
  <ServiceFiles Include="$(RootDir)packages\Mono.Security.3.2.3.0\lib\net45\Mono.Security.dll" />
  <ServiceFiles Include="$(RootDir)packages\MySql.Data.8.0.13\lib\net452\MySql.Data.dll" />
@@ -122,6 +123,7 @@
  <ServiceFiles Include="$(RootDir)packages\StackExchange.Redis.Extensions.LegacyConfiguration.4.0.5\lib\net461\StackExchange.Redis.Extensions.LegacyConfiguration.dll" />
  <ServiceFiles Include="$(RootDir)packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll" />
  <ServiceFiles Include="$(RootDir)packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll" />
+ <ServiceFiles Include="$(RootDir)packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll" />
  <ServiceFiles Include="$(RootDir)packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll" />
  <ServiceFiles Include="$(RootDir)packages\System.Memory.4.5.2\lib\netstandard1.1\System.Memory.dll" />
  <ServiceFiles Include="$(RootDir)packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll" />
@@ -216,6 +218,7 @@
  <MailFiles Include="$(RootDir)packages\StackExchange.Redis.Extensions.LegacyConfiguration.4.0.5\lib\net461\StackExchange.Redis.Extensions.LegacyConfiguration.dll" />
  <MailFiles Include="$(RootDir)packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll" />
  <MailFiles Include="$(RootDir)packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll" />
+ <MailFiles Include="$(RootDir)packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll" />
  <MailFiles Include="$(RootDir)packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll" />
  <MailFiles Include="$(RootDir)packages\System.Memory.4.5.2\lib\netstandard1.1\System.Memory.dll" />
  <MailFiles Include="$(RootDir)packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll" />