Merge branch 'develop' into stable
This commit is contained in:
Samuele E. Locatelli
Vendored
+1
-1
@@ -17,7 +17,7 @@ pipeline {
|
||||
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=178']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=179']) {
|
||||
// env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
|
||||
env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.versionNumberBeta = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
|
||||
@@ -15,6 +15,7 @@ Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug-LELE|Any CPU = Debug-LELE|Any CPU
|
||||
Prod|Any CPU = Prod|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
@@ -22,24 +23,32 @@ Global
|
||||
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Debug-LELE|Any CPU.ActiveCfg = Debug-LELE|Any CPU
|
||||
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Debug-LELE|Any CPU.Build.0 = Debug-LELE|Any CPU
|
||||
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
|
||||
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Prod|Any CPU.Build.0 = Prod|Any CPU
|
||||
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Debug-LELE|Any CPU.ActiveCfg = Debug-LELE|Any CPU
|
||||
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Debug-LELE|Any CPU.Build.0 = Debug-LELE|Any CPU
|
||||
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Prod|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Prod|Any CPU.Build.0 = Release|Any CPU
|
||||
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug-LELE|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug-LELE|Any CPU.Build.0 = Debug|Any CPU
|
||||
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Prod|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Prod|Any CPU.Build.0 = Release|Any CPU
|
||||
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Debug-LELE|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Debug-LELE|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Prod|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Prod|Any CPU.Build.0 = Release|Any CPU
|
||||
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
|
||||
@@ -908,6 +908,9 @@
|
||||
<None Include="Web.Debug.config">
|
||||
<DependentUpon>Web.config</DependentUpon>
|
||||
</None>
|
||||
<None Include="Web.Prod.config">
|
||||
<DependentUpon>Web.config</DependentUpon>
|
||||
</None>
|
||||
<None Include="Web.Release.config">
|
||||
<DependentUpon>Web.config</DependentUpon>
|
||||
</None>
|
||||
@@ -961,6 +964,17 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Prod|AnyCPU'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
|
||||
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!-- Per altre informazioni sull'utilizzo della trasformazione web.config, vedere https://go.microsoft.com/fwlink/?LinkId=125889 -->
|
||||
|
||||
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
|
||||
<appSettings>
|
||||
<!--conf dati locali-->
|
||||
<add key="_SqlCopyDir" value="c:\Share\NKC\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="_SqlImportDir" value="c:\Share\NKC\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="cadBaseBath" value="c:\Share\DXF\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="srvCadBaseBath" value="C:\Users\Dell\Dropbox\SVG\DXF\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="svgBasePath" value="c:\Share\SVG\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<!--conf redis-->
|
||||
<add key="RedisConn" value="127.0.0.1,abortConnect=false,ssl=false,password=nkc.password" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="RedisConnAdmin" value="127.0.0.1,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<!--conn string-->
|
||||
<add key="NKC_WFConnectionString" value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="DbConfConnectionString" value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="VocabolarioConnectionString" value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="UtenteCdcConnectionString" value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
<add key="PermessiConnectionString" value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
|
||||
</appSettings>
|
||||
<connectionStrings>
|
||||
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString"
|
||||
connectionString="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC" xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
|
||||
</connectionStrings>
|
||||
<system.web>
|
||||
<compilation xdt:Transform="RemoveAttributes(debug)" />
|
||||
</system.web>
|
||||
</configuration>
|
||||
+31
-29
@@ -13,16 +13,17 @@
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<system.web>
|
||||
<compilation targetFramework="4.6.2" debug="true"/>
|
||||
<compilation targetFramework="4.6.2"/>
|
||||
<httpRuntime targetFramework="4.6.2"/>
|
||||
<pages>
|
||||
<namespaces>
|
||||
<add namespace="System.Web.Optimization"/>
|
||||
</namespaces>
|
||||
|
||||
<controls>
|
||||
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt"/>
|
||||
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit"/></controls></pages>
|
||||
<controls>
|
||||
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt"/>
|
||||
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit"/>
|
||||
</controls>
|
||||
</pages>
|
||||
<sessionState mode="Custom" customProvider="MySessionStateStore">
|
||||
<providers>
|
||||
<add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false" applicationName="NKC"
|
||||
@@ -54,39 +55,39 @@
|
||||
<add key="serializeSession" value="true"/>
|
||||
<add key="errorPageRedirect" value="./Reset?Action=CDV"/>
|
||||
<add key="maxAgeAppConf_min" value="5"/>
|
||||
<!--<add key="maxAgeAppConf_min" value="15"/>-->
|
||||
<!--<add key="maxAgeAppConf_min" value="15" />-->
|
||||
<!--area file upload-->
|
||||
<add key="preFixCsv" value="false"/>
|
||||
<add key="_tempUploadDir" value="~/FileUpload/"/>
|
||||
<add key="_SqlCopyDir" value="\\sql2016dev\Share\NKC\"/>
|
||||
<add key="_SqlCopyDir" value="c:\Share\NKC\"/>
|
||||
<add key="_SqlImportDir" value="c:\Share\NKC\"/>
|
||||
<!--Area file x scambio CAD / NESTING-->
|
||||
<add key="cadBaseBath" value="C:\Users\Dell\Dropbox\SVG\DXF\"/>
|
||||
<add key="srvCadBaseBath" value="\\stor01\DropboxSteamware\SVG\DXF\"/>
|
||||
<add key="svgBasePath" value="\\stor01\DropboxSteamware\SVG\"/>
|
||||
<add key="cadBaseBath" value="c:\Share\DXF\"/>
|
||||
<add key="srvCadBaseBath" value="C:\Users\Dell\Dropbox\SVG\DXF\"/>
|
||||
<add key="svgBasePath" value="c:\Share\SVG\"/>
|
||||
<add key="minValidEstSec" value="2"/>
|
||||
<!--Configurazioni Redis-->
|
||||
<!--<add key="RedisConn" value="localhost,abortConnect=false,ssl=false"/>
|
||||
<add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false,allowAdmin=true"/>-->
|
||||
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password"/>
|
||||
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true"/>
|
||||
<!--<add key="RedisConn" value="localhost,abortConnect=false,ssl=false" />
|
||||
<add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false,allowAdmin=true" />-->
|
||||
<add key="RedisConn" value="127.0.0.1,abortConnect=false,ssl=false,password=nkc.password"/>
|
||||
<add key="RedisConnAdmin" value="127.0.0.1,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true"/>
|
||||
<add key="redisDb" value="0"/>
|
||||
<!--Configurazioni DB per classi referenziate AppData e Steamware dll-->
|
||||
<add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<add key="NKC_WFConnectionString"
|
||||
value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
|
||||
<add key="DbConfConnectionString"
|
||||
value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
|
||||
<add key="VocabolarioConnectionString"
|
||||
value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
|
||||
<!--<add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
|
||||
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
|
||||
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>-->
|
||||
value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
|
||||
<add key="UtenteCdcConnectionString"
|
||||
value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
|
||||
<add key="PermessiConnectionString"
|
||||
value="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
|
||||
</appSettings>
|
||||
<connectionStrings>
|
||||
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString"
|
||||
connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
|
||||
connectionString="Data Source=SAKITTING\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC"
|
||||
providerName="System.Data.SqlClient"/>
|
||||
<!--<add name="AppData.Properties.Settings.Sauder_NKCConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC" providerName="System.Data.SqlClient"/>-->
|
||||
</connectionStrings>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
@@ -385,13 +386,14 @@
|
||||
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler"/>
|
||||
</modules>
|
||||
<validation validateIntegratedModeConfiguration="false"/>
|
||||
<handlers>
|
||||
<handlers>
|
||||
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
|
||||
<remove name="OPTIONSVerbHandler"/>
|
||||
<remove name="TRACEVerbHandler"/>
|
||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler"
|
||||
preCondition="integratedMode,runtimeVersionv4.0"/>
|
||||
</handlers></system.webServer>
|
||||
preCondition="integratedMode,runtimeVersionv4.0"/>
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
<elmah>
|
||||
<!--
|
||||
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
|
||||
@@ -417,8 +419,8 @@
|
||||
more information on using ASP.NET authorization securing ELMAH.
|
||||
|
||||
<authorization>
|
||||
<allow roles="admin"/>
|
||||
<deny users="*"/>
|
||||
<allow roles="admin" />
|
||||
<deny users="*" />
|
||||
</authorization>
|
||||
-->
|
||||
</system.web>
|
||||
|
||||
Reference in New Issue
Block a user