diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index d60ce845b..11840825b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -54,6 +54,12 @@ function Get-SeleniumWebDriverVersion { return "$driverName $webDriverVersion" } +function Get-SeleniumVersion { + $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name + $fullSeleniumVersion = (Get-ChildItem "C:\selenium\${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" + return "Selenium server $fullSeleniumVersion" +} + function Build-BrowserWebdriversEnvironmentTable { return @( @{ @@ -67,6 +73,10 @@ function Build-BrowserWebdriversEnvironmentTable { @{ "Name" = "GECKOWEBDRIVER" "Value" = $env:GECKOWEBDRIVER + }, + @{ + "Name" = "SELENIUM_JAR_PATH" + "Value" = $env:SELENIUM_JAR_PATH } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 5e13eedf3..d6fcbf754 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -119,7 +119,6 @@ $toolsList = @( (Get-StackVersion), (Get-SVNVersion), (Get-VSWhereVersion), - (Get-SeleniumVersion), (Get-SwigVersion), (Get-WinAppDriver), (Get-ZstdVersion), @@ -178,7 +177,8 @@ $markdown += New-MDList -Style Unordered -Lines @( (Get-SeleniumWebDriverVersion -Driver "edge"), (Get-BrowserVersion -Browser "firefox"), (Get-SeleniumWebDriverVersion -Driver "firefox"), - (Get-SeleniumWebDriverVersion -Driver "iexplorer") + (Get-SeleniumWebDriverVersion -Driver "iexplorer"), + (Get-SeleniumVersion) ) $markdown += New-MDHeader "Environment variables" -Level 4 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 5a85cc7ae..185c0b676 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -274,10 +274,4 @@ function Get-SwigVersion { (swig -version | Out-String) -match "version (?\d+\.\d+\.\d+)" | Out-Null $swigVersion = $Matches.Version return "Swig $swigVersion" -} - -function Get-SeleniumVersion { - $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name - $fullSeleniumVersion = (Get-ChildItem "C:\selenium\${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" - return "Selenium server $fullSeleniumVersion" } \ No newline at end of file