diff --git a/ReleaseNotesTemplate.md b/ReleaseNotesTemplate.md index b302b9cf..20265e19 100644 --- a/ReleaseNotesTemplate.md +++ b/ReleaseNotesTemplate.md @@ -17,51 +17,43 @@ Diff from vOldVersion [OldVersion...NewVersion](https://github.com/farag2/Sophia-Script-for-Windows/compare/OldVersion...NewVersion) + *** Manual avaliable in other languages -[Sophia-Script-Windows-10-PowerShell-5-1]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.10.vSophia_Script_Windows_10_PowerShell_5_1.zip -[Sophia-Script-Windows-10-PowerShell-5-1-badge]: https://img.shields.io/badge/Windows%2010%20x64-PowerShell%205.1-67b7d1.svg - -[Sophia-Script-Windows-10-PowerShell-7]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.10.PowerShell.7.vSophia_Script_Windows_10_PowerShell_7.zip -[Sophia-Script-Windows-10-PowerShell-7-badge]: https://img.shields.io/badge/Windows%2010%20x64-PowerShell%207-67b7d1.svg - -[Sophia-Script-Windows-10-LTSC2019]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.10.LTSC.2019.vSophia_Script_Windows_10_LTSC2019.zip -[Sophia-Script-Windows-10-LTSC2019-badge]: https://img.shields.io/badge/Windows%2010%20x64-LTSC%202019-67b7d1.svg - -[Sophia-Script-Windows-10-LTSC2021]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.10.LTSC.2021.vSophia_Script_Windows_10_LTSC2021.zip -[Sophia-Script-Windows-10-LTSC2021-badge]: https://img.shields.io/badge/Windows%2010%20x64-LTSC%202021-67b7d1.svg - -[Sophia-Script-Windows-11-PowerShell-5-1]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.11.vSophia_Script_Windows_11_PowerShell_5_1.zip -[Sophia-Script-Windows-11-PowerShell-5-1-badge]: https://img.shields.io/badge/Windows%2011-PowerShell%205.1-67b7d1.svg - -[Sophia-Script-Windows-11-Arm-PowerShell-5-1]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.11.Arm.vSophia_Script_Windows_11_Arm_PowerShell_5_1.zip -[Sophia-Script-Windows-11-Arm-PowerShell-5-1-badge]: https://img.shields.io/badge/Windows%2011%20Arm-PowerShell%205.1-67b7d1.svg - -[Sophia-Script-Windows-11-Arm-PowerShell-7]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.11.Arm.PowerShell.7.vSophia_Script_Windows_11_Arm_PowerShell_7.zip -[Sophia-Script-Windows-11-Arm-PowerShell-7-badge]: https://img.shields.io/badge/Windows%2011%20Arm-PowerShell%207-67b7d1.svg - -[Sophia-Script-Windows-11-PowerShell-7]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.11.PowerShell.7.vSophia_Script_Windows_11_PowerShell_7.zip -[Sophia-Script-Windows-11-PowerShell-7-badge]: https://img.shields.io/badge/Windows%2011-PowerShell%207-67b7d1.svg - -[Sophia-Script-Windows-11-LTSC2024]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.for.Windows.11.LTSC.2024.vSophia_Script_Windows_11_PowerShell_5_1.zip -[Sophia-Script-Windows-11-LTSC2024-badge]: https://img.shields.io/badge/Windows%2011%20LTSC%202024-PowerShell%205.1-67b7d1.svg - -[Sophia-Script-Wrapper]: https://github.com/farag2/Sophia-Script-for-Windows/releases/download/NewVersion/Sophia.Script.Wrapper.vSophia_Script_Wrapper.zip -[Sophia-Script-Wrapper-badge]: https://img.shields.io/badge/Sophia%20Script%20Wrapper-67b7d1.svg - -| Download | -|:------------------------------------------------------------------------------------------------------------| -| [![Script][Sophia-Script-Windows-10-PowerShell-5-1-badge]][Sophia-Script-Windows-10-PowerShell-5-1] | -| [![Script][Sophia-Script-Windows-10-PowerShell-7-badge]][Sophia-Script-Windows-10-PowerShell-7] | -| [![Script][Sophia-Script-Windows-10-LTSC2019-badge]][Sophia-Script-Windows-10-LTSC2019] | -| [![Script][Sophia-Script-Windows-10-LTSC2021-badge]][Sophia-Script-Windows-10-LTSC2021] | -| [![Script][Sophia-Script-Windows-11-PowerShell-5-1-badge]][Sophia-Script-Windows-11-PowerShell-5-1] | -| [![Script][Sophia-Script-Windows-11-Arm-PowerShell-5-1-badge]][Sophia-Script-Windows-11-Arm-PowerShell-5-1] | -| [![Script][Sophia-Script-Windows-11-Arm-PowerShell-7-badge]][Sophia-Script-Windows-11-Arm-PowerShell-7] | -| [![Script][Sophia-Script-Windows-11-PowerShell-7-badge]][Sophia-Script-Windows-11-PowerShell-7] | -| [![Script][Sophia-Script-Windows-11-LTSC2024-badge]][Sophia-Script-Windows-11-LTSC2024] | -| [![Script][Sophia-Script-Wrapper-badge]][Sophia-Script-Wrapper] | +### Download + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Windows 10Windows 11
\ No newline at end of file diff --git a/Scripts/ReleaseNotesTemplate.ps1 b/Scripts/ReleaseNotesTemplate.ps1 index 9da128d3..29c9889d 100644 --- a/Scripts/ReleaseNotesTemplate.ps1 +++ b/Scripts/ReleaseNotesTemplate.ps1 @@ -31,8 +31,8 @@ $JSON = Invoke-RestMethod @Parameters -replace "Sophia_Script_Windows_10_LTSC2021", $JSON.Sophia_Script_Windows_10_LTSC2021 ` -replace "Sophia_Script_Windows_11_PowerShell_5_1", $JSON.Sophia_Script_Windows_11_PowerShell_5_1 ` -replace "Sophia_Script_Windows_11_PowerShell_7", $JSON.Sophia_Script_Windows_11_PowerShell_7 ` - -replace "Sophia_Script_Windows_11_Arm_PowerShell_5_1", $JSON.Sophia_Script_Windows_11_PowerShell_5_1 ` - -replace "Sophia_Script_Windows_11_Arm_PowerShell_7", $JSON.Sophia_Script_Windows_11_PowerShell_7 ` + -replace "Sophia_Script_Windows_11_Arm_PowerShell_5_1", $JSON.Sophia_Script_Windows_11_Arm_PowerShell_5_1 ` + -replace "Sophia_Script_Windows_11_Arm_PowerShell_7", $JSON.Sophia_Script_Windows_11_Arm_PowerShell_7 ` -replace "Sophia_Script_Windows_11_LTSC2024", $JSON.Sophia_Script_Windows_11_LTSC2024 ` -replace "Sophia_Script_Wrapper", $JSON.Sophia_Script_Wrapper } | Set-Content -Path ReleaseNotesTemplate.md -Encoding utf8 -Force diff --git a/chocolatey/tools/chocolateyinstall.ps1 b/chocolatey/tools/chocolateyinstall.ps1 index effb6e10..58c7b1c1 100644 --- a/chocolatey/tools/chocolateyinstall.ps1 +++ b/chocolatey/tools/chocolateyinstall.ps1 @@ -117,7 +117,7 @@ switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber) { if ((Get-CimInstance -ClassName CIM_Processor).Caption -match "ARM") { - $LatestRelease = $JSONVersions.Sophia_Script_Windows_11_PowerShell_7 + $LatestRelease = $JSONVersions.Sophia_Script_Windows_11_Arm__PowerShell_7 $URL = "https://github.com/farag2/Sophia-Script-for-Windows/releases/download/$LatestGitHubRelease/Sophia.Script.for.Windows.11.Arm.PowerShell.7.v$LatestRelease.zip" $Hash = "Hash_Sophia_Script_Windows_11_Arm_PowerShell_7" } @@ -133,9 +133,9 @@ switch ((Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber) { if ((Get-CimInstance -ClassName CIM_Processor).Caption -match "ARM") { - $LatestRelease = $JSONVersions.Sophia_Script_Windows_11_PowerShell_5_1 + $LatestRelease = $JSONVersions.Sophia_Script_Windows_11_Arm_PowerShell_5_1 $URL = "https://github.com/farag2/Sophia-Script-for-Windows/releases/download/$LatestGitHubRelease/Sophia.Script.for.Windows.11.Arm.v$LatestRelease.zip" - $Hash = "Hash_Sophia_Script_Windows_11_Arm_PowerShell_5_1" + $Hash = "Hash_Sophia_Script_Windows_11_Arm" } else { diff --git a/sophia_script_versions.json b/sophia_script_versions.json index 84764824..129ab432 100644 --- a/sophia_script_versions.json +++ b/sophia_script_versions.json @@ -6,5 +6,7 @@ "Sophia_Script_Windows_11_PowerShell_5_1": "6.9.0", "Sophia_Script_Windows_11_LTSC2024": "6.9.0", "Sophia_Script_Windows_11_PowerShell_7": "6.9.0", + "Sophia_Script_Windows_11_Arm_PowerShell_5_1": "6.9.0", + "Sophia_Script_Windows_11_Arm_PowerShell_7": "6.9.0", "Sophia_Script_Wrapper": "2.8.4" } diff --git a/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 index 7700681d..1e331640 100644 --- a/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 @@ -164,13 +164,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "AMD64") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose 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 index dadf3003..8624e3fa 100644 --- a/src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1 @@ -164,13 +164,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "AMD64") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose 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 index 869e6d5a..417a3452 100644 --- a/src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1 @@ -164,13 +164,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "AMD64") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose diff --git a/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 index 5bd86eb3..1b8d2d01 100644 --- a/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 @@ -177,13 +177,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "AMD64") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose diff --git a/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 index c524bccf..2a94b689 100644 --- a/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 @@ -257,13 +257,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "AMD64") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose diff --git a/src/Sophia_Script_for_Windows_11_ARM/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11_ARM/Module/Sophia.psm1 index 79a73625..b3202e69 100644 --- a/src/Sophia_Script_for_Windows_11_ARM/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11_ARM/Module/Sophia.psm1 @@ -260,13 +260,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "ARM") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose @@ -866,7 +866,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); Verbose = $true UseBasicParsing = $true } - $LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_11_PowerShell_5_1 + $LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_11_Arm_PowerShell_5_1 $CurrentRelease = (Get-Module -Name SophiaScript).Version.ToString() if ([System.Version]$LatestRelease -gt [System.Version]$CurrentRelease) diff --git a/src/Sophia_Script_for_Windows_11_ARM_PowerShell_7/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11_ARM_PowerShell_7/Module/Sophia.psm1 index e1dfa3ab..684cdaf8 100644 --- a/src/Sophia_Script_for_Windows_11_ARM_PowerShell_7/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11_ARM_PowerShell_7/Module/Sophia.psm1 @@ -273,13 +273,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "ARM") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose @@ -893,7 +893,7 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); Verbose = $true UseBasicParsing = $true } - $LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_11_PowerShell_5_1 + $LatestRelease = (Invoke-RestMethod @Parameters).Sophia_Script_Windows_11_Arm_PowerShell_7 $CurrentRelease = (Get-Module -Name SophiaScript).Version.ToString() if ([System.Version]$LatestRelease -gt [System.Version]$CurrentRelease) 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 index c40ccd4b..7547cdcf 100644 --- a/src/Sophia_Script_for_Windows_11_LTSC_2024/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11_LTSC_2024/Module/Sophia.psm1 @@ -257,13 +257,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "AMD64") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose diff --git a/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 index 7839794d..d3353799 100644 --- a/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 @@ -270,13 +270,13 @@ public static extern bool SetForegroundWindow(IntPtr hWnd); } # Check CPU architecture - if ((Get-CimInstance -ClassName CIM_Processor).Caption -notmatch "AMD64") + $Caption = (Get-CimInstance -ClassName CIM_Processor).Caption + if (($Caption -notmatch "AMD64") -and ($Caption -notmatch "Intel64")) { Write-Information -MessageData "" -InformationAction Continue - Write-Warning -Message ($Localization.UnsupportedArchitecture -f (Get-CimInstance -ClassName CIM_Processor).Caption) + Write-Warning -Message ($Localization.UnsupportedArchitecture -f $Caption) Write-Information -MessageData "" -InformationAction Continue - Write-Verbose -Message "https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_language_modes" -Verbose Write-Verbose -Message "https://t.me/sophia_chat" -Verbose Write-Verbose -Message "https://discord.gg/sSryhaEv79" -Verbose