Refresh versione 1906

This commit is contained in:
Samuele E. Locatelli
2019-06-03 16:52:57 +02:00
parent d6a783a63b
commit bc1e1d5a8c
3 changed files with 22 additions and 14 deletions
+12 -12
View File
@@ -4,20 +4,20 @@
<asp:Content ID="Content1" ContentPlaceHolderID="Head" runat="server">
<asp:ContentPlaceHolder runat="server" ID="HeadContent">
</asp:ContentPlaceHolder>
<asp:ContentPlaceHolder runat="server" ID="HeadContent">
</asp:ContentPlaceHolder>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Featured" runat="server">
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent">
</asp:ContentPlaceHolder>
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent">
</asp:ContentPlaceHolder>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="Main" runat="server">
<div runat="server" id="divNumKeyb" class="divNumKeyb">
NUMERIC KEYPAD
<uc1:mod_numKey runat="server" id="mod_numKey" />
</div>
<div runat="server" id="divMain" class="divMain">
<asp:ContentPlaceHolder runat="server" ID="MCon">
</asp:ContentPlaceHolder>
</div>
<div runat="server" id="divNumKeyb" class="divNumKeyb">
NUMERIC KEYPAD
<uc1:mod_numKey runat="server" ID="mod_numKey" />
</div>
<div runat="server" id="divMain" class="divMain">
<asp:ContentPlaceHolder runat="server" ID="MCon">
</asp:ContentPlaceHolder>
</div>
</asp:Content>
+9 -1
View File
@@ -345,6 +345,7 @@
<Content Include="AnagPartImb.aspx" />
<Content Include="App_Readme\Elmah.txt" />
<Content Include="AssegnaNC.aspx" />
<Content Include="confLinee.aspx" />
<Content Include="consumoAnime.aspx" />
<Content Include="consumoFusi.aspx" />
<Content Include="Content\bootstrap-grid.css" />
@@ -843,6 +844,13 @@
<Compile Include="chLang.aspx.designer.cs">
<DependentUpon>chLang.aspx</DependentUpon>
</Compile>
<Compile Include="confLinee.aspx.cs">
<DependentUpon>confLinee.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="confLinee.aspx.designer.cs">
<DependentUpon>confLinee.aspx</DependentUpon>
</Compile>
<Compile Include="consumoAnime.aspx.cs">
<DependentUpon>consumoAnime.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -2892,7 +2900,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>57804</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:57804</IISUrl>
<IISUrl>http://localhost:57805</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=2119']) {
withEnv(['NEXT_BUILD_NUMBER=2121']) {
// impiego numero di build del SINGOLO RAMO
// env.versionNumber = VersionNumber(versionNumberString : '4.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
// forzo numero di build x tutti rami uguali