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

Merge branch 'develop' into IobMan

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-27 12:12:00 +01:00
parent 2cecdda220 0424cdd7d1
commit ff2e0351b2
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IOB-WIN.csproj
+6 -6
View File
@@ -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>
@@ -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,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.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'))" />
<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.79.0.3945.3600\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.79.0.3945.3600\build\Selenium.WebDriver.ChromeDriver.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>
IOB-WIN/IobWPS.cs
+2 -2
View File
@@ -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);
IOB-WIN/packages.config
+3 -3
View File
@@ -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" />
@@ -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,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="79.0.3945.3600" targetFramework="net40-client" />
<package id="Selenium.WebDriver.ChromeDriver" version="80.0.3987.10600" targetFramework="net40-client" />
</packages>
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'