From f63c312f22117b0247ea9a1ac1301eb27dbdb176 Mon Sep 17 00:00:00 2001 From: MyDrift Date: Tue, 20 Aug 2024 23:07:14 +0200 Subject: [PATCH] remove architecture selection --- functions/public/Invoke-WPFGetIso.ps1 | 5 +---- scripts/main.ps1 | 6 ------ xaml/inputXML.xaml | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/functions/public/Invoke-WPFGetIso.ps1 b/functions/public/Invoke-WPFGetIso.ps1 index 320b3b55..72c262be 100644 --- a/functions/public/Invoke-WPFGetIso.ps1 +++ b/functions/public/Invoke-WPFGetIso.ps1 @@ -84,12 +84,9 @@ function Invoke-WPFGetIso { Invoke-WebRequest "https://github.com/pbatard/Fido/raw/master/Fido.ps1" -OutFile $fidopath - $selectedItem = ($sync["ISOArchitecture"].SelectedItem -split '-')[0] - $rel = "x" + $selectedItem - # TODO: Have to correct the language to actually be a working one Set-Location -Path $env:temp - & $fidopath -Win 'Windows 11' -Rel $sync["ISORelease"].SelectedItem -Arch $rel + & $fidopath -Win 'Windows 11' -Rel $sync["ISORelease"].SelectedItem -Arch "x64" Set-Location $originalLocation $filePath = Get-ChildItem -Path "$env:temp" -Filter "Win11*.iso" | Sort-Object LastWriteTime -Descending | Select-Object -First 1 } diff --git a/scripts/main.ps1 b/scripts/main.ps1 index 592944a9..1b299456 100644 --- a/scripts/main.ps1 +++ b/scripts/main.ps1 @@ -369,18 +369,12 @@ if ($locale -ne "en-US") { } $sync["ISOLanguage"].SelectedItem = $locale -$sync["ISOArchitecture"].Items.Add("64-bit") -$sync["ISOArchitecture"].Items.Add("86-bit") -$sync["ISOArchitecture"].SelectedItem = (Get-WmiObject -Class Win32_OperatingSystem).OSArchitecture - if ($sync["ISOoption1"].IsChecked) { $sync["ISORelease"].Visibility = [System.Windows.Visibility]::Visible $sync["ISOLanguage"].Visibility = [System.Windows.Visibility]::Visible - $sync["ISOArchitecture"].Visibility = [System.Windows.Visibility]::Visible } else { $sync["ISORelease"].Visibility = [System.Windows.Visibility]::Collapsed $sync["ISOLanguage"].Visibility = [System.Windows.Visibility]::Collapsed - $sync["ISOArchitecture"].Visibility = [System.Windows.Visibility]::Collapsed } # Load Checkboxes and Labels outside of the Filter function only once on startup for performance reasons diff --git a/xaml/inputXML.xaml b/xaml/inputXML.xaml index 91394e56..cdbf4ccc 100644 --- a/xaml/inputXML.xaml +++ b/xaml/inputXML.xaml @@ -969,7 +969,6 @@ -