Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update senza firefox (alleggerito?)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-05-07 22:26:10 +02:00
parent 45dc2db17d
commit 6b72617d9d
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IOB-WIN.csproj
-2
View File
@@ -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>
IOB-WIN/IobWPS.cs
+8 -11
View File
@@ -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);
IOB-WIN/packages.config
-1
View File
@@ -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>
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'