Merge branch 'develop'

This commit is contained in:
Samuele E. Locatelli
2020-02-18 14:35:57 +01:00
3 changed files with 8 additions and 8 deletions
@@ -10,11 +10,7 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<ExcludeApp_Data>True</ExcludeApp_Data>
<ExcludeApp_Data>False</ExcludeApp_Data>
<MSDeployServiceURL>IIS01</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/ZCode</DeployIisAppPath>
<RemoteSitePhysicalPath />
@@ -23,5 +19,9 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>jenkins</UserName>
<_SavePWD>True</_SavePWD>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
</Project>
@@ -10,7 +10,7 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>True</ExcludeApp_Data>
<ExcludeApp_Data>False</ExcludeApp_Data>
<MSDeployServiceURL>IIS02</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/ZCode</DeployIisAppPath>
<RemoteSitePhysicalPath />
+2 -2
View File
@@ -13,8 +13,8 @@
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>QR_GEN</RootNamespace>
<AssemblyName>QR-GEN</AssemblyName>
<RootNamespace>ZCode</RootNamespace>
<AssemblyName>ZCode</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>