A few grammar, wording, and formatting tweaks (#6)

* A few grammar tweaks and sort services

 - Made a few grammar and wording tweaks
  - Install Tab1 -> Tab 1 - Install
  - Tweaks Buttons -> Tweak Buttons
  - Service tweaks to Manual -> Set Services to Manual
- Improve $services
  - The behavior of $services has not changed, just the formatting and grammar
  - Alphabetize the services to make any service easier to find
  - Improve the grammar and formatting of the comments next to the services
   - Capitalizes the first letter
   - Makes sure there is a space between # and the first word
   - Makes the spacing of each comment consistent so they all appear on the same column

* Fix winget indentation

 - Fixed the Indentation on the winget buttons

* If-statement and indentation

 - Made the format of all If-Statements consistent
   - if(statement){}else{} -> If (statement) {} else {}
 - Improve formatting and indentation
This commit is contained in:
Carter 2022-05-17 09:31:18 -05:00 committed by GitHub
parent f7f5ceef25
commit c7043ff0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -253,15 +253,16 @@ $inputXML = $inputXML -replace 'mc:Ignorable="d"','' -replace "x:N",'N' -replace
[xml]$XAML = $inputXML [xml]$XAML = $inputXML
#Read XAML #Read XAML
$reader=(New-Object System.Xml.XmlNodeReader $xaml) $reader=(New-Object System.Xml.XmlNodeReader $xaml)
try{$Form=[Windows.Markup.XamlReader]::Load( $reader )} try{$Form=[Windows.Markup.XamlReader]::Load( $reader )}
catch [System.Management.Automation.MethodInvocationException] { catch [System.Management.Automation.MethodInvocationException] {
Write-Warning "We ran into a problem with the XAML code. Check the syntax for this control..." Write-Warning "We ran into a problem with the XAML code. Check the syntax for this control..."
write-host $error[0].Exception.Message -ForegroundColor Red write-host $error[0].Exception.Message -ForegroundColor Red
if ($error[0].Exception.Message -like "*button*"){ If ($error[0].Exception.Message -like "*button*") {
write-warning "Ensure your <button in the `$inputXML does NOT have a Click=ButtonClick property. PS can't handle this`n`n`n`n"} write-warning "Ensure your <button in the `$inputXML does NOT have a Click=ButtonClick property. PS can't handle this`n`n`n`n"
}
} }
catch{#if it broke some other way <img draggable="false" role="img" class="emoji" alt="😀" src="https://s0.wp.com/wp-content/mu-plugins/wpcom-smileys/twemoji/2/svg/1f600.svg"> catch{# If it broke some other way <img draggable="false" role="img" class="emoji" alt="😀" src="https://s0.wp.com/wp-content/mu-plugins/wpcom-smileys/twemoji/2/svg/1f600.svg">
Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed." Write-Host "Unable to load Windows.Markup.XamlReader. Double-check syntax and ensure .net is installed."
} }
@ -272,7 +273,7 @@ catch{#if it broke some other way <img draggable="false" role="img" class="emoji
$xaml.SelectNodes("//*[@Name]") | %{Set-Variable -Name "WPF$($_.Name)" -Value $Form.FindName($_.Name)} $xaml.SelectNodes("//*[@Name]") | %{Set-Variable -Name "WPF$($_.Name)" -Value $Form.FindName($_.Name)}
Function Get-FormVariables{ Function Get-FormVariables{
if ($global:ReadmeDisplay -ne $true){Write-host "If you need to reference this display again, run Get-FormVariables" -ForegroundColor Yellow;$global:ReadmeDisplay=$true} If ($global:ReadmeDisplay -ne $true){Write-host "If you need to reference this display again, run Get-FormVariables" -ForegroundColor Yellow;$global:ReadmeDisplay=$true}
write-host "Found the following interactable elements from our form" -ForegroundColor Cyan write-host "Found the following interactable elements from our form" -ForegroundColor Cyan
get-variable WPF* get-variable WPF*
} }
@ -309,7 +310,7 @@ $WPFTab4BT.Add_Click({
}) })
#=========================================================================== #===========================================================================
# Install Tab1 # Tab 1 - Install
#=========================================================================== #===========================================================================
$WPFinstall.Add_Click({ $WPFinstall.Add_Click({
$wingetinstall = New-Object System.Collections.Generic.List[System.Object] $wingetinstall = New-Object System.Collections.Generic.List[System.Object]
@ -386,7 +387,6 @@ $WPFinstall.Add_Click({
$wingetinstall.Add("JetBrains.Toolbox") $wingetinstall.Add("JetBrains.Toolbox")
$WPFInstalljetbrains.IsChecked = $false $WPFInstalljetbrains.IsChecked = $false
} }
If ( $WPFInstallmpc.IsChecked -eq $true ) { If ( $WPFInstallmpc.IsChecked -eq $true ) {
$wingetinstall.Add("clsid2.mpc-hc") $wingetinstall.Add("clsid2.mpc-hc")
$WPFInstallmpc.IsChecked = $false $WPFInstallmpc.IsChecked = $false
@ -589,7 +589,6 @@ $WPFinstall.Add_Click({
$wingetinstall.Add("Microsoft.Teams") $wingetinstall.Add("Microsoft.Teams")
$WPFInstallteams.IsChecked = $false $WPFInstallteams.IsChecked = $false
} }
If ( $WPFInstalltreesize.IsChecked -eq $true ) { If ( $WPFInstalltreesize.IsChecked -eq $true ) {
$wingetinstall.Add("JAMSoftware.TreeSize.Free") $wingetinstall.Add("JAMSoftware.TreeSize.Free")
$WPFInstalltreesize.IsChecked = $false $WPFInstalltreesize.IsChecked = $false
@ -653,7 +652,7 @@ $WPFInstallUpgrade.Add_Click({
}) })
#=========================================================================== #===========================================================================
# Tab 2 - Tweaks Buttons # Tab 2 - Tweak Buttons
#=========================================================================== #===========================================================================
$WPFdesktop.Add_Click({ $WPFdesktop.Add_Click({
@ -777,94 +776,93 @@ $WPFtweaksbutton.Add_Click({
$WPFEssTweaksRP.IsChecked = $false $WPFEssTweaksRP.IsChecked = $false
} }
If ( $WPFEssTweaksServices.IsChecked -eq $true ) { If ( $WPFEssTweaksServices.IsChecked -eq $true ) {
# Service tweaks to Manual # Set Services to Manual
$services = @( $services = @(
"ALG" # Application Layer Gateway Service(Provides support for 3rd party protocol plug-ins for Internet Connection Sharing)
"AJRouter" # Needed for AllJoyn Router Service
"BcastDVRUserService_48486de" # GameDVR and Broadcast is used for Game Recordings and Live Broadcasts
#"BDESVC" # Bitlocker Drive Encryption Service
#"BFE" # Base Filtering Engine (Manages Firewall and Internet Protocol security)
#"BluetoothUserService_48486de" # Bluetooth user service supports proper functionality of Bluetooth features relevant to each user session.
#"BrokerInfrastructure" # Windows Infrastructure Service (Controls which background tasks can run on the system)
"Browser" # Let users browse and locate shared resources in neighboring computers
"BthAvctpSvc" # AVCTP service (needed for Bluetooth Audio Devices or Wireless Headphones)
"CaptureService_48486de" # Optional screen capture functionality for applications that call the Windows.Graphics.Capture API.
"cbdhsvc_48486de" # Clipboard Service
"diagnosticshub.standardcollector.service" # Microsoft (R) Diagnostics Hub Standard Collector Service "diagnosticshub.standardcollector.service" # Microsoft (R) Diagnostics Hub Standard Collector Service
"DiagTrack" # Diagnostics Tracking Service "DiagTrack" # Diagnostics Tracking Service
"DPS" "dmwappushservice" # WAP Push Message Routing Service
"dmwappushservice" # WAP Push Message Routing Service (see known issues) "DPS" # Diagnostic Policy Service (Detects and Troubleshoots Potential Problems)
"edgeupdate" # Edge Update Service
"edgeupdatem" # Another Update Service
"EntAppSvc" # Enterprise Application Management.
"Fax" # Fax Service
"fhsvc" # Fax History
"FontCache" # Windows font cache
#"FrameServer" # Windows Camera Frame Server (Allows multiple clients to access video frames from camera devices)
"gupdate" # Google Update
"gupdatem" # Another Google Update Service
"iphlpsvc" # ipv6(Most websites use ipv4 instead)
"lfsvc" # Geolocation Service "lfsvc" # Geolocation Service
#"LicenseManager" # Disable LicenseManager (Windows Store may not work properly)
"lmhosts" # TCP/IP NetBIOS Helper
"MapsBroker" # Downloaded Maps Manager "MapsBroker" # Downloaded Maps Manager
"MicrosoftEdgeElevationService" # Another Edge Update Service
"MSDTC" # Distributed Transaction Coordinator
"ndu" # Windows Network Data Usage Monitor (Disabling Breaks Task Manager Per-Process Network Monitoring)
"NetTcpPortSharing" # Net.Tcp Port Sharing Service "NetTcpPortSharing" # Net.Tcp Port Sharing Service
"PcaSvc" # Program Compatibility Assistant Service
"PerfHost" # Remote users and 64-bit processes to query performance.
"PhoneSvc" # Phone Service(Manages the telephony state on the device)
#"PNRPsvc" # Peer Name Resolution Protocol (Some peer-to-peer and collaborative applications, such as Remote Assistance, may not function, Discord will still work)
#"p2psvc" # Peer Name Resolution Protocol(Enables multi-party communication using Peer-to-Peer Grouping. If disabled, some applications, such as HomeGroup, may not function. Discord will still work)iscord will still work)
#"p2pimsvc" # Peer Networking Identity Manager (Peer-to-Peer Grouping services may not function, and some applications, such as HomeGroup and Remote Assistance, may not function correctly. Discord will still work)
"PrintNotify" # Windows printer notifications and extentions
"QWAVE" # Quality Windows Audio Video Experience (audio and video might sound worse)
"RemoteAccess" # Routing and Remote Access "RemoteAccess" # Routing and Remote Access
"RemoteRegistry" # Remote Registry "RemoteRegistry" # Remote Registry
"RetailDemo" # Demo Mode for Store Display
"RtkBtManServ" # Realtek Bluetooth Device Manager Service
"SCardSvr" # Windows Smart Card Service
"seclogon" # Secondary Logon (Disables other credentials only password will work)
"SEMgrSvc" # Payments and NFC/SE Manager (Manages payments and Near Field Communication (NFC) based secure elements)
"SharedAccess" # Internet Connection Sharing (ICS) "SharedAccess" # Internet Connection Sharing (ICS)
#"Spooler" # Printing
"stisvc" # Windows Image Acquisition (WIA)
#"StorSvc" # StorSvc (usb external hard drive will not be reconized by windows)
"SysMain" # Analyses System Usage and Improves Performance
"TrkWks" # Distributed Link Tracking Client "TrkWks" # Distributed Link Tracking Client
#"WbioSrvc" # Windows Biometric Service (required for Fingerprint reader / facial detection) #"WbioSrvc" # Windows Biometric Service (required for Fingerprint reader / facial detection)
"WerSvc" # Windows error reporting
"wisvc" # Windows Insider program(Windows Insider will not work if Disabled)
#"WlanSvc" # WLAN AutoConfig #"WlanSvc" # WLAN AutoConfig
"WMPNetworkSvc" # Windows Media Player Network Sharing Service "WMPNetworkSvc" # Windows Media Player Network Sharing Service
"WpcMonSvc" # Parental Controls
"WPDBusEnum" # Portable Device Enumerator Service
"WpnService" # WpnService (Push Notifications may not work)
#"wscsvc" # Windows Security Center Service #"wscsvc" # Windows Security Center Service
"WSearch" # Windows Search "WSearch" # Windows Search
"XblAuthManager" # Xbox Live Auth Manager "XblAuthManager" # Xbox Live Auth Manager (Disabling Breaks Xbox Live Games)
"XblGameSave" # Xbox Live Game Save Service "XblGameSave" # Xbox Live Game Save Service (Disabling Breaks Xbox Live Games)
"XboxNetApiSvc" # Xbox Live Networking Service "XboxNetApiSvc" # Xbox Live Networking Service (Disabling Breaks Xbox Live Games)
"XboxGipSvc" #Disables Xbox Accessory Management Service "XboxGipSvc" # Xbox Accessory Management Service
"ndu" # Windows Network Data Usage Monitor # Hp services
"WerSvc" #disables windows error reporting
#"Spooler" #Disables your printer
"Fax" #Disables fax
"fhsvc" #Disables fax histroy
"gupdate" #Disables google update
"gupdatem" #Disable another google update
"stisvc" #Disables Windows Image Acquisition (WIA)
"AJRouter" #Disables (needed for AllJoyn Router Service)
"MSDTC" # Disables Distributed Transaction Coordinator
"WpcMonSvc" #Disables Parental Controls
"PhoneSvc" #Disables Phone Service(Manages the telephony state on the device)
"PrintNotify" #Disables Windows printer notifications and extentions
"PcaSvc" #Disables Program Compatibility Assistant Service
"WPDBusEnum" #Disables Portable Device Enumerator Service
#"LicenseManager" #Disable LicenseManager(Windows store may not work properly)
"seclogon" #Disables Secondary Logon(disables other credentials only password will work)
"SysMain" #Disables sysmain
"lmhosts" #Disables TCP/IP NetBIOS Helper
"wisvc" #Disables Windows Insider program(Windows Insider will not work)
"FontCache" #Disables Windows font cache
"RetailDemo" #Disables RetailDemo whic is often used when showing your device
"ALG" # Disables Application Layer Gateway Service(Provides support for 3rd party protocol plug-ins for Internet Connection Sharing)
#"BFE" #Disables Base Filtering Engine (BFE) (is a service that manages firewall and Internet Protocol security)
#"BrokerInfrastructure" #Disables Windows infrastructure service that controls which background tasks can run on the system.
"SCardSvr" #Disables Windows smart card
"EntAppSvc" #Disables enterprise application management.
"BthAvctpSvc" #Disables AVCTP service (if you use Bluetooth Audio Device or Wireless Headphones. then don't disable this)
#"FrameServer" #Disables Windows Camera Frame Server(this allows multiple clients to access video frames from camera devices.)
"Browser" #Disables computer browser
"BthAvctpSvc" #AVCTP service (This is Audio Video Control Transport Protocol service.)
#"BDESVC" #Disables bitlocker
"iphlpsvc" #Disables ipv6 but most websites don't use ipv6 they use ipv4
"edgeupdate" # Disables one of edge update service
"MicrosoftEdgeElevationService" # Disables one of edge service
"edgeupdatem" # disbales another one of update service (disables edgeupdatem)
"SEMgrSvc" #Disables Payments and NFC/SE Manager (Manages payments and Near Field Communication (NFC) based secure elements)
#"PNRPsvc" # Disables peer Name Resolution Protocol ( some peer-to-peer and collaborative applications, such as Remote Assistance, may not function, Discord will still work)
#"p2psvc" # Disbales Peer Name Resolution Protocol(nables multi-party communication using Peer-to-Peer Grouping. If disabled, some applications, such as HomeGroup, may not function. Discord will still work)
#"p2pimsvc" # Disables Peer Networking Identity Manager (Peer-to-Peer Grouping services may not function, and some applications, such as HomeGroup and Remote Assistance, may not function correctly.Discord will still work)
"PerfHost" #Disables remote users and 64-bit processes to query performance .
"BcastDVRUserService_48486de" #Disables GameDVR and Broadcast is used for Game Recordings and Live Broadcasts
"CaptureService_48486de" #Disables ptional screen capture functionality for applications that call the Windows.Graphics.Capture API.
"cbdhsvc_48486de" #Disables cbdhsvc_48486de (clipboard service it disables)
#"BluetoothUserService_48486de" #disbales BluetoothUserService_48486de (The Bluetooth user service supports proper functionality of Bluetooth features relevant to each user session.)
"WpnService" #Disables WpnService (Push Notifications may not work )
#"StorSvc" #Disables StorSvc (usb external hard drive will not be reconised by windows)
"RtkBtManServ" #Disables Realtek Bluetooth Device Manager Service
"QWAVE" #Disables Quality Windows Audio Video Experience (audio and video might sound worse)
#Hp services
"HPAppHelperCap" "HPAppHelperCap"
"HPDiagsCap" "HPDiagsCap"
"HPNetworkCap" "HPNetworkCap"
"HPSysInfoCap" "HPSysInfoCap"
"HpTouchpointAnalyticsService" "HpTouchpointAnalyticsService"
#hyper-v services # Hyper-V services
"HvHost" "HvHost"
"vmickvpexchange"
"vmicguestinterface" "vmicguestinterface"
"vmicshutdown"
"vmicheartbeat" "vmicheartbeat"
"vmicvmsession" "vmickvpexchange"
"vmicrdv" "vmicrdv"
"vmicshutdown"
"vmictimesync" "vmictimesync"
# Services which cannot be disabled "vmicvmsession"
# Services that cannot be disabled
#"WdNisSvc" #"WdNisSvc"
) )
@ -1171,7 +1169,7 @@ $WPFtweaksbutton.Add_Click({
"*AdobePhotoshopExpress*" "*AdobePhotoshopExpress*"
"*HotspotShieldFreeVPN*" "*HotspotShieldFreeVPN*"
#Optional: Typically not removed but you can if you need to for some reason #Optional: Typically not removed but you can if you need to
"*Microsoft.Advertising.Xaml*" "*Microsoft.Advertising.Xaml*"
#"*Microsoft.MSPaint*" #"*Microsoft.MSPaint*"
#"*Microsoft.MicrosoftStickyNotes*" #"*Microsoft.MicrosoftStickyNotes*"
@ -1434,7 +1432,7 @@ function New-Directory($path) {
$p, $components = $path -split '[\\/]' $p, $components = $path -split '[\\/]'
$components | ForEach-Object { $components | ForEach-Object {
$p = "$p\$_" $p = "$p\$_"
if (!(Test-Path $p)) { If (!(Test-Path $p)) {
New-Item -ItemType Directory $p | Out-Null New-Item -ItemType Directory $p | Out-Null
} }
} }
@ -1471,7 +1469,7 @@ New-ItemProperty `
# 1: PCs on my local network # 1: PCs on my local network
# 3: PCs on my local network, and PCs on the Internet # 3: PCs on my local network, and PCs on the Internet
$deliveryOptimizationPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config' $deliveryOptimizationPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config'
if (Test-Path $deliveryOptimizationPath) { If (Test-Path $deliveryOptimizationPath) {
New-ItemProperty ` New-ItemProperty `
-Path $deliveryOptimizationPath ` -Path $deliveryOptimizationPath `
-Name DODownloadMode ` -Name DODownloadMode `
@ -1581,10 +1579,9 @@ foreach ($service in $services) {
Get-BitsTransfer | Remove-BitsTransfer Get-BitsTransfer | Remove-BitsTransfer
Write-Host "10) Attempting to install the Windows Update Agent..." Write-Host "10) Attempting to install the Windows Update Agent..."
if($arch -eq 64){ If ($arch -eq 64) {
wusa Windows8-RT-KB2937636-x64 /quiet wusa Windows8-RT-KB2937636-x64 /quiet
} } else {
else{
wusa Windows8-RT-KB2937636-x86 /quiet wusa Windows8-RT-KB2937636-x86 /quiet
} }
@ -1630,7 +1627,7 @@ function New-Directory($path) {
$p, $components = $path -split '[\\/]' $p, $components = $path -split '[\\/]'
$components | ForEach-Object { $components | ForEach-Object {
$p = "$p\$_" $p = "$p\$_"
if (!(Test-Path $p)) { If (!(Test-Path $p)) {
New-Item -ItemType Directory $p | Out-Null New-Item -ItemType Directory $p | Out-Null
} }
} }
@ -1667,7 +1664,7 @@ New-ItemProperty `
# 1: PCs on my local network # 1: PCs on my local network
# 3: PCs on my local network, and PCs on the Internet # 3: PCs on my local network, and PCs on the Internet
$deliveryOptimizationPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config' $deliveryOptimizationPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config'
if (Test-Path $deliveryOptimizationPath) { If (Test-Path $deliveryOptimizationPath) {
New-ItemProperty ` New-ItemProperty `
-Path $deliveryOptimizationPath ` -Path $deliveryOptimizationPath `
-Name DODownloadMode ` -Name DODownloadMode `