Fixed wrong check for Windows 11 LTSC

farag2 · farag2 · commit 2c05925e78e6 · 2024-10-07T21:29:04.000+03:00
diff --git a/src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1
@@ -580,7 +580,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);
 	}
 
 	# Detect Windows build version
-	if ((Get-WindowsEdition -Online).Edition -notmatch "EnterpriseS")
+	if ((Get-WindowsEdition -Online).Edition -ne "EnterpriseS")
 	{
 		Write-Information -MessageData "" -InformationAction Continue
 		Write-Warning -Message $Localization.UnsupportedOSBuild
@@ -1344,11 +1344,8 @@ function ErrorReporting
 	{
 		"Disable"
 		{
-			if ((Get-WindowsEdition -Online).Edition -notmatch "Core")
-			{
-				Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore | Disable-ScheduledTask
-				New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force
-			}
+			Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore | Disable-ScheduledTask
+			New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force
 
 			Get-Service -Name WerSvc | Stop-Service -Force
 			Get-Service -Name WerSvc | Set-Service -StartupType Disabled
diff --git a/src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1
@@ -580,7 +580,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);
 	}
 
 	# Detect Windows build version
-	if ((Get-WindowsEdition -Online).Edition -notmatch "EnterpriseS")
+	if ((Get-WindowsEdition -Online).Edition -ne "EnterpriseS")
 	{
 		Write-Information -MessageData "" -InformationAction Continue
 		Write-Warning -Message $Localization.UnsupportedOSBuild
@@ -1344,11 +1344,8 @@ function ErrorReporting
 	{
 		"Disable"
 		{
-			if ((Get-WindowsEdition -Online).Edition -notmatch "Core")
-			{
-				Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore | Disable-ScheduledTask
-				New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force
-			}
+			Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore | Disable-ScheduledTask
+			New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force
 
 			Get-Service -Name WerSvc | Stop-Service -Force
 			Get-Service -Name WerSvc | Set-Service -StartupType Disabled
diff --git a/src/Sophia_Script_for_Windows_11_LTSC_2024/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11_LTSC_2024/Module/Sophia.psm1
@@ -577,10 +577,24 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);
 		exit
 	}
 
+	# Detect Windows build version
+	if ((Get-WindowsEdition -Online).Edition -ne "EnterpriseS")
+	{
+		Write-Information -MessageData "" -InformationAction Continue
+		Write-Warning -Message $Localization.UnsupportedOSBuild
+		Write-Information -MessageData "" -InformationAction Continue
+
+		Write-Verbose -Message "https://t.me/sophia_chat" -Verbose
+		Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose
+		Write-Verbose -Message "https://github.com/farag2/Sophia-Script-for-Windows#system-requirements" -Verbose
+
+		exit
+	}
+
 	# Detect Windows build version
 	switch ((Get-CimInstance -ClassName CIM_OperatingSystem).BuildNumber)
 	{
-		{$_ -lt 22631}
+		{$_ -ne 26100}
 		{
 			Write-Information -MessageData "" -InformationAction Continue
 			Write-Warning -Message $Localization.UnsupportedOSBuild
@@ -601,7 +615,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);
 
 			exit
 		}
-		"22631"
+		"26100"
 		{
 			# Check whether the current module version is the latest one
 			try
@@ -626,7 +640,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);
 						Verbose         = $true
 						UseBasicParsing = $true
 					}
-					$LatestSupportedBuild = (Invoke-RestMethod @Parameters).Windows_11
+					$LatestSupportedBuild = (Invoke-RestMethod @Parameters).Windows_11_LTSC_2024
 				}
 				catch [System.Net.WebException]
 				{
@@ -1333,11 +1347,8 @@ function ErrorReporting
 	{
 		"Disable"
 		{
-			if ((Get-WindowsEdition -Online).Edition -notmatch "Core")
-			{
-				Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore | Disable-ScheduledTask
-				New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force
-			}
+			Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore | Disable-ScheduledTask
+			New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force
 
 			Get-Service -Name WerSvc | Stop-Service -Force
 			Get-Service -Name WerSvc | Set-Service -StartupType Disabled
diff --git a/supported_windows_builds.json b/supported_windows_builds.json
@@ -6,5 +6,7 @@
 	"Windows_10_LTSC_2021_URL": "https://support.microsoft.com/en-us/topic/windows-10-update-history-857b8ccb-71e4-49e5-b3f6-7073197d98fb",
 	"Windows_10_LTSC_2021": "4894",
 	"Windows_11_URL": "https://support.microsoft.com/en-us/topic/windows-11-version-23h2-update-history-59875222-b990-4bd9-932f-91a5954de434",
-	"Windows_11": "4169"
+	"Windows_11": "4169",
+	"Windows_11_LTSC_2024_URL": "https://support.microsoft.com/en-us/topic/windows-11-version-24h2-update-history-0929c747-1815-4543-8461-0160d16f15e5",
+	"Windows_11_LTSC_2024": "1742"
 }

Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`# Detect Windows build version`
`583`		`- if ((Get-WindowsEdition -Online).Edition -notmatch "EnterpriseS")`
	`583`	`+ if ((Get-WindowsEdition -Online).Edition -ne "EnterpriseS")`
`584`	`584`	`{`
`585`	`585`	`Write-Information -MessageData "" -InformationAction Continue`
`586`	`586`	`Write-Warning -Message $Localization.UnsupportedOSBuild`
`@@ -1344,11 +1344,8 @@ function ErrorReporting`
`1344`	`1344`	`{`
`1345`	`1345`	`"Disable"`
`1346`	`1346`	`{`
`1347`		`- if ((Get-WindowsEdition -Online).Edition -notmatch "Core")`
`1348`		`- {`
`1349`		`- Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore \| Disable-ScheduledTask`
`1350`		`- New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force`
`1351`		`- }`
	`1347`	`+ Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore \| Disable-ScheduledTask`
	`1348`	`+ New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force`
`1352`	`1349`
`1353`	`1350`	`Get-Service -Name WerSvc \| Stop-Service -Force`
`1354`	`1351`	`Get-Service -Name WerSvc \| Set-Service -StartupType Disabled`
Original file line number	Diff line number	Diff line change
`@@ -577,10 +577,24 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);`
`577`	`577`	`exit`
`578`	`578`	`}`
`579`	`579`
	`580`	`+ # Detect Windows build version`
	`581`	`+ if ((Get-WindowsEdition -Online).Edition -ne "EnterpriseS")`
	`582`	`+ {`
	`583`	`+ Write-Information -MessageData "" -InformationAction Continue`
	`584`	`+ Write-Warning -Message $Localization.UnsupportedOSBuild`
	`585`	`+ Write-Information -MessageData "" -InformationAction Continue`
	`586`	`+`
	`587`	`+ Write-Verbose -Message "https://t.me/sophia_chat" -Verbose`
	`588`	`+ Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose`
	`589`	`+ Write-Verbose -Message "https://github.com/farag2/Sophia-Script-for-Windows#system-requirements" -Verbose`
	`590`	`+`
	`591`	`+ exit`
	`592`	`+ }`
	`593`	`+`
`580`	`594`	`# Detect Windows build version`
`581`	`595`	`switch ((Get-CimInstance -ClassName CIM_OperatingSystem).BuildNumber)`
`582`	`596`	`{`
`583`		`- {$_ -lt 22631}`
	`597`	`+ {$_ -ne 26100}`
`584`	`598`	`{`
`585`	`599`	`Write-Information -MessageData "" -InformationAction Continue`
`586`	`600`	`Write-Warning -Message $Localization.UnsupportedOSBuild`
`@@ -601,7 +615,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);`
`601`	`615`
`602`	`616`	`exit`
`603`	`617`	`}`
`604`		`- "22631"`
	`618`	`+ "26100"`
`605`	`619`	`{`
`606`	`620`	`# Check whether the current module version is the latest one`
`607`	`621`	`try`
`@@ -626,7 +640,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd);`
`626`	`640`	`Verbose = $true`
`627`	`641`	`UseBasicParsing = $true`
`628`	`642`	`}`
`629`		`- $LatestSupportedBuild = (Invoke-RestMethod @Parameters).Windows_11`
	`643`	`+ $LatestSupportedBuild = (Invoke-RestMethod @Parameters).Windows_11_LTSC_2024`
`630`	`644`	`}`
`631`	`645`	`catch [System.Net.WebException]`
`632`	`646`	`{`
`@@ -1333,11 +1347,8 @@ function ErrorReporting`
`1333`	`1347`	`{`
`1334`	`1348`	`"Disable"`
`1335`	`1349`	`{`
`1336`		`- if ((Get-WindowsEdition -Online).Edition -notmatch "Core")`
`1337`		`- {`
`1338`		`- Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore \| Disable-ScheduledTask`
`1339`		`- New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force`
`1340`		`- }`
	`1350`	`+ Get-ScheduledTask -TaskName QueueReporting -ErrorAction Ignore \| Disable-ScheduledTask`
	`1351`	`+ New-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Windows Error Reporting" -Name Disabled -PropertyType DWord -Value 1 -Force`
`1341`	`1352`
`1342`	`1353`	`Get-Service -Name WerSvc \| Stop-Service -Force`
`1343`	`1354`	`Get-Service -Name WerSvc \| Set-Service -StartupType Disabled`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,7 @@`
`6`	`6`	`"Windows_10_LTSC_2021_URL": "https://support.microsoft.com/en-us/topic/windows-10-update-history-857b8ccb-71e4-49e5-b3f6-7073197d98fb",`
`7`	`7`	`"Windows_10_LTSC_2021": "4894",`
`8`	`8`	`"Windows_11_URL": "https://support.microsoft.com/en-us/topic/windows-11-version-23h2-update-history-59875222-b990-4bd9-932f-91a5954de434",`
`9`		`- "Windows_11": "4169"`
	`9`	`+ "Windows_11": "4169",`
	`10`	`+ "Windows_11_LTSC_2024_URL": "https://support.microsoft.com/en-us/topic/windows-11-version-24h2-update-history-0929c747-1815-4543-8461-0160d16f15e5",`
	`11`	`+ "Windows_11_LTSC_2024": "1742"`
`10`	`12`	`}`