From 953a56b54999477e3dc860592535c2a38a2fcb2a Mon Sep 17 00:00:00 2001 From: Alexey Bannov Date: Mon, 4 Mar 2019 15:24:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20deploy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../helpcenter.r7-office.ru.pubxml | 24 +- ...fig => Web.helpcenter.r7-office.ru.config} | 5 +- helpcenter.r7-office.ru/Web/web.config | 650 +++++++++--------- .../Web/website.publishproj | 2 +- 4 files changed, 350 insertions(+), 331 deletions(-) rename helpcenter.r7-office.ru/Web/{Web.Release.config => Web.helpcenter.r7-office.ru.config} (86%) diff --git a/helpcenter.r7-office.ru/Web/App_Data/PublishProfiles/helpcenter.r7-office.ru.pubxml b/helpcenter.r7-office.ru/Web/App_Data/PublishProfiles/helpcenter.r7-office.ru.pubxml index e6a98b91d..91a818091 100644 --- a/helpcenter.r7-office.ru/Web/App_Data/PublishProfiles/helpcenter.r7-office.ru.pubxml +++ b/helpcenter.r7-office.ru/Web/App_Data/PublishProfiles/helpcenter.r7-office.ru.pubxml @@ -10,7 +10,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt Any CPU True - False + True helpcenter.r7-office.ru helpcenter.r7-office.ru @@ -22,6 +22,26 @@ by editing this MSBuild file. In order to learn more about this please visit htt True True False - DonotMerge + MergeAllPagesAndControlToASingleAssembly + True + ASC.Merge.dll + + + + <_XMLFiles Include="Bin\*.xml" /> + <_ConfigFiles Include="web.autofac.config" /> + + Bin\%(RecursiveDir)%(Filename)%(Extension) + + + %(RecursiveDir)%(Filename)%(Extension) + + + + + CustomCollectFiles; + ; + CustomCollectFiles; + ; \ No newline at end of file diff --git a/helpcenter.r7-office.ru/Web/Web.Release.config b/helpcenter.r7-office.ru/Web/Web.helpcenter.r7-office.ru.config similarity index 86% rename from helpcenter.r7-office.ru/Web/Web.Release.config rename to helpcenter.r7-office.ru/Web/Web.helpcenter.r7-office.ru.config index 64650b855..a5cacf24b 100644 --- a/helpcenter.r7-office.ru/Web/Web.Release.config +++ b/helpcenter.r7-office.ru/Web/Web.helpcenter.r7-office.ru.config @@ -7,9 +7,8 @@ - - - + + diff --git a/helpcenter.r7-office.ru/Web/web.config b/helpcenter.r7-office.ru/Web/web.config index 4069b8f55..7bcbbde90 100644 --- a/helpcenter.r7-office.ru/Web/web.config +++ b/helpcenter.r7-office.ru/Web/web.config @@ -1,325 +1,325 @@ - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/helpcenter.r7-office.ru/Web/website.publishproj b/helpcenter.r7-office.ru/Web/website.publishproj index 1a0231256..04de981b5 100644 --- a/helpcenter.r7-office.ru/Web/website.publishproj +++ b/helpcenter.r7-office.ru/Web/website.publishproj @@ -19,7 +19,7 @@ Copyright (C) Microsoft Corporation. All rights reserved. {17ba3e67-bcbd-4ac5-8cd9-b1bf56a1907e} $(MSBuildThisFileDirectory) /Web - v4.0 + v4.7