diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj index 978d72c4..7275948e 100644 --- a/IOB-WIN/IOB-WIN.csproj +++ b/IOB-WIN/IOB-WIN.csproj @@ -83,8 +83,8 @@ False ExtLib\krcc.dll - - ..\packages\MapoSDK.6.9.2001.1283\lib\net40\MapoSDK.dll + + ..\packages\MapoSDK.6.9.2002.1289\lib\net40\MapoSDK.dll ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll @@ -95,8 +95,8 @@ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - ..\packages\MTConnect.NET.2.8.1.29291\lib\net40\MTConnect-NET.dll + + ..\packages\MTConnect.NET.2.9.1.28314\lib\net40\MTConnect-NET.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll @@ -567,10 +567,10 @@ - + - + \ No newline at end of file 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..525b540c 100644 --- a/IOB-WIN/packages.config +++ b/IOB-WIN/packages.config @@ -1,7 +1,7 @@  - + @@ -11,7 +11,7 @@ - + @@ -20,5 +20,5 @@ - + \ No newline at end of file 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'