From 54a575274dc289bfdb642c8ac082e0173d8cfa2f Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Thu, 28 Mar 2024 12:39:23 -0700 Subject: [PATCH] Test 2024 03 21 (#1748) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix unattended answer file woes for MicroWin (#1724) * Update applications.json Fake app add made by linux fanboy * Compile Winutil * Update files - Add detections for whether the image to be processed by MicroWin is Windows 10 or later - Add procedure to clear the indexes ComboBox (WinForms term) every time an ISO is specified * Update screen-install.png (#1464) * Compile Winutil * applications.jsonAdded Foxit Reader app and updated Foxit Editor to show the difference. * applications.json Added Foxit Reader app and updated Foxit Editor to show the difference. * Compile Winutil * Fix Broken Link and add syncthingtray (#1508) * Compile Winutil * Remove Nano-Removed bugged Nano package for now * Remove Nano -Removed bugged Nano package for now * Compile Winutil * tweaks and fetures tabs clean up automation from inputXML.xaml * tweaks and fetures tabs clean up automation from inputXML.xaml * fixed some commas in tweaks.json file * recompile * Update tweaks.json * Compile Winutil * Choosing Alternate Scartch Path and Busy Messages * Choosing Alternate Scartch Path and Busy Messages * Change Selected index to be pro * Compile Winutil * Improve detection for Professional editions * Update files Updated the Test-CompatibleImage function to compare against a desired version, which is useful for determining if the Specialize pass needs to be added to the unattended answer file * Automatic conversion of ESD files Automatically convert the install.esd file from installation media into a WIM file that can be mounted, then delete the ESD file * pull workflow github actions (#1716) * Update close-old-issues.yaml * Compile Winutil * Update close-old-issues.yaml * Update close-old-issues.yaml * Update close-old-issues.yaml * Compile Winutil --------- Co-authored-by: ChrisTitusTech * Update files Force unattended answer file to use UTF-8 encoding --------- Co-authored-by: Chris Titus Co-authored-by: ChrisTitusTech Co-authored-by: Samq64 <81489795+Samq64@users.noreply.github.com> Co-authored-by: Chris Titus Co-authored-by: LoopTJ <34551682+LoopTJ@users.noreply.github.com> Co-authored-by: Roc Wang Co-authored-by: Jes Herring <123990927+jesjess243@users.noreply.github.com> Co-authored-by: ogfrm <96927197+ogfrm@users.noreply.github.com> Co-authored-by: LeeDowA <157072913+LeeDowA@users.noreply.github.com> * add tightvnc to address issue #1718 (#1721) * Compile Winutil * Add 'FireFox ESR' and 'lightshot' Apps to 'application.json' File (#1720) * Add 'FireFox ESR' and 'lightshot' Apps to 'application.json' File * Update 'FireFox ESR' description * Compile Winutil * Fix typo in the Description of 'Get-Oscdimg.ps1' private function (#1743) * Compile Winutil * IPv6 update (#1739) * Compile Winutil * Change ipv6 disable method * Compile Winutil * IPv6 + Teredo * Compile Winutil * IPv6 registry * Compile Winutil * Update Winutil * Compile Winutil * Fix to original command * Compile Winutil --------- Co-authored-by: Joanty24 Co-authored-by: Chris Titus * Compile Winutil * Implement New Winget Install Method (#1738) - Removed Get-LatestHash from Install-WinUtilWinget.ps1, replaced by Get-WinUtilWingetLatest.ps1. - Added new Winget Install method in case of choco failing to install. Environment refresh line included. - Get-WinUtilWingetPrerequisites added: Downloads the prerequisites required for the latest version of Winget. - Get-WinUtilWingetLatest added: Uses the GitHub API to find the latest version of Winget and download it along with the accompanied License1.xml file. Fixes: - Removed --scope=machine from winget install command in Install-WinUtilProgramWinget. Non-UWP Apps fail to install if scope is set to machine. Error code: 0x80070005. More information commented in file. * Compile Winutil * Change order for easier launch in README and fix outdated info (#1732) * Update README.md * Update README.md --------- Co-authored-by: NewCodingAI <165050080+NewCodingAI@users.noreply.github.com> * Upgrade Fix in #1181 (#1730) * Compile Winutil * Fixed Ventoy drive copy typo and began conversion of DISM commands into DISM cmdlets (#1727) * Fixed Ventoy drive copy typo * DISM cmdlet Update (Part 1) Began replacing basic DISM commands with cmdlets from the DISM module. This change only affects the mount, unmount, and export operations. All other operations still use DISM --------- Co-authored-by: Chris Titus * Compile Winutil --------- Co-authored-by: CodingWonders <101426328+CodingWonders@users.noreply.github.com> Co-authored-by: ChrisTitusTech Co-authored-by: Samq64 <81489795+Samq64@users.noreply.github.com> Co-authored-by: LoopTJ <34551682+LoopTJ@users.noreply.github.com> Co-authored-by: Roc Wang Co-authored-by: Jes Herring <123990927+jesjess243@users.noreply.github.com> Co-authored-by: ogfrm <96927197+ogfrm@users.noreply.github.com> Co-authored-by: LeeDowA <157072913+LeeDowA@users.noreply.github.com> Co-authored-by: Peter Gallwas Co-authored-by: Mr.k Co-authored-by: Joan Solana Raduà Co-authored-by: Joanty24 Co-authored-by: Rux Co-authored-by: ModernTTY <165050080+ModernTTY@users.noreply.github.com> Co-authored-by: NewCodingAI <165050080+NewCodingAI@users.noreply.github.com> Co-authored-by: Justawildwolf <62820836+blusewill@users.noreply.github.com> --- README.md | 13 +- config/applications.json | 24 ++ config/tweaks.json | 18 ++ functions/private/Get-Oscdimg.ps1 | 2 +- functions/private/Get-WinUtilWingetLatest.ps1 | 23 ++ .../Get-WinUtilWingetPrerequisites.ps1 | 29 +++ .../private/Install-WinUtilProgramWinget.ps1 | 5 +- functions/private/Install-WinUtilWinget.ps1 | 48 ++-- functions/private/Invoke-MicroWin-Helper.ps1 | 4 +- .../private/Update-WinUtilProgramWinget.ps1 | 2 +- functions/public/Invoke-WPFMicrowin.ps1 | 20 +- winutil.ps1 | 208 ++++++++++++++---- xaml/inputApp.xaml | 31 ++- 13 files changed, 337 insertions(+), 90 deletions(-) create mode 100644 functions/private/Get-WinUtilWingetLatest.ps1 create mode 100644 functions/private/Get-WinUtilWingetPrerequisites.ps1 diff --git a/README.md b/README.md index 2040acde..c93e6a43 100644 --- a/README.md +++ b/README.md @@ -22,15 +22,16 @@ Winutil must be run in Admin mode because it performs system-wide tweaks. To ach #### Simple way -``` -iwr -useb https://christitus.com/win | iex -``` -or by executing: ``` irm https://christitus.com/win | iex ``` Courtesy of the issue raised at: [#144](/../../issues/144) +or by executing: +``` +iwr -useb https://christitus.com/win | iex +``` + if for some reason this site is not reachable from your country please try running it directly from github ``` @@ -97,7 +98,9 @@ If you are still having issues try changing your DNS provider to 1.1.1.1 || 1.0. - Essential Tweaks: Offers a collection of essential tweaks aimed at improving system performance, privacy, and resource utilization. These tweaks include creating a system restore point, disabling telemetry, Wi-Fi Sense, setting services to manual, disabling location tracking, and HomeGroup, among others. - - Misc. Tweaks: Encompasses a range of various tweaks to further optimize the system. These tweaks include enabling/disabling power throttling, enabling num lock on startup, removing Cortana and Edge, disabling User Account Control (UAC), notification panel, and configuring TPM during updates, among others. + - Advanced Tweaks: Encompasses a range of various advanced power user tweaks to further optimize the system. These tweaks include removing OneDrive and Edge, disabling User Account Control (UAC), notification panel, among others. + + - Toggles: Adds easy to use, one click shortcuts for toggling dark mode, NumLock on startup, file extensions, sticky keys, among others. - Additional Tweaks: Introduces various other tweaks such as enabling dark mode, changing DNS settings, adding an Ultimate Performance mode, and creating shortcuts for WinUtil tools. These tweaks provide users with additional customization options to tailor their system to their preferences. diff --git a/config/applications.json b/config/applications.json index d3f4fd18..b0cd217b 100755 --- a/config/applications.json +++ b/config/applications.json @@ -535,6 +535,14 @@ "link": "https://www.mozilla.org/en-US/firefox/new/", "winget": "Mozilla.Firefox" }, + "WPFInstallfirefoxesr": { + "category": "Browsers", + "choco": "FirefoxESR", + "content": "Firefox ESR", + "description": "Mozilla Firefox is an open-source web browser known for its customization options, privacy features, and extensions. Firefox ESR (Extended Support Release) receives major updates every 42 weeks with minor updates such as crash fixes, security fixes and policy updates as needed, but at least every four weeks.", + "link": "https://www.mozilla.org/en-US/firefox/new/", + "winget": "Mozilla.Firefox.ESR" + }, "WPFInstallflameshot": { "category": "Multimedia Tools", "choco": "flameshot", @@ -543,6 +551,14 @@ "link": "https://flameshot.org/", "winget": "Flameshot.Flameshot" }, + "WPFInstalllightshot": { + "category": "Multimedia Tools", + "choco": "lightshot", + "content": "Lightshot (Screenshots)", + "description": "Ligthshot is an Easy-to-use, light-weight screenshot software tool, where you can optionally edit your screenshots using different tools, share them via Internet and/or save to disk, and customize the available options.", + "link": "https://app.prntscr.com/", + "winget": "Skillbrains.Lightshot" + }, "WPFInstallfloorp": { "category": "Browsers", "choco": "na", @@ -2270,5 +2286,13 @@ "description": "pyenv for Windows is a simple python version management tool. It lets you easily switch between multiple versions of Python.", "link": "https://pyenv-win.github.io/pyenv-win/", "winget": "na" + }, + "WPFInstalltightvnc": { + "category": "Utilities", + "choco": "TightVNC", + "content": "TightVNC", + "description": "TightVNC is a free and Open Source remote desktop software that lets you access and control a computer over the network. With its intuitive interface, you can interact with the remote screen as if you were sitting in front of it. You can open files, launch applications, and perform other actions on the remote desktop almost as if you were physically there", + "link": "https://www.tightvnc.com/", + "winget": "GlavSoft.TightVNC" } } diff --git a/config/tweaks.json b/config/tweaks.json index dcf08885..68dea51b 100644 --- a/config/tweaks.json +++ b/config/tweaks.json @@ -2527,6 +2527,15 @@ "category": "z__Advanced Tweaks - CAUTION", "panel": "1", "Order": "a031_", + "registry": [ + { + "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters", + "Name": "DisabledComponents", + "Value": "255", + "OriginalValue": "0", + "Type": "DWord" + } + ], "InvokeScript": [ "Disable-NetAdapterBinding -Name \"*\" -ComponentID ms_tcpip6" ], @@ -2540,6 +2549,15 @@ "category": "z__Advanced Tweaks - CAUTION", "panel": "1", "Order": "a030_", + "registry": [ + { + "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters", + "Name": "DisabledComponents", + "Value": "0", + "OriginalValue": "0", + "Type": "DWord" + } + ], "InvokeScript": [ "Enable-NetAdapterBinding -Name \"*\" -ComponentID ms_tcpip6" ], diff --git a/functions/private/Get-Oscdimg.ps1 b/functions/private/Get-Oscdimg.ps1 index 29634955..47a2eadd 100644 --- a/functions/private/Get-Oscdimg.ps1 +++ b/functions/private/Get-Oscdimg.ps1 @@ -2,7 +2,7 @@ function Get-Oscdimg { <# .DESCRIPTION - This function will get oscdimg file for from github Release foldersand put it into env:temp + This function will download oscdimg file from github Release folders and put it into env:temp folder .EXAMPLE Get-Oscdimg diff --git a/functions/private/Get-WinUtilWingetLatest.ps1 b/functions/private/Get-WinUtilWingetLatest.ps1 new file mode 100644 index 00000000..5a18a536 --- /dev/null +++ b/functions/private/Get-WinUtilWingetLatest.ps1 @@ -0,0 +1,23 @@ +function Get-WinUtilWingetLatest { + <# + .SYNOPSIS + Uses GitHub API to check for the latest release of Winget. + .DESCRIPTION + This function grabs the latest version of Winget and returns the download path to Install-WinUtilWinget for installation. + #> + + Try{ + # Grabs the latest release of Winget from the Github API for the install process. + $response = Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/Winget-cli/releases/latest" -Method Get -ErrorAction Stop + $latestVersion = $response.tag_name #Stores version number of latest release. + $licenseWingetUrl = $response.assets.browser_download_url[0] #Index value for License file. + Write-Host "Latest Version:`t$($latestVersion)`n" + $assetUrl = $response.assets.browser_download_url[2] #Index value for download URL. + Invoke-WebRequest -Uri $licenseWingetUrl -OutFile $ENV:TEMP\License1.xml + # The only pain is that the msixbundle for winget-cli is 246MB. In some situations this can take a bit, with slower connections. + Invoke-WebRequest -Uri $assetUrl -OutFile $ENV:TEMP\Microsoft.DesktopAppInstaller.msixbundle + } + Catch{ + throw [WingetFailedInstall]::new('Failed to get latest Winget release and license') + } +} diff --git a/functions/private/Get-WinUtilWingetPrerequisites.ps1 b/functions/private/Get-WinUtilWingetPrerequisites.ps1 new file mode 100644 index 00000000..4949d191 --- /dev/null +++ b/functions/private/Get-WinUtilWingetPrerequisites.ps1 @@ -0,0 +1,29 @@ +function Get-WinUtilWingetPrerequisites { + <# + .SYNOPSIS + Downloads the Winget Prereqs. + .DESCRIPTION + Downloads Prereqs for Winget. Version numbers are coded as variables and can be updated as uncommonly as Microsoft updates the prereqs. + #> + + # I don't know of a way to detect the prereqs automatically, so if someone has a better way of defining these, that would be great. + # Microsoft.VCLibs version rarely changes, but for future compatibility I made it a variable. + $versionVCLibs = "14.00" + $fileVCLibs = "https://aka.ms/Microsoft.VCLibs.x64.${versionVCLibs}.Desktop.appx" + # Write-Host "$fileVCLibs" + # Microsoft.UI.Xaml version changed recently, so I made the version numbers variables. + $versionUIXamlMinor = "2.8" + $versionUIXamlPatch = "2.8.6" + $fileUIXaml = "https://github.com/microsoft/microsoft-ui-xaml/releases/download/v${versionUIXamlPatch}/Microsoft.UI.Xaml.${versionUIXamlMinor}.x64.appx" + # Write-Host "$fileUIXaml" + + Try{ + Write-Host "Downloading Microsoft.VCLibs Dependency..." + Invoke-WebRequest -Uri $fileVCLibs -OutFile $ENV:TEMP\Microsoft.VCLibs.x64.Desktop.appx + Write-Host "Downloading Microsoft.UI.Xaml Dependency...`n" + Invoke-WebRequest -Uri $fileUIXaml -OutFile $ENV:TEMP\Microsoft.UI.Xaml.x64.appx + } + Catch{ + throw [WingetFailedInstall]::new('Failed to install prerequsites') + } +} diff --git a/functions/private/Install-WinUtilProgramWinget.ps1 b/functions/private/Install-WinUtilProgramWinget.ps1 index 24d3b266..7bfedd93 100644 --- a/functions/private/Install-WinUtilProgramWinget.ps1 +++ b/functions/private/Install-WinUtilProgramWinget.ps1 @@ -30,7 +30,10 @@ Function Install-WinUtilProgramWinget { Write-Progress -Activity "$manage Applications" -Status "$manage $Program $($x + 1) of $count" -PercentComplete $($x/$count*100) if($manage -eq "Installing"){ - Start-Process -FilePath winget -ArgumentList "install -e --accept-source-agreements --accept-package-agreements --scope=machine --silent $Program" -NoNewWindow -Wait + # --scope=machine when installing non-UWP apps with winget fails with error code 0x80070005. + # Removed argument while testing new Winget install method. + # Open issue on winget-cli github repo: https://github.com/microsoft/winget-cli/issues/3936 + Start-Process -FilePath winget -ArgumentList "install -e --accept-source-agreements --accept-package-agreements --silent $Program" -NoNewWindow -Wait } if($manage -eq "Uninstalling"){ Start-Process -FilePath winget -ArgumentList "uninstall -e --accept-source-agreements --purge --force --silent $Program" -NoNewWindow -Wait diff --git a/functions/private/Install-WinUtilWinget.ps1 b/functions/private/Install-WinUtilWinget.ps1 index a334bb61..a1da1f48 100644 --- a/functions/private/Install-WinUtilWinget.ps1 +++ b/functions/private/Install-WinUtilWinget.ps1 @@ -1,26 +1,16 @@ -function Get-LatestHash { - $shaUrl = ((Invoke-WebRequest $apiLatestUrl -UseBasicParsing | ConvertFrom-Json).assets | Where-Object { $_.name -match '^Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.txt$' }).browser_download_url - - $shaFile = Join-Path -Path $tempFolder -ChildPath 'Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.txt' - $WebClient.DownloadFile($shaUrl, $shaFile) - - Get-Content $shaFile -} - function Install-WinUtilWinget { - <# .SYNOPSIS - Installs Winget if it is not already installed + Installs Winget if it is not already installed. .DESCRIPTION - This function will download the latest version of winget and install it. If winget is already installed, it will do nothing. + This function will download the latest version of Winget and install it. If Winget is already installed, it will do nothing. #> Try{ Write-Host "Checking if Winget is Installed..." - if (Test-WinUtilPackageManager -winget) { - # Checks if winget executable exists and if the Windows Version is 1809 or higher + if (Test-WinUtilPackageManager -Winget) { + # Checks if Winget executable exists and if the Windows Version is 1809 or higher Write-Host "Winget Already Installed" return } @@ -34,17 +24,35 @@ function Install-WinUtilWinget { } if (($ComputerInfo.WindowsVersion) -lt "1809") { - # Checks if Windows Version is too old for winget + # Checks if Windows Version is too old for Winget Write-Host "Winget is not supported on this version of Windows (Pre-1809)" return } - Write-Host "Running Alternative Installer and Direct Installing" - Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install winget" - - Write-Host "Winget Installed" + if((Get-Command -Name choco -ErrorAction Ignore)) { + # Checks if Chocolatey is present (In case it didn't install properly), and installs Winget with choco, if so. + Write-Host "Chocolatey detected. Installing Winget via Chocolatey" + Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install winget-cli" + Write-Host "Winget Installed" + Write-Output "Refreshing Environment Variables...`n" + $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") + } + Else { + # If Chocolatey doesn't exist, it will install Winget through more manual means. + # Used part of my own script with some modification: ruxunderscore/windows-initialization + Write-Host "Downloading Winget Prerequsites" + Get-WinUtilWingetPrerequisites + Write-Host "Downloading Winget and License File" + Get-WinUtilWingetLatest + Write-Host "Installing Winget w/ Prerequsites" + Add-AppxProvisionedPackage -Online -PackagePath $ENV:TEMP\Microsoft.DesktopAppInstaller.msixbundle -DependencyPackagePath $ENV:TEMP\Microsoft.VCLibs.x64.Desktop.appx, $ENV:TEMP\Microsoft.UI.Xaml.x64.appx -LicensePath $ENV:TEMP\License1.xml + Write-Host "Winget Installed" + # Winget only needs a refresh of the environment variables to be used. + Write-Output "Refreshing Environment Variables...`n" + $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") + } } Catch{ throw [WingetFailedInstall]::new('Failed to install') } -} \ No newline at end of file +} diff --git a/functions/private/Invoke-MicroWin-Helper.ps1 b/functions/private/Invoke-MicroWin-Helper.ps1 index 38544a9f..3ae08d49 100644 --- a/functions/private/Invoke-MicroWin-Helper.ps1 +++ b/functions/private/Invoke-MicroWin-Helper.ps1 @@ -195,7 +195,7 @@ function Copy-ToUSB([string] $fileToCopy) Write-Progress -Activity "Copying File" -Status "Progress" -PercentComplete $completed -CurrentOperation ("{0:N2} MB / {1:N2} MB" -f ($_.BytesTransferred / 1MB), ($totalSize / 1MB)) } - Write-Host "File copied to Ventoy drive $($volume.DriveLette)" + Write-Host "File copied to Ventoy drive $($volume.DriveLetter)" return } } @@ -377,7 +377,7 @@ function New-Unattend { # Replace the placeholder text with the Specialize pass $unattend = $unattend.Replace("<#REPLACEME#>", $specPass).Trim() } - $unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force + $unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force -Encoding utf8 } function New-CheckInstall { diff --git a/functions/private/Update-WinUtilProgramWinget.ps1 b/functions/private/Update-WinUtilProgramWinget.ps1 index 1fc0c2df..6fac6741 100644 --- a/functions/private/Update-WinUtilProgramWinget.ps1 +++ b/functions/private/Update-WinUtilProgramWinget.ps1 @@ -12,7 +12,7 @@ Function Update-WinUtilProgramWinget { $host.ui.RawUI.WindowTitle = """Winget Install""" Start-Transcript $ENV:TEMP\winget-update.log -Append - winget upgrade --all + winget upgrade --all --accept-source-agreements --accept-package-agreements --scope=machine --silent } diff --git a/functions/public/Invoke-WPFMicrowin.ps1 b/functions/public/Invoke-WPFMicrowin.ps1 index 8aa4d79a..6c8a2d6a 100644 --- a/functions/public/Invoke-WPFMicrowin.ps1 +++ b/functions/public/Invoke-WPFMicrowin.ps1 @@ -100,8 +100,16 @@ public class PowerManagement { try { Write-Host "Mounting Windows image. This may take a while." - dism /mount-image /imagefile:$mountDir\sources\install.wim /index:$index /mountdir:$scratchDir - Write-Host "Mounting complete! Performing removal of applications..." + Mount-WindowsImage -ImagePath "$mountDir\sources\install.wim" -Index $index -Path "$scratchDir" + if ($?) + { + Write-Host "Mounting complete! Performing removal of applications..." + } + else + { + Write-Host "Could not mount image. Exiting..." + return + } if ($injectDrivers) { @@ -299,13 +307,13 @@ public class PowerManagement { Write-Host "Cleanup complete." Write-Host "Unmounting image..." - dism /unmount-image /mountdir:$scratchDir /commit + Dismount-WindowsImage -Path $scratchDir -Save } try { Write-Host "Exporting image into $mountDir\sources\install2.wim" - dism /Export-Image /SourceImageFile:"$mountDir\sources\install.wim" /SourceIndex:$index /DestinationImageFile:"$mountDir\sources\install2.wim" /compress:max + Export-WindowsImage -SourceImagePath "$mountDir\sources\install.wim" -SourceIndex $index -DestinationImagePath "$mountDir\sources\install2.wim" -CompressionType "Max" Write-Host "Remove old '$mountDir\sources\install.wim' and rename $mountDir\sources\install2.wim" Remove-Item "$mountDir\sources\install.wim" Rename-Item "$mountDir\sources\install2.wim" "$mountDir\sources\install.wim" @@ -319,7 +327,7 @@ public class PowerManagement { # Next step boot image Write-Host "Mounting boot image $mountDir\sources\boot.wim into $scratchDir" - dism /mount-image /imagefile:"$mountDir\sources\boot.wim" /index:2 /mountdir:"$scratchDir" + Mount-WindowsImage -ImagePath "$mountDir\sources\boot.wim" -Index 2 -Path "$scratchDir" if ($injectDrivers) { @@ -365,7 +373,7 @@ public class PowerManagement { reg unload HKLM\zSYSTEM Write-Host "Unmounting image..." - dism /unmount-image /mountdir:$scratchDir /commit + Dismount-WindowsImage -Path $scratchDir -Save Write-Host "Creating ISO image" diff --git a/winutil.ps1 b/winutil.ps1 index 52c2a583..541775ae 100644 --- a/winutil.ps1 +++ b/winutil.ps1 @@ -10,7 +10,7 @@ Author : Chris Titus @christitustech Runspace Author: @DeveloperDurp GitHub : https://github.com/ChrisTitusTech - Version : 24.03.21 + Version : 24.03.28 #> param ( [switch]$Debug, @@ -47,7 +47,7 @@ Add-Type -AssemblyName System.Windows.Forms # Variable to sync between runspaces $sync = [Hashtable]::Synchronized(@{}) $sync.PSScriptRoot = $PSScriptRoot -$sync.version = "24.03.21" +$sync.version = "24.03.28" $sync.configs = @{} $sync.ProcessRunning = $false @@ -235,7 +235,7 @@ function Get-Oscdimg { <# .DESCRIPTION - This function will get oscdimg file for from github Release foldersand put it into env:temp + This function will download oscdimg file from github Release folders and put it into env:temp folder .EXAMPLE Get-Oscdimg @@ -608,6 +608,58 @@ function Get-WinUtilVariables { } return $keys } +function Get-WinUtilWingetLatest { + <# + .SYNOPSIS + Uses GitHub API to check for the latest release of Winget. + .DESCRIPTION + This function grabs the latest version of Winget and returns the download path to Install-WinUtilWinget for installation. + #> + + Try{ + # Grabs the latest release of Winget from the Github API for the install process. + $response = Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/Winget-cli/releases/latest" -Method Get -ErrorAction Stop + $latestVersion = $response.tag_name #Stores version number of latest release. + $licenseWingetUrl = $response.assets.browser_download_url[0] #Index value for License file. + Write-Host "Latest Version:`t$($latestVersion)`n" + $assetUrl = $response.assets.browser_download_url[2] #Index value for download URL. + Invoke-WebRequest -Uri $licenseWingetUrl -OutFile $ENV:TEMP\License1.xml + # The only pain is that the msixbundle for winget-cli is 246MB. In some situations this can take a bit, with slower connections. + Invoke-WebRequest -Uri $assetUrl -OutFile $ENV:TEMP\Microsoft.DesktopAppInstaller.msixbundle + } + Catch{ + throw [WingetFailedInstall]::new('Failed to get latest Winget release and license') + } +} +function Get-WinUtilWingetPrerequisites { + <# + .SYNOPSIS + Downloads the Winget Prereqs. + .DESCRIPTION + Downloads Prereqs for Winget. Version numbers are coded as variables and can be updated as uncommonly as Microsoft updates the prereqs. + #> + + # I don't know of a way to detect the prereqs automatically, so if someone has a better way of defining these, that would be great. + # Microsoft.VCLibs version rarely changes, but for future compatibility I made it a variable. + $versionVCLibs = "14.00" + $fileVCLibs = "https://aka.ms/Microsoft.VCLibs.x64.${versionVCLibs}.Desktop.appx" + # Write-Host "$fileVCLibs" + # Microsoft.UI.Xaml version changed recently, so I made the version numbers variables. + $versionUIXamlMinor = "2.8" + $versionUIXamlPatch = "2.8.6" + $fileUIXaml = "https://github.com/microsoft/microsoft-ui-xaml/releases/download/v${versionUIXamlPatch}/Microsoft.UI.Xaml.${versionUIXamlMinor}.x64.appx" + # Write-Host "$fileUIXaml" + + Try{ + Write-Host "Downloading Microsoft.VCLibs Dependency..." + Invoke-WebRequest -Uri $fileVCLibs -OutFile $ENV:TEMP\Microsoft.VCLibs.x64.Desktop.appx + Write-Host "Downloading Microsoft.UI.Xaml Dependency...`n" + Invoke-WebRequest -Uri $fileUIXaml -OutFile $ENV:TEMP\Microsoft.UI.Xaml.x64.appx + } + Catch{ + throw [WingetFailedInstall]::new('Failed to install prerequsites') + } +} function Install-WinUtilChoco { <# @@ -669,7 +721,10 @@ Function Install-WinUtilProgramWinget { Write-Progress -Activity "$manage Applications" -Status "$manage $Program $($x + 1) of $count" -PercentComplete $($x/$count*100) if($manage -eq "Installing"){ - Start-Process -FilePath winget -ArgumentList "install -e --accept-source-agreements --accept-package-agreements --scope=machine --silent $Program" -NoNewWindow -Wait + # --scope=machine when installing non-UWP apps with winget fails with error code 0x80070005. + # Removed argument while testing new Winget install method. + # Open issue on winget-cli github repo: https://github.com/microsoft/winget-cli/issues/3936 + Start-Process -FilePath winget -ArgumentList "install -e --accept-source-agreements --accept-package-agreements --silent $Program" -NoNewWindow -Wait } if($manage -eq "Uninstalling"){ Start-Process -FilePath winget -ArgumentList "uninstall -e --accept-source-agreements --purge --force --silent $Program" -NoNewWindow -Wait @@ -681,29 +736,19 @@ Function Install-WinUtilProgramWinget { Write-Progress -Activity "$manage Applications" -Status "Finished" -Completed } -function Get-LatestHash { - $shaUrl = ((Invoke-WebRequest $apiLatestUrl -UseBasicParsing | ConvertFrom-Json).assets | Where-Object { $_.name -match '^Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.txt$' }).browser_download_url - - $shaFile = Join-Path -Path $tempFolder -ChildPath 'Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.txt' - $WebClient.DownloadFile($shaUrl, $shaFile) - - Get-Content $shaFile -} - function Install-WinUtilWinget { - <# .SYNOPSIS - Installs Winget if it is not already installed + Installs Winget if it is not already installed. .DESCRIPTION - This function will download the latest version of winget and install it. If winget is already installed, it will do nothing. + This function will download the latest version of Winget and install it. If Winget is already installed, it will do nothing. #> Try{ Write-Host "Checking if Winget is Installed..." - if (Test-WinUtilPackageManager -winget) { - # Checks if winget executable exists and if the Windows Version is 1809 or higher + if (Test-WinUtilPackageManager -Winget) { + # Checks if Winget executable exists and if the Windows Version is 1809 or higher Write-Host "Winget Already Installed" return } @@ -717,15 +762,33 @@ function Install-WinUtilWinget { } if (($ComputerInfo.WindowsVersion) -lt "1809") { - # Checks if Windows Version is too old for winget + # Checks if Windows Version is too old for Winget Write-Host "Winget is not supported on this version of Windows (Pre-1809)" return } - Write-Host "Running Alternative Installer and Direct Installing" - Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install winget" - - Write-Host "Winget Installed" + if((Get-Command -Name choco -ErrorAction Ignore)) { + # Checks if Chocolatey is present (In case it didn't install properly), and installs Winget with choco, if so. + Write-Host "Chocolatey detected. Installing Winget via Chocolatey" + Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install winget-cli" + Write-Host "Winget Installed" + Write-Output "Refreshing Environment Variables...`n" + $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") + } + Else { + # If Chocolatey doesn't exist, it will install Winget through more manual means. + # Used part of my own script with some modification: ruxunderscore/windows-initialization + Write-Host "Downloading Winget Prerequsites" + Get-WinUtilWingetPrerequisites + Write-Host "Downloading Winget and License File" + Get-WinUtilWingetLatest + Write-Host "Installing Winget w/ Prerequsites" + Add-AppxProvisionedPackage -Online -PackagePath $ENV:TEMP\Microsoft.DesktopAppInstaller.msixbundle -DependencyPackagePath $ENV:TEMP\Microsoft.VCLibs.x64.Desktop.appx, $ENV:TEMP\Microsoft.UI.Xaml.x64.appx -LicensePath $ENV:TEMP\License1.xml + Write-Host "Winget Installed" + # Winget only needs a refresh of the environment variables to be used. + Write-Output "Refreshing Environment Variables...`n" + $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") + } } Catch{ throw [WingetFailedInstall]::new('Failed to install') @@ -928,7 +991,7 @@ function Copy-ToUSB([string] $fileToCopy) Write-Progress -Activity "Copying File" -Status "Progress" -PercentComplete $completed -CurrentOperation ("{0:N2} MB / {1:N2} MB" -f ($_.BytesTransferred / 1MB), ($totalSize / 1MB)) } - Write-Host "File copied to Ventoy drive $($volume.DriveLette)" + Write-Host "File copied to Ventoy drive $($volume.DriveLetter)" return } } @@ -1110,7 +1173,7 @@ function New-Unattend { # Replace the placeholder text with the Specialize pass $unattend = $unattend.Replace("<#REPLACEME#>", $specPass).Trim() } - $unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force + $unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force -Encoding utf8 } function New-CheckInstall { @@ -2515,7 +2578,7 @@ Function Update-WinUtilProgramWinget { $host.ui.RawUI.WindowTitle = """Winget Install""" Start-Transcript $ENV:TEMP\winget-update.log -Append - winget upgrade --all + winget upgrade --all --accept-source-agreements --accept-package-agreements --scope=machine --silent } @@ -3536,8 +3599,16 @@ public class PowerManagement { try { Write-Host "Mounting Windows image. This may take a while." - dism /mount-image /imagefile:$mountDir\sources\install.wim /index:$index /mountdir:$scratchDir - Write-Host "Mounting complete! Performing removal of applications..." + Mount-WindowsImage -ImagePath "$mountDir\sources\install.wim" -Index $index -Path "$scratchDir" + if ($?) + { + Write-Host "Mounting complete! Performing removal of applications..." + } + else + { + Write-Host "Could not mount image. Exiting..." + return + } if ($injectDrivers) { @@ -3735,13 +3806,13 @@ public class PowerManagement { Write-Host "Cleanup complete." Write-Host "Unmounting image..." - dism /unmount-image /mountdir:$scratchDir /commit + Dismount-WindowsImage -Path $scratchDir -Save } try { Write-Host "Exporting image into $mountDir\sources\install2.wim" - dism /Export-Image /SourceImageFile:"$mountDir\sources\install.wim" /SourceIndex:$index /DestinationImageFile:"$mountDir\sources\install2.wim" /compress:max + Export-WindowsImage -SourceImagePath "$mountDir\sources\install.wim" -SourceIndex $index -DestinationImagePath "$mountDir\sources\install2.wim" -CompressionType "Max" Write-Host "Remove old '$mountDir\sources\install.wim' and rename $mountDir\sources\install2.wim" Remove-Item "$mountDir\sources\install.wim" Rename-Item "$mountDir\sources\install2.wim" "$mountDir\sources\install.wim" @@ -3755,7 +3826,7 @@ public class PowerManagement { # Next step boot image Write-Host "Mounting boot image $mountDir\sources\boot.wim into $scratchDir" - dism /mount-image /imagefile:"$mountDir\sources\boot.wim" /index:2 /mountdir:"$scratchDir" + Mount-WindowsImage -ImagePath "$mountDir\sources\boot.wim" -Index 2 -Path "$scratchDir" if ($injectDrivers) { @@ -3801,7 +3872,7 @@ public class PowerManagement { reg unload HKLM\zSYSTEM Write-Host "Unmounting image..." - dism /unmount-image /mountdir:$scratchDir /commit + Dismount-WindowsImage -Path $scratchDir -Save Write-Host "Creating ISO image" @@ -5218,6 +5289,14 @@ $sync.configs.applications = '{ "link": "https://www.mozilla.org/en-US/firefox/new/", "winget": "Mozilla.Firefox" }, + "WPFInstallfirefoxesr": { + "category": "Browsers", + "choco": "FirefoxESR", + "content": "Firefox ESR", + "description": "Mozilla Firefox is an open-source web browser known for its customization options, privacy features, and extensions. Firefox ESR (Extended Support Release) receives major updates every 42 weeks with minor updates such as crash fixes, security fixes and policy updates as needed, but at least every four weeks.", + "link": "https://www.mozilla.org/en-US/firefox/new/", + "winget": "Mozilla.Firefox.ESR" + }, "WPFInstallflameshot": { "category": "Multimedia Tools", "choco": "flameshot", @@ -5226,6 +5305,14 @@ $sync.configs.applications = '{ "link": "https://flameshot.org/", "winget": "Flameshot.Flameshot" }, + "WPFInstalllightshot": { + "category": "Multimedia Tools", + "choco": "lightshot", + "content": "Lightshot (Screenshots)", + "description": "Ligthshot is an Easy-to-use, light-weight screenshot software tool, where you can optionally edit your screenshots using different tools, share them via Internet and/or save to disk, and customize the available options.", + "link": "https://app.prntscr.com/", + "winget": "Skillbrains.Lightshot" + }, "WPFInstallfloorp": { "category": "Browsers", "choco": "na", @@ -6953,6 +7040,14 @@ $sync.configs.applications = '{ "description": "pyenv for Windows is a simple python version management tool. It lets you easily switch between multiple versions of Python.", "link": "https://pyenv-win.github.io/pyenv-win/", "winget": "na" + }, + "WPFInstalltightvnc": { + "category": "Utilities", + "choco": "TightVNC", + "content": "TightVNC", + "description": "TightVNC is a free and Open Source remote desktop software that lets you access and control a computer over the network. With its intuitive interface, you can interact with the remote screen as if you were sitting in front of it. You can open files, launch applications, and perform other actions on the remote desktop almost as if you were physically there", + "link": "https://www.tightvnc.com/", + "winget": "GlavSoft.TightVNC" } }' | convertfrom-json $sync.configs.dns = '{ @@ -9914,6 +10009,15 @@ $sync.configs.tweaks = '{ "category": "z__Advanced Tweaks - CAUTION", "panel": "1", "Order": "a031_", + "registry": [ + { + "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters", + "Name": "DisabledComponents", + "Value": "255", + "OriginalValue": "0", + "Type": "DWord" + } + ], "InvokeScript": [ "Disable-NetAdapterBinding -Name \"*\" -ComponentID ms_tcpip6" ], @@ -9927,6 +10031,15 @@ $sync.configs.tweaks = '{ "category": "z__Advanced Tweaks - CAUTION", "panel": "1", "Order": "a030_", + "registry": [ + { + "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters", + "Name": "DisabledComponents", + "Value": "0", + "OriginalValue": "0", + "Type": "DWord" + } + ], "InvokeScript": [ "Enable-NetAdapterBinding -Name \"*\" -ComponentID ms_tcpip6" ], @@ -10773,6 +10886,9 @@ $inputXML = ' + + + @@ -11099,15 +11215,15 @@ $inputXML = ' + + + - - - @@ -11257,6 +11373,9 @@ $inputXML = ' + + + @@ -11280,15 +11399,15 @@ $inputXML = ' + + + - - - @@ -11455,17 +11574,17 @@ $inputXML = ' - - - - - + + + + + @@ -11593,6 +11712,9 @@ $inputXML = ' + + + diff --git a/xaml/inputApp.xaml b/xaml/inputApp.xaml index ce07ac47..f6b15667 100644 --- a/xaml/inputApp.xaml +++ b/xaml/inputApp.xaml @@ -27,6 +27,9 @@ + + + @@ -353,15 +356,15 @@ + + + - - - @@ -511,6 +514,9 @@ + + + @@ -534,15 +540,15 @@ + + + - - - @@ -709,17 +715,17 @@ - - - - - + + + + + @@ -847,6 +853,9 @@ + + +