diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd index 43d13d6..4cec6f1 100644 --- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd +++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd @@ -249,9 +249,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -269,7 +285,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd index 9847b18..876f1ad 100644 --- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd @@ -271,9 +271,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -291,7 +307,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd index d22164f..97d332c 100644 --- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd @@ -178,7 +178,7 @@ goto dk_done if exist "%Systemdrive%\Users\WDAGUtilityAccount" ( sc query gcs | find /i "RUNNING" %nul% && ( %eline% -echo Windows Sandbox detected; activation is not required. +echo Windows Sandbox detected; activation is not supported. echo The script cannot run due to missing licensing components. Aborting... echo: goto dk_done @@ -270,9 +270,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -290,7 +306,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd index 5e7f2c5..910f218 100644 --- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd +++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd @@ -176,7 +176,7 @@ goto dk_done if exist "%Systemdrive%\Users\WDAGUtilityAccount" ( sc query gcs | find /i "RUNNING" %nul% && ( %eline% -echo Windows Sandbox detected; activation is not required. +echo Windows Sandbox detected; activation is not supported. echo The script cannot run due to missing licensing components. Aborting... echo: goto dk_done @@ -279,9 +279,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -299,7 +315,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd index 25bd54a..fa782c2 100644 --- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd @@ -207,7 +207,7 @@ goto dk_done if exist "%Systemdrive%\Users\WDAGUtilityAccount" ( sc query gcs | find /i "RUNNING" %nul% && ( %eline% -echo Windows Sandbox detected; activation is not required. +echo Windows Sandbox detected; activation is not supported. echo The script cannot run due to missing licensing components. Aborting... echo: goto dk_done @@ -310,9 +310,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -330,7 +346,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd index c75f1c7..b6672f0 100644 --- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd @@ -222,7 +222,7 @@ goto dk_done if exist "%Systemdrive%\Users\WDAGUtilityAccount" ( sc query gcs | find /i "RUNNING" %nul% && ( %eline% -echo Windows Sandbox detected; activation is not required. +echo Windows Sandbox detected; activation is not supported. echo The script cannot run due to missing licensing components. Aborting... echo: goto dk_done @@ -337,9 +337,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -357,7 +373,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Change_Office_Edition.cmd b/MAS/Separate-Files-Version/Change_Office_Edition.cmd index 69d43df..a8b2cfa 100644 --- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd +++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd @@ -224,9 +224,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -244,7 +260,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd index 1741b69..a55ea3b 100644 --- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd +++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd @@ -229,9 +229,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -249,7 +265,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd index 555dd3f..852fc6e 100644 --- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd +++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd @@ -240,9 +240,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto done2 ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto done2 +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -260,7 +276,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint diff --git a/MAS/Separate-Files-Version/Troubleshoot.cmd b/MAS/Separate-Files-Version/Troubleshoot.cmd index 9ce97a2..6c29b5a 100644 --- a/MAS/Separate-Files-Version/Troubleshoot.cmd +++ b/MAS/Separate-Files-Version/Troubleshoot.cmd @@ -241,9 +241,25 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done ) +REM check if .NET is working properly + +if /i "!tstresult2!"=="FullLanguage" ( +cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% +if !errorlevel!==3 ( +echo Windows Powershell failed to load .NET command. Aborting... +echo: +set fixes=%fixes% %mas%in-place_repair_upgrade +call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" +goto dk_done +) +) + REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( @@ -261,7 +277,7 @@ echo PowerShell is not working properly. Aborting... if /i "!tstresult2!"=="FullLanguage" ( echo: -echo Your antivirus software might be blocking the script, or PowerShell on your system might be corrupted. +echo Your antivirus software might be blocking the script. echo: sc query sense | find /i "RUNNING" %nul% && ( echo Installed Antivirus - Microsoft Defender for Endpoint