Update version and copyright year

* Microsoft updated 20H2 in December. Make sure we enable those downloads too.
* Closes #21

.whitesource

@@ -0,0 +1,8 @@
+{
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure"
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW"
+  }
+}

Fido.ps1

@@ -1,6 +1,6 @@
 #
-# Fido v1.13 - Retail Windows ISO Downloader
+# Fido v1.18 - Retail Windows ISO Downloader
-# Copyright © 2019 Pete Batard <pete@akeo.ie>
+# Copyright © 2019-2021 Pete Batard <pete@akeo.ie>
 # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
 #
 # This program is free software: you can redistribute it and/or modify
@@ -63,7 +63,11 @@ $code = @"
 	}
 "@
 
-Add-Type -MemberDefinition $code -Namespace Gui -UsingNamespace "System.IO", "System.Text", "System.Drawing", "System.Globalization" -ReferencedAssemblies System.Drawing -Name Utils -ErrorAction Stop
+if ($host.version -ge "7.0") {
+  Add-Type -MemberDefinition $code -Namespace Gui -UsingNamespace System.Runtime, System.IO, System.Text, System.Drawing, System.Globalization -ReferencedAssemblies System.Drawing.Common -Name Utils -ErrorAction Stop
+} else {
+  Add-Type -MemberDefinition $code -Namespace Gui -UsingNamespace System.IO, System.Text, System.Drawing, System.Globalization -ReferencedAssemblies System.Drawing -Name Utils -ErrorAction Stop
+}
 Add-Type -AssemblyName PresentationFramework
 # Hide the powershell window: https://stackoverflow.com/a/27992426/1069307
 [Gui.Utils]::ShowWindow(([System.Diagnostics.Process]::GetCurrentProcess() | Get-Process).MainWindowHandle, 0) | Out-Null
@@ -75,6 +79,30 @@ $ko = 0x20000
 $WindowsVersions = @(
 	@(
 		@("Windows 10", "Windows10ISO"),
+		@(
+			"20H2 (Build 19042.631 - 2020.12)",
+			@("Windows 10 Home/Pro", 1882),
+			@("Windows 10 Education", 1884),
+			@("Windows 10 Home China ", ($zh + 1883))
+		),
+		@(
+			"20H2 (Build 19042.508 - 2020.10)",
+			@("Windows 10 Home/Pro", 1807),
+			@("Windows 10 Education", 1805),
+			@("Windows 10 Home China ", ($zh + 1806))
+		),
+		@(
+			"20H1 (Build 19041.264 - 2020.05)",
+			@("Windows 10 Home/Pro", 1626),
+			@("Windows 10 Education", 1625),
+			@("Windows 10 Home China ", ($zh + 1627))
+		),
+		@(
+			"19H2 (Build 18363.418 - 2019.11)",
+			@("Windows 10 Home/Pro", 1429),
+			@("Windows 10 Education", 1431),
+			@("Windows 10 Home China ", ($zh + 1430))
+		),
 		@(
 			"19H1 (Build 18362.356 - 2019.09)",
 			@("Windows 10 Home/Pro", 1384),
@@ -204,10 +232,10 @@ function Select-Language([string]$LangName)
 		($SysLocale.StartsWith("da") -and $LangName -like "*Danish*") -or `
 		($SysLocale.StartsWith("nl") -and $LangName -like "*Dutch*") -or `
 		($SysLocale -eq "en-US" -and $LangName -eq "English") -or `
-		($SysLocale.StartsWith("en") -and $LangName -like "*English*" -and $LangName -like "*inter*") -or `
+		($SysLocale.StartsWith("en") -and $LangName -like "*English*" -and ($LangName -like "*inter*" -or $LangName -like "*ingdom*")) -or `
 		($SysLocale.StartsWith("et") -and $LangName -like "*Eston*") -or `
 		($SysLocale.StartsWith("fi") -and $LangName -like "*Finn*") -or `
-		($SysLocale -eq "fr-CA"  -and $LangName -like "*French*" -and $LangName -like "*Canad*") -or `
+		($SysLocale -eq "fr-CA" -and $LangName -like "*French*" -and $LangName -like "*Canad*") -or `
 		($SysLocale.StartsWith("fr") -and $LangName -eq "French") -or `
 		($SysLocale.StartsWith("de") -and $LangName -like "*German*") -or `
 		($SysLocale.StartsWith("el") -and $LangName -like "*Greek*") -or `
@@ -379,12 +407,9 @@ function Error([string]$ErrorMessage)
 	Write-Host Error: $ErrorMessage
 	$XMLForm.Title = $(Get-Translation("Error")) + ": " + $ErrorMessage
 	Refresh-Control($XMLForm)
-	$Continue.Content = Get-Translation("Close")
+	$XMLGrid.Children[2 * $script:Stage + 1].IsEnabled = $True
-	Refresh-Control($Continue)
 	$UserInput = [System.Windows.MessageBox]::Show($XMLForm.Title,  $(Get-Translation("Error")), "OK", "Error")
-	$script:ExitCode = $Stage
+	$script:ExitCode = $script:Stage--
-	$script:Stage = -1
-	$Continue.IsEnabled = $True
 }
 
 function Get-RandomDate()
@@ -502,11 +527,7 @@ $WindowsVersion.DisplayMemberPath = "Version"
 
 # Button Action
 $Continue.add_click({
-	if ($script:Stage++ -lt 0) {
+	$script:Stage++
-		Get-Process -Id $pid | Foreach-Object { $_.CloseMainWindow() | Out-Null }
-		return
-	}
-
 	$XMLGrid.Children[2 * $Stage + 1].IsEnabled = $False
 	$Continue.IsEnabled = $False
 	$Back.IsEnabled = $False
@@ -571,10 +592,14 @@ $Continue.add_click({
 			$i = 0
 			$SelectedIndex = 0
 			try {
-				$r = Invoke-WebRequest -UserAgent $UserAgent -WebSession $Session $url
+				$r = Invoke-WebRequest -UserAgent $UserAgent -SessionVariable "Session" $url
 				# Go through an XML conversion to keep all PowerShells happy...
 				if (-not $($r.AllElements | ? {$_.id -eq "product-languages"})) {
-					throw "Unexpected server response"
+					if ($host.version -ge "7.0") {
+						throw "This PowerShell version can not parse HTML"
+					} else {
+						throw "Unexpected server response"
+					}
 				}
 				$html = $($r.AllElements | ? {$_.id -eq "product-languages"}).InnerHTML
 				$html = $html.Replace("selected value", "value")
@@ -596,7 +621,7 @@ $Continue.add_click({
 				}
 			} catch {
 				Error($_.Exception.Message)
-				return
+				break
 			}
 			$script:Language = Add-Entry $Stage "Language" $array "DisplayLanguage"
 			$Language.SelectedIndex = $SelectedIndex
@@ -631,6 +656,7 @@ $Continue.add_click({
 				$html = $html.Replace("class=product-download-hidden", "")
 				$html = $html.Replace("type=hidden", "")
 				$html = $html.Replace(">", "/>")
+				$html = $html.Replace("&nbsp;", " ")
 				$html = $html.Replace("IsoX86", """x86""")
 				$html = $html.Replace("IsoX64", """x64""")
 				$html = "<inputs>" + $html + "</inputs>"
@@ -646,11 +672,11 @@ $Continue.add_click({
 					}
 				}
 				if ($array.Length -eq 0) {
-					Throw-Error -Req $r -Alt "Could not retreive ISO download links"
+					Throw-Error -Req $r -Alt "Could not retrieve ISO download links"
 				}
 			} catch {
 				Error($_.Exception.Message)
-				return
+				break
 			}
 
 			$script:Arch = Add-Entry $Stage "Architecture" $array "Type"
@@ -687,7 +713,7 @@ $Continue.add_click({
 	}
 	$Continue.IsEnabled = $True
 	if ($Stage -ge 0) {
-		$Back.IsEnabled = $True;
+		$Back.IsEnabled = $True
 	}
 })
 
@@ -711,10 +737,12 @@ $Back.add_click({
 		$Margin.Top -= $dh2
 		$Back.Margin = $Margin
 		$script:Stage = $Stage - 1
+		$XMLForm.Title = $AppTitle
 		if ($Stage -eq 0) {
 			$Back.Content = Get-Translation("Close")
-		} elseif ($Stage -eq 3) {
+		} else {
 			$Continue.Content = Get-Translation("Continue")
+			Refresh-Control($Continue)
 		}
 	}
 })