правка deploy

This commit is contained in:
Alexey Bannov 2019-03-04 15:24:29 +03:00
parent 68013587de
commit 953a56b549
4 changed files with 350 additions and 331 deletions

View File

@ -10,7 +10,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>helpcenter.r7-office.ru</MSDeployServiceURL>
<DeployIisAppPath>helpcenter.r7-office.ru</DeployIisAppPath>
<RemoteSitePhysicalPath />
@ -22,6 +22,26 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<WDPMergeOption>MergeAllPagesAndControlToASingleAssembly</WDPMergeOption>
<UseMerge>True</UseMerge>
<ContentAssemblyName>ASC.Merge.dll</ContentAssemblyName>
</PropertyGroup>
<Target Name="CustomCollectFiles">
<ItemGroup>
<_XMLFiles Include="Bin\*.xml" />
<_ConfigFiles Include="web.autofac.config" />
<FilesForPackagingFromProject Include="%(_XMLFiles.Identity)">
<DestinationRelativePath>Bin\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<FilesForPackagingFromProject Include="%(_ConfigFiles.Identity)">
<DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
</ItemGroup>
</Target>
<PropertyGroup>
<CopyAllFilesToSingleFolderForPackageDependsOn>CustomCollectFiles;
;</CopyAllFilesToSingleFolderForPackageDependsOn>
<CopyAllFilesToSingleFolderForMsdeployDependsOn>CustomCollectFiles;
;</CopyAllFilesToSingleFolderForMsdeployDependsOn>
</PropertyGroup>
</Project>

View File

@ -8,8 +8,7 @@
<rewrite>
<rules>
<clear />
<rule name="pages HTTP to HTTPS" enabled="true" stopProcessing="true" xdt:Transform="Insert">
<match url="^blog" negate="true" />
<rule name="pages HTTP to HTTPS" enabled="true" stopProcessing="true" xdt:Transform="SetAttributes(enabled)" xdt:Locator="Match(name)">
<conditions>
<add input="{HTTPS}" pattern="off" />
</conditions>

View File

@ -13,10 +13,6 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="1.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
</dependentAssembly>
<!--<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a"/>
<bindingRedirect oldVersion="1.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
</dependentAssembly>-->
</assemblyBinding>
</runtime>
<appSettings>
@ -40,6 +36,14 @@
<add key="google.search.key" value="AIzaSyCdJDyP6pf-C98Rr2aSzZW1GJbHd6iD7QY"/>
</appSettings>
<autofac configSource="web.autofac.config"/>
<!--
For a description of web.config changes for .NET 4.5 see http://go.microsoft.com/fwlink/?LinkId=235367.
The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.5" />
</system.Web>
-->
<system.web>
<customErrors mode="Off"/>
<compilation debug="true" targetFramework="4.7.2">
@ -67,13 +71,10 @@
<add assembly="System.Data.Services.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a"/>
</assemblies>
</compilation>
<pages pageBaseType="BasePage" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
<pages pageBaseType="BasePage" controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID"/>
<httpHandlers>
<add verb="*" path="*.less" type="dotless.Core.LessCssHttpHandler, dotless.Core" validate="false"/>
</httpHandlers>
@ -309,7 +310,6 @@
<appender-ref ref="Site"/>
<level value="ALL"/>
</logger>
<appender name="Site" type="ASC.Common.Logging.SelfCleaningAppender, ASC.Common">
<file value="..\Logs\Site.log"/>
<encoding value="utf-8"/>

View File

@ -19,7 +19,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<ProjectGuid>{17ba3e67-bcbd-4ac5-8cd9-b1bf56a1907e}</ProjectGuid>
<SourceWebPhysicalPath>$(MSBuildThisFileDirectory)</SourceWebPhysicalPath>
<SourceWebVirtualPath>/Web</SourceWebVirtualPath>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<SourceWebProject>
</SourceWebProject>
<SourceWebMetabasePath>