From d656ae3b06990a86a01d049abbf809fcefb027a3 Mon Sep 17 00:00:00 2001
From: ryanjon2040 <mindfreak2040@gmail.com>
Date: Tue, 20 Oct 2020 15:06:17 +0530
Subject: [PATCH] * Support 4.25 and above. * Seperate Commanline to a new
 private function.

---
 Unreal Binary Builder/MainWindow.xaml    | 100 ++++++-----
 Unreal Binary Builder/MainWindow.xaml.cs | 219 ++++++++++++++---------
 2 files changed, 193 insertions(+), 126 deletions(-)

diff --git a/Unreal Binary Builder/MainWindow.xaml b/Unreal Binary Builder/MainWindow.xaml
index 2d9f795..05c8e12 100755
--- a/Unreal Binary Builder/MainWindow.xaml	
+++ b/Unreal Binary Builder/MainWindow.xaml	
@@ -16,7 +16,7 @@
 		TextOptions.TextRenderingMode="Auto"
 		Icon="application.ico"
 		FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
-		Title="Unreal Engine Binary Builder" Height="800" Width="1200" WindowStartupLocation="CenterScreen" Closing="UnrealBinaryBuilderWindow_Closing">
+		Title="Unreal Engine Binary Builder" Height="800" Width="1111.5" WindowStartupLocation="CenterScreen" Closing="UnrealBinaryBuilderWindow_Closing">
 	<Window.Resources>
 		<Converters:NotConverter x:Key="NotConverter"/>
 		<converterNamespace:BooleanAndNotConverter x:Key="booleanAndNotConverter" />
@@ -33,6 +33,11 @@
 					<materialDesign:PackIcon Kind="CodeBraces" Padding="0"/>
 				</MenuItem.Icon>
 			</MenuItem>
+			<MenuItem x:Name="CopyCommandLine" Header="Copy Commandline" Click="CopyCommandLine_Click">
+				<MenuItem.Icon>
+					<materialDesign:PackIcon Kind="ContentCopy" Padding="0"/>
+				</MenuItem.Icon>
+			</MenuItem>
 		</Menu>
 		<Grid>
 			<TextBox x:Name="AutomationToolPath" Margin="9,47,0,0" materialDesign:HintAssist.Hint="Automation Tool Launcher Path" materialDesign:HintAssist.IsFloating="True" HorizontalAlignment="Left" VerticalAlignment="Top" Width="404" />
@@ -42,51 +47,54 @@
 			<Button x:Name="CustomBuildXMLBrowse" Content="{materialDesign:PackIcon OpenInBrowser}" ToolTip="(Optional) Browse and select InstalledEngineBuild.xml" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="365,94,0,0" Click="CustomBuildXMLBrowse_Click"/>
 			<Button x:Name="ResetDefaultBuildXML" Content="{materialDesign:PackIcon Xml}" ToolTip="Reset to default InstalledEngineBuild.xml" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="418,96,0,0" Click="ResetDefaultBuildXML_Click"/>
 
-			<GroupBox Header="Platforms" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,133,0,0" Width="456">
+			<GroupBox Header="Platforms" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,133,0,0" Width="456" Height="253">
 				<Grid>
 					<Label Content ="Host Only" Margin="0,11,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" ToolTip="A helper option to make an installed build for your host platform only, so that you don't have to disable each platform individually"/>
-					<ToggleButton x:Name="bHostPlatformOnly" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="105,11,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<ToggleButton x:Name="bHostPlatformOnly" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="78,12,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="Windows 64" Margin="0,41,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithWin64" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="105,41,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" IsChecked="True" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label Content ="Host Editor Only" Margin="160,12,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" ToolTip="Helper option to make an installed build with the host platform editor only"/>
+					<ToggleButton x:Name="bHostPlatformEditorOnly" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="280,12,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="Windows 32" Margin="0,73,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithWin32" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="105,72,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" IsChecked="True" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label Content ="Win 64" Margin="0,47,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithWin64" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="78,48,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" IsChecked="True" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="Mac" Margin="0,105,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithMac" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="105,103,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label Content ="Win 32" Margin="0,76,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithWin32" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="78,76,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" IsChecked="True" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="Linux" Margin="0,138,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithLinux" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="105,137,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label Content ="Mac" Margin="0,109,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithMac" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="78,108,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label x:Name="bWithLinuxAArch64Label" Content ="LinuxAArch64" Margin="280,137,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithLinuxAArch64" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="390,137,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label Content ="Linux" Margin="0,140,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithLinux" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="78,140,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="Android" Margin="154,12,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" />
-					<ToggleButton x:Name="bWithAndroid" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="231,11,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label x:Name="bWithLinuxAArch64Label" Content ="LinuxAArch64" Margin="286,172,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithLinuxAArch64" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="396,172,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="iOS" Margin="154,42,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithIOS" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="231,40,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label Content ="Android" Margin="160,48,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" />
+					<ToggleButton x:Name="bWithAndroid" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="237,47,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label x:Name="bWithHTML5Label" Content ="HTML5" Margin="154,73,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithHTML5" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="231,73,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label Content ="iOS" Margin="160,78,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithIOS" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="237,76,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="TvOS" Margin="154,105,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithTVOS" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="231,105,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label x:Name="bWithHTML5Label" Content ="HTML5" Margin="160,109,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithHTML5" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="237,109,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="Switch" Margin="154,137,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
-					<ToggleButton x:Name="bWithSwitch" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="231,137,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label Content ="TvOS" Margin="160,141,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithTVOS" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="237,141,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="PS4" Margin="280,12,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" />
-					<ToggleButton x:Name="bWithPS4" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="390,11,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label x:Name="bWithSwitchLabel" Content ="Switch" Margin="160,171,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0"/>
+					<ToggleButton x:Name="bWithSwitch" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="237,171,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="XBox One" Margin="280,41,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" />
-					<ToggleButton x:Name="bWithXboxOne" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="390,40,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label x:Name="bWithPS4Label" Content ="PS4" Margin="286,48,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" />
+					<ToggleButton x:Name="bWithPS4" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="396,47,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="Lumin" Margin="280,73,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" />
-					<ToggleButton x:Name="bWithLumin" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="390,72,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+					<Label x:Name="bWithXboxOneLabel" Content ="XBox One" Margin="286,77,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" />
+					<ToggleButton x:Name="bWithXboxOne" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="396,76,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-					<Label Content ="HoloLens" Margin="280,105,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0">
+					<Label Content ="Lumin" Margin="286,109,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" />
+					<ToggleButton x:Name="bWithLumin" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="396,108,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource NotConverter}, ElementName=bHostPlatformOnly}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+					<Label Content ="HoloLens" Margin="286,141,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0">
 						<Label.IsEnabled>
 							<MultiBinding Converter="{StaticResource booleanAndNotConverter}">
 								<Binding ElementName="bHostPlatformOnly" Path="IsChecked" Mode="OneWay" />
@@ -94,7 +102,7 @@
 							</MultiBinding>
 						</Label.IsEnabled>
 					</Label>
-					<ToggleButton x:Name="bWithHoloLens" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="390,104,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
+					<ToggleButton x:Name="bWithHoloLens" Style="{DynamicResource MaterialDesignSwitchToggleButton}" Margin="396,140,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
 						<ToggleButton.IsEnabled>
 							<MultiBinding Converter="{StaticResource booleanAndNotConverter}">
 								<Binding ElementName="bHostPlatformOnly" Path="IsChecked" Mode="OneWay" />
@@ -105,10 +113,10 @@
 				</Grid>
 			</GroupBox>
 
-			<GroupBox Header="Options" VerticalAlignment="Top" Margin="471,54,0,0" Height="287" Width="713" HorizontalAlignment="Left">
+			<GroupBox Header="Options" VerticalAlignment="Top" Margin="477,9,0,0" Height="377" Width="617" HorizontalAlignment="Left">
 				<Grid>
 					<ToggleButton x:Name="bWithDDC" Style="{DynamicResource MaterialDesignSwitchToggleButton}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,10,0,0" IsChecked="True"/>
-					<Label Content="Include Derived Data Cache (DDC)" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="45,5,0,0" ToolTip="Build a standalone derived-data cache for the engine content and templates.
+					<Label Content="Include DDC" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="45,5,0,0" ToolTip="Build a standalone derived-data cache for the engine content and templates.
 						   &#xA;Building a stand-alone Derived Data Cache (DDC) for the Engine and Template content can be one of the slowest aspects of the build.
 						   &#xA;If you don't need a stand-alone DDC, you can skip this step."/>
 
@@ -127,21 +135,28 @@
 					<ToggleButton x:Name="bCleanBuild" Style="{DynamicResource MaterialDesignSwitchToggleButton}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,170,0,0"/>
 					<Label Content="Remove Previous Build" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="45,165,0,0" ToolTip="Cleans any previous builds. Appends -Clean command line."/>
 
-					<ToggleButton x:Name="bWithServer" Style="{DynamicResource MaterialDesignSwitchToggleButton}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="285,11,0,0"/>
-					<Label x:Name="bWithServerLabel" Content="With Server" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="324,5,0,0" ToolTip="Create dedicated server target."/>
+					<ToggleButton x:Name="bWithServer" Style="{DynamicResource MaterialDesignSwitchToggleButton}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="231,10,0,0"/>
+					<Label x:Name="bWithServerLabel" Content="With Server" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="270,4,0,0" ToolTip="Create dedicated server target."/>
+
+					<ToggleButton x:Name="bWithClient" Style="{DynamicResource MaterialDesignSwitchToggleButton}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="231,42,0,0"/>
+					<Label x:Name="bWithClientLabel" Content="With Client" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="270,36,0,0" ToolTip="Create client target."/>
+
+					<ToggleButton x:Name="bCompileDatasmithPlugins" Style="{DynamicResource MaterialDesignSwitchToggleButton}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="231,73,0,0"/>
+					<Label x:Name="bCompileDatasmithPluginsLabel" Content="Compile Datasmith Plugins" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="270,67,0,0" ToolTip="If Datasmith plugins should be compiled."/>
 
-					<ToggleButton x:Name="bWithClient" Style="{DynamicResource MaterialDesignSwitchToggleButton}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="285,43,0,0"/>
-					<Label x:Name="bWithClientLabel" Content="With Client" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="324,37,0,0" ToolTip="Create client target."/>
+					<ToggleButton x:Name="bVS2019" Style="{DynamicResource MaterialDesignSwitchToggleButton}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="231,106,0,0"/>
+					<Label x:Name="bVS2019Label" Content="Use 2019 Compiler" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="270,101,0,0" ToolTip="Use Visual Studio 2019 to build Windows targets. By default, Visual Studio 2017 is used for maximum compatibility"/>
 
-					<GroupBox Header="Shutdown Settings"  HorizontalAlignment="Left" VerticalAlignment="Top" Margin="410,6,0,0" Height="178" Width="285">
+					<GroupBox Header="Shutdown Settings"  HorizontalAlignment="Left" VerticalAlignment="Top" Margin="231,161,0,0" Height="102" Width="358">
 						<Grid>
 							<CheckBox x:Name="bShutdownWindows" Content="Shutdown Computer after build" HorizontalAlignment="Left" VerticalAlignment="Top" ToolTip="Shuts down your computer after building."/>
 							<CheckBox x:Name="bShutdownIfSuccess" Content="Shutdown only if build is successful" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,24,0,0" IsEnabled="{Binding IsChecked, ElementName=bShutdownWindows}" ToolTip="Shuts down your computer after building only if the build is successful."/>
 						</Grid>
 					</GroupBox>
 
-					<TextBox x:Name="GameConfigurations" materialDesign:HintAssist.Hint="Game Configurations" materialDesign:HintAssist.IsFloating="True" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="265" ToolTip="Which game configurations to include for packaged applications. Defaults to Development;Shipping" />
-					<TextBox x:Name="CustomOptions" materialDesign:HintAssist.Hint="Custom Options (if any)" materialDesign:HintAssist.IsFloating="True" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="270,0,0,0" Width="258" ToolTip="Pass custom command line options if using Custom Installed Engine Build XML."/>
+					<TextBox x:Name="GameConfigurations" materialDesign:HintAssist.Hint="Game Configurations" materialDesign:HintAssist.IsFloating="True" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="200" ToolTip="Which game configurations to include for packaged applications. Defaults to Development;Shipping" />
+					<TextBox x:Name="CustomOptions" materialDesign:HintAssist.Hint="Custom Options (if any)" materialDesign:HintAssist.IsFloating="True" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="205,0,0,0" Width="200" ToolTip="Pass custom command line options if using Custom Installed Engine Build XML."/>
+					<TextBox x:Name="AnalyticsOverride" materialDesign:HintAssist.Hint="Analytics Type" materialDesign:HintAssist.IsFloating="True" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="410,0,0,0" Width="200" ToolTip="Identifier for analytic events to send."/>
 				</Grid>
 			</GroupBox>
 
@@ -151,9 +166,10 @@
 				<ComboBoxItem x:Name="comboBoxItem1" Content="4.22"/>
 				<ComboBoxItem x:Name="comboBoxItem2" Content="4.23"/>
 				<ComboBoxItem x:Name="comboBoxItem3" Content="4.24"/>
+				<ComboBoxItem x:Name="comboBoxItem4" Content="4.25 and above"/>
 			</ComboBox>
 
-			<local:LogViewer x:Name="LogControl" Margin="10,377,7.6,47.4" Height="Auto" Width="Auto"/>
+			<local:LogViewer x:Name="LogControl" Margin="10,391,8,47" Height="Auto" Width="Auto"/>
 
 			<Label x:Name="StepLabel" Content="Step: " VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="10,0,0,17" Padding="0"/>
 			<Label x:Name="StatusLabel" Content="Status: " VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="80,0,0,17" Padding="0"/>
@@ -164,7 +180,7 @@
 				<materialDesign:DialogHost.DialogContent>
 					<Grid>
 						<Label x:Name="AboutMessageLabel" Content="A helper application designed to create binary version of Unreal Engine 4 from source.&#xA;&#xA;Created by Satheesh (ryanjon2040)&#xA;&#xA;Updated for 4.18 and PS4/Xbox Support by James Baxter (TheJamsh)&#xA;Updated for 4.21 and Lumin support by KarstenMaxim (AlphaSoftLLC)&#xA;Step counter added by Ben Vaccaro (freaksed)&#xA;Some small updates for 4.24 by Christian Walde (wchristian)" />
-						<Button x:Name="AboutBtn_Ok" VerticalAlignment="Bottom" Margin="10,110,10,10" Content="Ok" Click="AboutBtn_Ok_Click"/>
+						<Button x:Name="AboutBtn_Ok" VerticalAlignment="Bottom" Margin="10,150,10,10" Content="Ok" Click="AboutBtn_Ok_Click"/>
 					</Grid>
 				</materialDesign:DialogHost.DialogContent>
 			</materialDesign:DialogHost>
diff --git a/Unreal Binary Builder/MainWindow.xaml.cs b/Unreal Binary Builder/MainWindow.xaml.cs
index 83ff2b4..b646f22 100755
--- a/Unreal Binary Builder/MainWindow.xaml.cs	
+++ b/Unreal Binary Builder/MainWindow.xaml.cs	
@@ -153,7 +153,7 @@ private void ChangeStatusLabel(string InStatus)
 
         private void ChangeStepLabel(string current, string total)
         {
-            Dispatcher.Invoke(() => { StepLabel.Content = $"Step: [{current}/{total}]"; });
+            Dispatcher.Invoke(() => { StepLabel.Content = $"Step: [{current}/{total}] "; });
         }
 
         private string GetConditionalString(bool? bCondition)
@@ -361,6 +361,114 @@ private void ResetDefaultBuildXML_Click(object sender, RoutedEventArgs e)
             CustomOptions.IsEnabled = false;
         }
 
+        private string PrepareCommandline()
+        {
+            string BuildXMLFile = CustomBuildXMLFile.Text;
+            if (BuildXMLFile != DEFAULT_BUILD_XML_FILE)
+            {
+                BuildXMLFile = string.Format("\"{0}\"", CustomBuildXMLFile.Text);
+            }
+
+            string CommandLineArgs = string.Format("BuildGraph -target=\"Make Installed Build Win64\" -script={0} -set:WithDDC={1} -set:SignExecutables={2} -set:EmbedSrcSrvInfo={3} -set:GameConfigurations={4} -set:WithFullDebugInfo={5} -set:HostPlatformEditorOnly={6} -set:AnalyticsTypeOverride={7}",
+                    BuildXMLFile,
+                    GetConditionalString(bWithDDC.IsChecked),
+                    GetConditionalString(bSignExecutables.IsChecked),
+                    GetConditionalString(bEnableSymStore.IsChecked),
+                    GameConfigurations.Text,
+                    GetConditionalString(bWithFullDebugInfo.IsChecked),
+                    GetConditionalString(bHostPlatformEditorOnly.IsChecked),
+                    AnalyticsOverride.Text);
+
+            if (bWithDDC.IsChecked == true && bHostPlatformDDCOnly.IsChecked == true)
+            {
+                CommandLineArgs += " -set:HostPlatformDDCOnly=true";
+            }
+
+            if (bHostPlatformOnly.IsChecked == true)
+            {
+                CommandLineArgs += " -set:HostPlatformOnly=true";
+            }
+            else
+            {
+                if (SupportHTML5())
+                {
+                    CommandLineArgs += string.Format(" -set:WithWin64={0} -set:WithWin32={1} -set:WithMac={2} -set:WithAndroid={3} -set:WithIOS={4} -set:WithTVOS={5} -set:WithLinux={6} -set:WithHTML5={7} -set:WithSwitch={8} -set:WithPS4={9} -set:WithXboxOne={10} -set:WithLumin={11}",
+                    GetConditionalString(bWithWin64.IsChecked),
+                    GetConditionalString(bWithWin32.IsChecked),
+                    GetConditionalString(bWithMac.IsChecked),
+                    GetConditionalString(bWithAndroid.IsChecked),
+                    GetConditionalString(bWithIOS.IsChecked),
+                    GetConditionalString(bWithTVOS.IsChecked),
+                    GetConditionalString(bWithLinux.IsChecked),
+                    GetConditionalString(bWithHTML5.IsChecked),
+                    GetConditionalString(bWithSwitch.IsChecked),
+                    GetConditionalString(bWithPS4.IsChecked),
+                    GetConditionalString(bWithXboxOne.IsChecked),
+                    GetConditionalString(bWithLumin.IsChecked));
+                }
+                else if (SupportConsoles())
+                {
+                    CommandLineArgs += string.Format(" -set:WithWin64={0} -set:WithWin32={1} -set:WithMac={2} -set:WithAndroid={3} -set:WithIOS={4} -set:WithTVOS={5} -set:WithLinux={6} -set:WithSwitch={7} -set:WithPS4={8} -set:WithXboxOne={9} -set:WithLumin={10}",
+                    GetConditionalString(bWithWin64.IsChecked),
+                    GetConditionalString(bWithWin32.IsChecked),
+                    GetConditionalString(bWithMac.IsChecked),
+                    GetConditionalString(bWithAndroid.IsChecked),
+                    GetConditionalString(bWithIOS.IsChecked),
+                    GetConditionalString(bWithTVOS.IsChecked),
+                    GetConditionalString(bWithLinux.IsChecked),
+                    GetConditionalString(bWithSwitch.IsChecked),
+                    GetConditionalString(bWithPS4.IsChecked),
+                    GetConditionalString(bWithXboxOne.IsChecked),
+                    GetConditionalString(bWithLumin.IsChecked));
+                }
+                else
+                {
+                    CommandLineArgs += string.Format(" -set:WithWin64={0} -set:WithWin32={1} -set:WithMac={2} -set:WithAndroid={3} -set:WithIOS={4} -set:WithTVOS={5} -set:WithLinux={6} -set:WithLumin={7}",
+                    GetConditionalString(bWithWin64.IsChecked),
+                    GetConditionalString(bWithWin32.IsChecked),
+                    GetConditionalString(bWithMac.IsChecked),
+                    GetConditionalString(bWithAndroid.IsChecked),
+                    GetConditionalString(bWithIOS.IsChecked),
+                    GetConditionalString(bWithTVOS.IsChecked),
+                    GetConditionalString(bWithLinux.IsChecked),
+                    GetConditionalString(bWithLumin.IsChecked));
+                }
+
+                if (SupportLinuxAArch64())
+                {
+                    CommandLineArgs += string.Format(" -set:WithLinuxAArch64={0}", GetConditionalString(bWithLinuxAArch64.IsChecked));
+                }
+            }
+
+            if (IsEngineSelection425OrAbove())
+            {
+                CommandLineArgs += string.Format(" -set:CompileDatasmithPlugins={0} -set:VS2019={1}",
+                    GetConditionalString(bCompileDatasmithPlugins.IsChecked),
+                    GetConditionalString(bVS2019.IsChecked));
+            }
+
+            if (EngineVersionSelection.SelectedIndex > 1)
+            {
+                CommandLineArgs += string.Format(" -set:WithServer={0} -set:WithClient={1} -set:WithHoloLens={2}",
+                    GetConditionalString(bWithServer.IsChecked),
+                    GetConditionalString(bWithClient.IsChecked),
+                    GetConditionalString(bWithHoloLens.IsChecked));
+            }
+
+            if (BuildXMLFile != DEFAULT_BUILD_XML_FILE && CustomOptions.Text != string.Empty)
+            {
+                CommandLineArgs += string.Format(" {0}", CustomOptions.Text);
+                AddLogEntry("Using custom options...");
+            }
+
+            if (bCleanBuild.IsChecked == true)
+            {
+                CommandLineArgs += " -Clean";
+            }
+
+            return CommandLineArgs;
+        }
+
         private void BuildRocketUE_Click(object sender, RoutedEventArgs e)
         {
             bLastBuildSuccess = false;
@@ -408,6 +516,12 @@ private void BuildRocketUE_Click(object sender, RoutedEventArgs e)
 				MessageBox.Show("HTML5 support was removed from Unreal Engine 4.24 and higher. You had it enabled but since it is of no use, I disabled it.");
 			}
 
+            if (SupportConsoles() == false && (bWithSwitch.IsChecked == true || bWithPS4.IsChecked == true || bWithXboxOne.IsChecked == true))
+            {
+                bWithSwitch.IsChecked = bWithPS4.IsChecked = bWithXboxOne.IsChecked = false;
+                MessageBox.Show("Console support was removed from Unreal Engine 4.25 and higher. You had it enabled but since it is of no use, I disabled it.");
+            }
+
             if (MessageBox.Show("You are going to build a binary version of Unreal Engine 4. This is a long process and might take time to finish. Are you sure you want to continue? ", "Build Binary Version", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
             {
                 if (bWithDDC.IsChecked == true)
@@ -426,7 +540,7 @@ private void BuildRocketUE_Click(object sender, RoutedEventArgs e)
                     }
                 }
 
-                LogControl.ClearAllLogs();                
+                LogControl.ClearAllLogs();
                 AddLogEntry(string.Format("Welcome to UE4 Binary Builder v{0}", PRODUCT_VERSION));
                 BuildRocketUE.Content = "Stop Build";
 
@@ -435,89 +549,8 @@ private void BuildRocketUE_Click(object sender, RoutedEventArgs e)
                     GameConfigurations.Text = "Development;Shipping";
                 }
 
-                string BuildXMLFile = CustomBuildXMLFile.Text;
-                if (BuildXMLFile != DEFAULT_BUILD_XML_FILE)
-                {
-                    BuildXMLFile = string.Format("\"{0}\"", CustomBuildXMLFile.Text);
-                }
-
-                string CommandLineArgs = string.Format("BuildGraph -target=\"Make Installed Build Win64\" -script={0} -set:WithDDC={1} -set:SignExecutables={2} -set:EmbedSrcSrvInfo={3} -set:GameConfigurations={4} -set:WithFullDebugInfo={5}",
-                    BuildXMLFile,
-                    GetConditionalString(bWithDDC.IsChecked),
-                    GetConditionalString(bSignExecutables.IsChecked),
-                    GetConditionalString(bEnableSymStore.IsChecked),
-                    GameConfigurations.Text,
-                    GetConditionalString(bWithFullDebugInfo.IsChecked));
-
-                if (bWithDDC.IsChecked == true && bHostPlatformDDCOnly.IsChecked == true)
-                {
-                    CommandLineArgs += " -set:HostPlatformDDCOnly=true";
-                }
-
-                if (bHostPlatformOnly.IsChecked == true)
-                {
-                    CommandLineArgs += " -set:HostPlatformOnly=true";
-                }
-                else
-                {
-                    if (SupportHTML5())
-					{
-						CommandLineArgs += string.Format(" -set:WithWin64={0} -set:WithWin32={1} -set:WithMac={2} -set:WithAndroid={3} -set:WithIOS={4} -set:WithTVOS={5} -set:WithLinux={6} -set:WithHTML5={7} -set:WithSwitch={8} -set:WithPS4={9} -set:WithXboxOne={10} -set:WithLumin={11}",
-						GetConditionalString(bWithWin64.IsChecked),
-						GetConditionalString(bWithWin32.IsChecked),
-						GetConditionalString(bWithMac.IsChecked),
-						GetConditionalString(bWithAndroid.IsChecked),
-						GetConditionalString(bWithIOS.IsChecked),
-						GetConditionalString(bWithTVOS.IsChecked),
-						GetConditionalString(bWithLinux.IsChecked),
-						GetConditionalString(bWithHTML5.IsChecked),
-						GetConditionalString(bWithSwitch.IsChecked),
-						GetConditionalString(bWithPS4.IsChecked),
-						GetConditionalString(bWithXboxOne.IsChecked),
-						GetConditionalString(bWithLumin.IsChecked));
-					}
-					else
-					{
-						CommandLineArgs += string.Format(" -set:WithWin64={0} -set:WithWin32={1} -set:WithMac={2} -set:WithAndroid={3} -set:WithIOS={4} -set:WithTVOS={5} -set:WithLinux={6} -set:WithSwitch={7} -set:WithPS4={8} -set:WithXboxOne={9} -set:WithLumin={10}",
-						GetConditionalString(bWithWin64.IsChecked),
-						GetConditionalString(bWithWin32.IsChecked),
-						GetConditionalString(bWithMac.IsChecked),
-						GetConditionalString(bWithAndroid.IsChecked),
-						GetConditionalString(bWithIOS.IsChecked),
-						GetConditionalString(bWithTVOS.IsChecked),
-						GetConditionalString(bWithLinux.IsChecked),
-						GetConditionalString(bWithSwitch.IsChecked),
-						GetConditionalString(bWithPS4.IsChecked),
-						GetConditionalString(bWithXboxOne.IsChecked),
-						GetConditionalString(bWithLumin.IsChecked));
-					}
-
-					if (SupportLinuxAArch64()) 
-                    {
-						CommandLineArgs += string.Format(" -set:WithLinuxAArch64={0}", GetConditionalString(bWithLinuxAArch64.IsChecked));
-					}
-                }
-
-				if (EngineVersionSelection.SelectedIndex > 1)
-				{
-					CommandLineArgs += string.Format(" -set:WithServer={0} -set:WithClient={1} -set:WithHoloLens={2}", 
-						GetConditionalString(bWithServer.IsChecked), 
-						GetConditionalString(bWithClient.IsChecked),
-						GetConditionalString(bWithHoloLens.IsChecked));
-				}
-
-                if (BuildXMLFile != DEFAULT_BUILD_XML_FILE && CustomOptions.Text != string.Empty)
-                {
-                    CommandLineArgs += string.Format(" {0}", CustomOptions.Text);
-                    AddLogEntry("Using custom options...");
-                }
-
-                if (bCleanBuild.IsChecked == true)
-                {
-                    CommandLineArgs += " -Clean";
-                }
+                string CommandLineArgs = PrepareCommandline();
 
-                AddLogEntry(string.Format("Commandline: {0}\n", CommandLineArgs));
                 ProcessStartInfo AutomationStartInfo = new ProcessStartInfo
                 {
                     FileName = AutomationExePath,
@@ -582,6 +615,8 @@ private void EngineVersionSelection_SelectionChanged(object sender, System.Windo
 			bWithServer.IsEnabled = bWithClient.IsEnabled = bWithServerLabel.IsEnabled = bWithClientLabel.IsEnabled = EngineVersionSelection.SelectedIndex > 1;
 			bWithHTML5.IsEnabled = bWithHTML5Label.IsEnabled = SupportHTML5();
             bWithLinuxAArch64.IsEnabled = bWithLinuxAArch64Label.IsEnabled = SupportLinuxAArch64();
+            bWithSwitch.IsEnabled = bWithSwitchLabel.IsEnabled = bWithPS4.IsEnabled = bWithPS4Label.IsEnabled = bWithXboxOne.IsEnabled = bWithXboxOneLabel.IsEnabled = SupportConsoles();
+            bCompileDatasmithPlugins.IsEnabled = bCompileDatasmithPluginsLabel.IsEnabled = bVS2019.IsEnabled = bVS2019Label.IsEnabled = IsEngineSelection425OrAbove();
 		}
 
 		private bool SupportHTML5()
@@ -593,5 +628,21 @@ private bool SupportLinuxAArch64()
         {
 			return EngineVersionSelection.SelectedIndex >= 3;
 		}
+
+        private bool SupportConsoles()
+        {
+            return EngineVersionSelection.SelectedIndex <= 3;
+		}
+
+        private bool IsEngineSelection425OrAbove()
+        {
+            return EngineVersionSelection.SelectedIndex >= 4;
+		}
+
+		private void CopyCommandLine_Click(object sender, RoutedEventArgs e)
+		{
+            Clipboard.SetText(PrepareCommandline());
+            MessageBox.Show("Commandline copied to clipboard!");
+		}
 	}
 }