Skip to content

Commit 1b079a0

Browse files
farag2farag2
committed
Refactored Install-DotNetRuntimes and Install-VCRedist functions
1 parent 194b084 commit 1b079a0

File tree

4 files changed

+8
-8
lines changed
  • src

4 files changed

+8
-8
lines changed

‎src/Sophia_Script_for_Windows_10/Module/Sophia.psm1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5335,7 +5335,7 @@ function WindowsFeatures
53355335
Add-Type -AssemblyName System.Windows.Forms
53365336

53375337
# We cannot use Get-Process -Id $PID as script might be invoked via Terminal with different $PID
5338-
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 11"} | ForEach-Object -Process {
5338+
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 10"} | ForEach-Object -Process {
53395339
# Show window, if minimized
53405340
[WinAPI.ForegroundWindow]::ShowWindowAsync($_.MainWindowHandle, 10)
53415341

@@ -5643,7 +5643,7 @@ function WindowsCapabilities
56435643
Add-Type -AssemblyName System.Windows.Forms
56445644

56455645
# We cannot use Get-Process -Id $PID as script might be invoked via Terminal with different $PID
5646-
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 11"} | ForEach-Object -Process {
5646+
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 10"} | ForEach-Object -Process {
56475647
# Show window, if minimized
56485648
[WinAPI.ForegroundWindow]::ShowWindowAsync($_.MainWindowHandle, 10)
56495649

‎src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,7 +3853,7 @@ function WindowsFeatures
38533853
Add-Type -AssemblyName System.Windows.Forms
38543854

38553855
# We cannot use Get-Process -Id $PID as script might be invoked via Terminal with different $PID
3856-
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 11"} | ForEach-Object -Process {
3856+
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 10"} | ForEach-Object -Process {
38573857
# Show window, if minimized
38583858
[WinAPI.ForegroundWindow]::ShowWindowAsync($_.MainWindowHandle, 10)
38593859

@@ -4161,7 +4161,7 @@ function WindowsCapabilities
41614161
Add-Type -AssemblyName System.Windows.Forms
41624162

41634163
# We cannot use Get-Process -Id $PID as script might be invoked via Terminal with different $PID
4164-
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 11"} | ForEach-Object -Process {
4164+
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 10"} | ForEach-Object -Process {
41654165
# Show window, if minimized
41664166
[WinAPI.ForegroundWindow]::ShowWindowAsync($_.MainWindowHandle, 10)
41674167

‎src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4542,7 +4542,7 @@ function WindowsFeatures
45424542
Add-Type -AssemblyName System.Windows.Forms
45434543

45444544
# We cannot use Get-Process -Id $PID as script might be invoked via Terminal with different $PID
4545-
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 11"} | ForEach-Object -Process {
4545+
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 10"} | ForEach-Object -Process {
45464546
# Show window, if minimized
45474547
[WinAPI.ForegroundWindow]::ShowWindowAsync($_.MainWindowHandle, 10)
45484548

@@ -4850,7 +4850,7 @@ function WindowsCapabilities
48504850
Add-Type -AssemblyName System.Windows.Forms
48514851

48524852
# We cannot use Get-Process -Id $PID as script might be invoked via Terminal with different $PID
4853-
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 11"} | ForEach-Object -Process {
4853+
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 10"} | ForEach-Object -Process {
48544854
# Show window, if minimized
48554855
[WinAPI.ForegroundWindow]::ShowWindowAsync($_.MainWindowHandle, 10)
48564856

‎src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5337,7 +5337,7 @@ function WindowsFeatures
53375337
Add-Type -AssemblyName System.Windows.Forms
53385338

53395339
# We cannot use Get-Process -Id $PID as script might be invoked via Terminal with different $PID
5340-
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 11"} | ForEach-Object -Process {
5340+
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 10"} | ForEach-Object -Process {
53415341
# Show window, if minimized
53425342
[WinAPI.ForegroundWindow]::ShowWindowAsync($_.MainWindowHandle, 10)
53435343

@@ -5645,7 +5645,7 @@ function WindowsCapabilities
56455645
Add-Type -AssemblyName System.Windows.Forms
56465646

56475647
# We cannot use Get-Process -Id $PID as script might be invoked via Terminal with different $PID
5648-
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 11"} | ForEach-Object -Process {
5648+
Get-Process -Name powershell, WindowsTerminal -ErrorAction Ignore | Where-Object -FilterScript {$_.MainWindowTitle -match "Sophia Script for Windows 10"} | ForEach-Object -Process {
56495649
# Show window, if minimized
56505650
[WinAPI.ForegroundWindow]::ShowWindowAsync($_.MainWindowHandle, 10)
56515651

0 commit comments

Comments
 (0)