Add Windows 11 22H2 builds

Fixed Windows 10/11 ISO downloads
* Closes #41 * Closes #42
2025-09-16 22:28:02 +02:00 · 2022-09-20 22:57:29 +01:00 · 2022-08-13 15:08:20 +01:00 · 2022-08-12 14:02:34 +01:00 · 2022-05-28 15:21:05 +01:00
1 changed files with 41 additions and 29 deletions
--- a/Fido.ps1
+++ b/Fido.ps1
@@ -1,5 +1,5 @@
 #
-# Fido v1.28 - Feature ISO Downloader, for retail Windows images and UEFI Shell
+# Fido v1.32 - Feature ISO Downloader, for retail Windows images and UEFI Shell
 # Copyright © 2019-2022 Pete Batard <pete@akeo.ie>
 # Command line support: Copyright © 2021 flx5
 # ConvertTo-ImageSource: Copyright © 2016 Chris Carter
@@ -97,6 +97,11 @@ $ko = 0x20000
 $WindowsVersions = @(
 	@(
 		@("Windows 11", "windows11"),
+		@(
+			"22H2 (Build 22621.521 - 2022.09)",
+			@("Windows 11 Home/Pro/Edu", 2360),
+			@("Windows 11 Home China ", ($zh + 2361))
+		),
 		@(
 			"21H2 v1 (Build 22000.318 - 2021.11)",
 			@("Windows 11 Home/Pro/Edu", 2093),
@@ -273,6 +278,11 @@ $WindowsVersions = @(
 	),
 	@(
 		@("UEFI Shell 2.2", "UEFI_SHELL 2.2"),
+		@(
+			"22H1 (edk2-stable202205)",
+			@("Release", 0),
+			@("Debug", 1)
+		),
 		@(
 			"21H2 (edk2-stable202108)",
 			@("Release", 0),
@@ -577,7 +587,7 @@ $RequestData = @{}
 # This GUID applies to all visitors, regardless of their locale
 $RequestData["GetLangs"] = @("a8f8f489-4c7f-463a-9ca6-5cff94d8d041", "getskuinformationbyproductedition" )
 # This GUID applies to visitors of the en-US download page. Other locales may get a different GUID.
-$RequestData["GetLinks"] = @("a224afab-2097-4dfa-a2ba-463eb191a285", "GetProductDownloadLinksBySku" )
+$RequestData["GetLinks"] = @("6e2a1789-ef16-4f27-a296-74ef7ef5d96b", "GetProductDownloadLinksBySku" )
 # Create a semi-random Linux User-Agent string
 $FirefoxVersion = Get-Random -Minimum 50 -Maximum 90
 $FirefoxDate = Get-RandomDate
@@ -788,7 +798,9 @@ function Get-Windows-Download-Links([int]$SelectedVersion, [int]$SelectedRelease

 		try {
 			$Is64 = [Environment]::Is64BitOperatingSystem
-			$r = Invoke-WebRequest -Method Post -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
+			# Must add a referer for POST requests, else Microsoft's servers will deny them
+			$ref = "https://www.microsoft.com/software-download/windows11"
+			$r = Invoke-WebRequest -Method Post -Headers @{"Referer" = $ref} -UseBasicParsing -UserAgent $UserAgent -WebSession $Session $url
 			if ($r -match "errorModalMessage") {
 				Throw-Error -Req $r -Alt "Could not retrieve architectures from server"
 			}
@@ -1151,8 +1163,8 @@ exit $ExitCode
 # SIG # Begin signature block
 # MIIkWQYJKoZIhvcNAQcCoIIkSjCCJEYCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBoSxq+Hd/1vEWw
-# eDHx62oJBEQcs5WswgIbrZDkJ0kMbKCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCD6h5jkGuLA4flo
+# AEOvdhqzbH5KP4Nh/95HnUq3WD2RxKCCElkwggVvMIIEV6ADAgECAhBI/JO0YFWU
 # jTanyYqJ1pQWMA0GCSqGSIb3DQEBDAUAMHsxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # DBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoM
 # EUNvbW9kbyBDQSBMaW1pdGVkMSEwHwYDVQQDDBhBQUEgQ2VydGlmaWNhdGUgU2Vy
@@ -1255,23 +1267,23 @@ exit $ExitCode
 # aWMgQ29kZSBTaWduaW5nIENBIEVWIFIzNgIRAL+xUAG79ZLUlip3l+pzb6MwDQYJ
 # YIZIAWUDBAIBBQCgfDAQBgorBgEEAYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYK
 # KwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG
-# 9w0BCQQxIgQgougliXZ/wuYNXumkzCMK5FQDWgtAe8LnWlBrtqEiDKUwDQYJKoZI
-# hvcNAQEBBQAEggIAdB3UX33Us43j1YraPmuCKRqvoTEJkn1Pcdo9ISeIxgLWpzNs
-# LQEf8Ie2ocHG3z/Ae23xy1XnqSP4XUtkicRO+3QIIwJ50/BKig9/yZdO9nOmLSFt
-# 3aBc1BqG5a4qvT+PYyGOmYKlZkp05XvH2ngdURa971Jv89Etqyks3km++S8dXb/C
-# UNrBLp8B1VQ6UMdCvCSYu4H1VS4p2sCoLSwQnCuNZxU/TcdiYwsqeUPqG4PlxBYI
-# TyZbj+HJdvX66M0SlrO7o0rD5QZbLGUNLyOJoG9gjRKoGW8p+E/djo2rDsbfKe2c
-# X5aFUifm++aZ0dlW6hDdmi2DkAcdXHyW7XN3d1bjkoOTyn+ASftc9GYWqFJEUT6T
-# SxS+9XYvhr6jFwMfggv8tP1DAJz8kKSbcfrNkujYXU3CtqXmpTUZm4+zT6XG3Qsd
-# 71iRnjYwCu/gsKxE40nHvNJS0QQ87+Cm93P5AepJGg1/uk5i/FGh7bJ+XaOemMSm
-# oMMaCthj+4rzcSZ9Emvyimb0IOlAKAUN/asAvknWh8LXHquxdrNWdRQlGofwA3ng
-# TjTklBaQDJTO/hR09RIEmytyTKDSxZrUSfZZ+eZsOV835cPwHsxc5Hw0N79kSHIR
-# LCOWfUHv/FN5er79XbsqLXEDQBIXtIPyRT5XFoPZhz+wQZs9++YaP4HFuDahgg49
+# 9w0BCQQxIgQgYNJ1tAjux5cSXZGUyaCHzKMqd3wSI6IPP6QRgfqH7ZcwDQYJKoZI
+# hvcNAQEBBQAEggIAC77UeQjlf3wPGfBs449r/Fd86SGJTkIhncW5qierUDv7jCzG
+# 41Z+GHaDoDqyuha2ciiMy41YyEOXsxAQ3jvN0AUk3lhFrw1vpxRgljp3Gqix92QW
+# gwweiJIf7Wk25F0AIQRxTrYcUeHQTglaAJ9pWsnRDkrBNMmEWF13dYzwLEh27WYn
+# R+tGNGysWWincXwjiB4siSvYc8UOkWci/scK1xP8OYPrHSkA4dkgPtdE5C4h0hU2
+# 7stnpOtb0ghRLSoEBSASfTD1827GAV2/tWZ0imnluEtK6AW8mNDO6Y8Y1hqfsYl6
+# DapPzvFAE/AqvMEnLRF2GnYAChTsFj2dhlNk7bRGqdTU5Y68VYjolNTEcuXJ7cAD
+# RVXUvA/kcaF03cm14h0uBC1H5r4uKV5qp0QX3442yze8xwLsoEJncS+lzgOzMpsf
+# sFND0eShfTDbS9o5xZqunafY1NZOzu3zd6zh+YssOA8JCkPxdFGDzCSv0FUjM9bE
+# +ieZptkB5ENhva07fajhKdY/HVUOxEGUFUuWz0oiPGtCtcsTLT/LIda/xxmM4iFe
+# w8eqmuDJFNGtRWhJrd5JjU5CVhMUHvlrC/sA+QqkFvE7uQ1AkwmXocY8vbGR4H2V
+# wnlccMmGuBkYniuhYFdikRwS/hXT/YOr3tsb1Upnkze/udz8rGsHOMUKt9ehgg49
 # MIIOOQYKKwYBBAGCNwMDATGCDikwgg4lBgkqhkiG9w0BBwKggg4WMIIOEgIBAzEN
 # MAsGCWCGSAFlAwQCATCCAQ8GCyqGSIb3DQEJEAEEoIH/BIH8MIH5AgEBBgtghkgB
-# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCBTB2MCblEVgL/J2ueYihS9iXKxuE3P
-# MMWV153b+fciBwIVALiTlFr3LDTvVG0F4tF8kixrLL9IGA8yMDIyMDEyNjIwNDY1
-# N1owAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
+# hvhFAQcXAzAxMA0GCWCGSAFlAwQCAQUABCA14LAXm88+tZ3FC2cVxGuBtbMKzk6a
+# NCjj3OgaseaZvgIVAIhD9ElHH5Y3yqMokr9xGzeLKkwSGA8yMDIyMDkyMDIxNTcw
+# OFowAwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVj
 # IENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMTEw
 # LwYDVQQDEyhTeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIFNpZ25lciAtIEcz
 # oIIKizCCBTgwggQgoAMCAQICEHsFsdRJaFFE98mJ0pwZnRIwDQYJKoZIhvcNAQEL
@@ -1334,13 +1346,13 @@ exit $ExitCode
 # BgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBU
 # cnVzdCBOZXR3b3JrMSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1w
 # aW5nIENBAhB71OWvuswHP6EBIwQiQU0SMAsGCWCGSAFlAwQCAaCBpDAaBgkqhkiG
-# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDEyNjIwNDY1
-# N1owLwYJKoZIhvcNAQkEMSIEIIK+PEpBx+mrb3vR20xkouo7+D6Z8F+IcfPB1ugk
-# JhbkMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
-# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQCoRSQVcp2FKLwh5Jeuo/dOuM2o
-# v7yiMYYR9A0CFHfd+zZsz6ZximV4fYH4BzGLH0Vn5snsupWXRuwXk7bm2Ge6q2cu
-# HOltVpkhSv1VSnzaHshyecs9t/MZhjFoqsvUv15KJoKfGHL9f/Bu+jmjuGotnHrC
-# HkFQ4iTtQwWnD5iq+yeWEo/0CIs+id586C2Q8cstv7xxVS3lut0xrEWkmKv0u/SW
-# 2s09cxmBjlObmWGYcRAildr/g62TXlO6aOL4Zji04IDCOdXT9LfHZdEYHGY5L1mw
-# mECqnRMYPbG3ZRwiMmsCQq9nhxNXtE9qYkjBBhr+YSPPmRljuAxe9KVZfXO8
+# 9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDkyMDIxNTcw
+# OFowLwYJKoZIhvcNAQkEMSIEICcu8Fuw/1HxTul0vtNyaZO+8LZLFsCph/n2wPti
+# mtGwMDcGCyqGSIb3DQEJEAIvMSgwJjAkMCIEIMR0znYAfQI5Tg2l5N58FMaA+eKC
+# ATz+9lPvXbcf32H4MAsGCSqGSIb3DQEBAQSCAQB5LyfB7M+z9j4uVqZ76ibc5DuL
+# SGPIqu9Uakos5Mbg7IMAYt1MrnCzqQw00eqa87HCfa48UJz4npEjeo9wo+iHFf+S
+# fLXDzzJ1UK6d8o0ESEQI6/HKi/CQ052Ikt2q0gbhsvp3tb2OlLDu5hWz0+yIf+ru
+# rP/lGpjwRImXpTdlQEfZ9nxOj+pEowaV7KyS/ukMOWygQn8pS42McNW2JV1WXAPT
+# MJ+bLdHy7W9jQIK8xZ6yqS7H9YYKRvCNz28zYBWrRl+Lgr5vsM+WJ6+1042pnd4G
+# 5NiyWHvp4kd5EiuKAIyc+8kb4yGATNf08utpKxNQ/0e58ibNaChRS3UyI/fO
 # SIG # End signature block
Author	SHA1	Message	Date
Pete Batard	ce7cb583e5	Add Windows 11 22H2 builds	2022-09-20 22:57:29 +01:00
William Bulin	0287fe274e	Fixed Windows 10/11 ISO downloads * Closes #41 * Closes #42	2022-08-13 15:08:20 +01:00
Pete Batard	129e5d6f5c	Disable Windows ISO downloads * Per #41 Microsoft appear to have altered their website to make it hostile to our script. * Considering that trying to troubleshoot this is likely to take a long while, and that I sure could use some help with it, add a notice about this whole mess...	2022-08-12 14:02:34 +01:00
Pete Batard	79bcf10633	Add Shell 2.2 22H1 download	2022-05-28 15:21:05 +01:00