From 6b72617d9d154a0e2d71a61bf9b2aad5e2ca74a0 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 7 May 2019 22:26:10 +0200
Subject: [PATCH] Update senza firefox (alleggerito?)

---
 IOB-WIN/IOB-WIN.csproj  |  2 --
 IOB-WIN/IobWPS.cs       | 19 ++++++++-----------
 IOB-WIN/packages.config |  1 -
 Jenkinsfile             |  2 +-
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 91eb8cdb..dd7aae29 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -411,9 +411,7 @@
       <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.20\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.20\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets'))" />
     <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.74.0.3729.6\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.74.0.3729.6\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
-  <Import Project="..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" />
   <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.74.0.3729.6\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.74.0.3729.6\build\Selenium.WebDriver.ChromeDriver.targets')" />
 </Project>
\ No newline at end of file
diff --git a/IOB-WIN/IobWPS.cs b/IOB-WIN/IobWPS.cs
index 2283ec1f..52479d9c 100644
--- a/IOB-WIN/IobWPS.cs
+++ b/IOB-WIN/IobWPS.cs
@@ -153,11 +153,10 @@ namespace IOB_WIN
     private void startDriver()
     {
 #if false
+      lgInfo("Starting FIREFOX Driver");
       // preparo opzione headless x firefox
-      var o = new FirefoxOptions();
-      //o.AddArgument("--headless");
-      o.AddArgument("-headless");
-      //o.AddArgument("-background");
+      var o = new FirefoxOptions();   
+      o.AddArgument("-headless");        
       driver = new FirefoxDriver(Environment.CurrentDirectory, o);
       // aggiungo timeout x JScripts
       driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(10);
@@ -167,13 +166,11 @@ namespace IOB_WIN
 #endif
 
 
-#if true
-      // preparo opzione headless x firefox
-      var o = new ChromeOptions();
-      //o.AddArgument("--headless");   
-      o.AddArgument("-headless");
-      o.AddArgument("headless");
-      //o.AddArgument("-background");       
+#if true                                
+      lgInfo("Starting CHROME Driver");
+      // preparo opzione headless x CHROME
+      var o = new ChromeOptions();        
+      //o.AddArgument("headless");                  
       ChromeDriverService service = ChromeDriverService.CreateDefaultService(Environment.CurrentDirectory);
       service.HideCommandPromptWindow = true;
       driver = new ChromeDriver(service, o);
diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config
index 67137a58..36600729 100644
--- a/IOB-WIN/packages.config
+++ b/IOB-WIN/packages.config
@@ -6,7 +6,6 @@
   <package id="NLog" version="4.6.3" targetFramework="net40-client" />
   <package id="PrettyBin" version="1.1.0" targetFramework="net461" />
   <package id="S7netplus" version="0.1.9" targetFramework="net40-client" />
-  <package id="Selenium.Firefox.WebDriver" version="0.24.0" targetFramework="net40-client" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net40-client" />
   <package id="Selenium.WebDriver.ChromeDriver" version="74.0.3729.6" targetFramework="net40-client" />
 </packages>
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index c3d0cdcf..2ea06a19 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=418']) {
+        withEnv(['NEXT_BUILD_NUMBER=419']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'