From 87440c2afa8d4e3886c535e40f2a2eec7dabca06 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 27 Feb 2020 12:10:14 +0100
Subject: [PATCH 1/4] Fix path avvio processo driver firefox

---
 IOB-WIN/IOB-WIN.csproj  | 4 ++--
 IOB-WIN/IobWPS.cs       | 4 ++--
 IOB-WIN/packages.config | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 978d72c4..5ed6f661 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -83,8 +83,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>ExtLib\krcc.dll</HintPath>
     </Reference>
-    <Reference Include="MapoSDK, Version=6.9.2001.1283, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MapoSDK.6.9.2001.1283\lib\net40\MapoSDK.dll</HintPath>
+    <Reference Include="MapoSDK, Version=6.9.2002.1289, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MapoSDK.6.9.2002.1289\lib\net40\MapoSDK.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
diff --git a/IOB-WIN/IobWPS.cs b/IOB-WIN/IobWPS.cs
index 7fbb7539..56376272 100644
--- a/IOB-WIN/IobWPS.cs
+++ b/IOB-WIN/IobWPS.cs
@@ -178,7 +178,7 @@ namespace IOB_WIN
         // preparo opzione headless x CHROME
         var o = new ChromeOptions();
         o.AddArgument("headless");
-        ChromeDriverService service = ChromeDriverService.CreateDefaultService(Environment.CurrentDirectory);
+        ChromeDriverService service = ChromeDriverService.CreateDefaultService(Application.StartupPath);
         service.HideCommandPromptWindow = true;
         driver = new ChromeDriver(service, o);
         //driver = new ChromeDriver(Environment.CurrentDirectory, o);
@@ -191,7 +191,7 @@ namespace IOB_WIN
         o.AddArgument("-headless");
         o.SetPreference("app.update.auto", false);
         o.SetPreference("app.update.enabled", false);
-        FirefoxDriverService service = FirefoxDriverService.CreateDefaultService(Environment.CurrentDirectory);
+        FirefoxDriverService service = FirefoxDriverService.CreateDefaultService(Application.StartupPath);
         service.HideCommandPromptWindow = true;
         driver = new FirefoxDriver(service, o);
         //driver = new FirefoxDriver(Environment.CurrentDirectory, o);
diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config
index ddd49ab2..b899973c 100644
--- a/IOB-WIN/packages.config
+++ b/IOB-WIN/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autoupdater.NET.Official" version="1.5.1" targetFramework="net40-client" />
-  <package id="MapoSDK" version="6.9.2001.1283" targetFramework="net40-client" />
+  <package id="MapoSDK" version="6.9.2002.1289" targetFramework="net40-client" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40-client" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40-client" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40-client" />

From e605bbb62f3e73b7d96c16eb2c0f74d5a5b361d7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 27 Feb 2020 12:10:53 +0100
Subject: [PATCH 2/4] Update nuget: MTC

---
 IOB-WIN/IOB-WIN.csproj  | 6 ++----
 IOB-WIN/packages.config | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 5ed6f661..2cde1f8e 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -95,8 +95,8 @@
     <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
     </Reference>
-    <Reference Include="MTConnect-NET, Version=2.8.1.29291, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MTConnect.NET.2.8.1.29291\lib\net40\MTConnect-NET.dll</HintPath>
+    <Reference Include="MTConnect-NET, Version=2.9.1.28314, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MTConnect.NET.2.9.1.28314\lib\net40\MTConnect-NET.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
@@ -567,10 +567,8 @@
     <Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.79.0.3945.3600\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.79.0.3945.3600\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
   <Import Project="..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets')" />
-  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.79.0.3945.3600\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.79.0.3945.3600\build\Selenium.WebDriver.ChromeDriver.targets')" />
 </Project>
\ No newline at end of file
diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config
index b899973c..51cc7336 100644
--- a/IOB-WIN/packages.config
+++ b/IOB-WIN/packages.config
@@ -11,7 +11,7 @@
   <package id="Microsoft.NetCore.Analyzers" version="2.9.8" targetFramework="net40-client" developmentDependency="true" />
   <package id="Microsoft.NetFramework.Analyzers" version="2.9.8" targetFramework="net40-client" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net40-client" developmentDependency="true" />
-  <package id="MTConnect.NET" version="2.8.1.29291" targetFramework="net40-client" />
+  <package id="MTConnect.NET" version="2.9.1.28314" targetFramework="net40-client" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40-client" />
   <package id="NLog" version="4.6.8" targetFramework="net40-client" />
   <package id="OmronFinsTCP.Net" version="3.0.0.0" targetFramework="net40-client" />
@@ -20,5 +20,4 @@
   <package id="S7netplus" version="0.1.9" targetFramework="net40-client" />
   <package id="Selenium.Firefox.WebDriver" version="0.26.0" targetFramework="net40-client" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net40-client" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="79.0.3945.3600" targetFramework="net40-client" />
 </packages>
\ No newline at end of file

From 41e186d3158312d0c8c3a7a70caac8d35faf6972 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 27 Feb 2020 12:11:05 +0100
Subject: [PATCH 3/4] Update nuget: CHROME driver selenium

---
 IOB-WIN/IOB-WIN.csproj  | 2 ++
 IOB-WIN/packages.config | 1 +
 2 files changed, 3 insertions(+)

diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 2cde1f8e..7275948e 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -567,8 +567,10 @@
     <Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.80.0.3987.10600\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.80.0.3987.10600\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
   <Import Project="..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets')" />
+  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.80.0.3987.10600\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.80.0.3987.10600\build\Selenium.WebDriver.ChromeDriver.targets')" />
 </Project>
\ No newline at end of file
diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config
index 51cc7336..525b540c 100644
--- a/IOB-WIN/packages.config
+++ b/IOB-WIN/packages.config
@@ -20,4 +20,5 @@
   <package id="S7netplus" version="0.1.9" targetFramework="net40-client" />
   <package id="Selenium.Firefox.WebDriver" version="0.26.0" targetFramework="net40-client" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net40-client" />
+  <package id="Selenium.WebDriver.ChromeDriver" version="80.0.3987.10600" targetFramework="net40-client" />
 </packages>
\ No newline at end of file

From 0424cdd7d134d64c1ecb1596e59fe4ea8dce6cd0 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 27 Feb 2020 12:11:56 +0100
Subject: [PATCH 4/4] update vers number x testare!

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0bce5d71..dd2cab00 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=677']) {
+        withEnv(['NEXT_BUILD_NUMBER=678']) {
           // env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'