From 7f313f30c7b343f9caac42b8e04d88d2f01ff585 Mon Sep 17 00:00:00 2001
From: yt3trees <y.atforest@gmail.com>
Date: Sun, 12 Nov 2023 22:48:07 +0900
Subject: [PATCH] Improved functionality of the execution result display window
 & xaml format

---
 msbuild-gui/Console.xaml            | 119 +++++---
 msbuild-gui/Console.xaml.cs         |  59 +++-
 msbuild-gui/MainWindow.xaml         | 413 ++++++++++++++--------------
 msbuild-gui/MainWindow.xaml.cs      |  16 +-
 msbuild-gui/Messagebox.xaml         |  47 ++++
 msbuild-gui/Messagebox.xaml.cs      |  62 +++++
 msbuild-gui/msbuild-gui.csproj.user |   6 +
 7 files changed, 475 insertions(+), 247 deletions(-)
 create mode 100644 msbuild-gui/Messagebox.xaml
 create mode 100644 msbuild-gui/Messagebox.xaml.cs

diff --git a/msbuild-gui/Console.xaml b/msbuild-gui/Console.xaml
index e94ae8d..7343201 100644
--- a/msbuild-gui/Console.xaml
+++ b/msbuild-gui/Console.xaml
@@ -1,22 +1,23 @@
-<Window x:Class="msbuild_gui.Console"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:msbuild_gui"
-        xmlns:ui="http://schemas.modernwpf.com/2019"
-        ui:WindowHelper.UseModernWindowStyle="True"
-        FocusManager.FocusedElement="{Binding ElementName=CmdResult}"
-        mc:Ignorable="d"
-        xmlns:app="clr-namespace:msbuild_gui"
-        xmlns:properties="clr-namespace:msbuild_gui.Properties"
-        Title="{Binding Resources.ExecutionResult, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-        Height="650"
-        Width="1000"
-        WindowStartupLocation="Manual"
-        KeyDown="Window_KeyDown"
-        ShowInTaskbar="False">
-   <!-- <Window.Resources>
+<Window
+    x:Class="msbuild_gui.Console"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:app="clr-namespace:msbuild_gui"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:msbuild_gui"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:properties="clr-namespace:msbuild_gui.Properties"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    Title="{Binding Resources.ExecutionResult, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+    Width="1000"
+    Height="650"
+    ui:WindowHelper.UseModernWindowStyle="True"
+    FocusManager.FocusedElement="{Binding ElementName=CmdResult}"
+    KeyDown="Window_KeyDown"
+    ShowInTaskbar="False"
+    WindowStartupLocation="Manual"
+    mc:Ignorable="d">
+    <!-- <Window.Resources>
         <Style x:Key="DefaultTextbox"
                TargetType="{x:Type TextBox}">
             <Setter Property="BorderThickness"
@@ -36,9 +37,10 @@
         <Grid.RowDefinitions>
             <RowDefinition />
         </Grid.RowDefinitions>
-        <TabControl x:Name="ResultTabControl"
-                    Margin="1,1,1,5"
-                    Style="{StaticResource TabControlPivotStyle}">
+        <TabControl
+            x:Name="ResultTabControl"
+            Margin="1,1,1,5"
+            Style="{StaticResource TabControlPivotStyle}">
             <!--<TabControl.Template>
                 <ControlTemplate TargetType="TabControl">
                     <Grid>
@@ -64,22 +66,65 @@
                     </Grid>
                 </ControlTemplate>
             </TabControl.Template>-->
-            <TabItem x:Name="ErrorTab"
-                     Header="{Binding Resources.ErrorLog, Source={x:Static app:ResourceService.Current}, Mode=OneWay}">
-                <TextBox x:Name="ErrorResult"
-                         TextWrapping="Wrap"
-                         Text="TextBox"
-                         IsReadOnly="True"
-                         VerticalScrollBarVisibility="Auto"
-                         Padding="5,5,15,5"
-                         FontFamily="BIZ UDGothic"
-                         FontSize="14"
-                         FontWeight="Normal"
-                         KeyDown="ErrorResult_KeyDown"
-                         BorderBrush="#99000000"
-                         BorderThickness="1,1,1,1"
-                         Margin="0,0,0,5" />
+            <TabItem x:Name="ErrorTab" Header="{Binding Resources.ErrorLog, Source={x:Static app:ResourceService.Current}, Mode=OneWay}">
+                <TextBox
+                    x:Name="ErrorResult"
+                    Margin="0,0,0,5"
+                    Padding="5,5,15,5"
+                    BorderBrush="#99000000"
+                    BorderThickness="1,1,1,1"
+                    FontFamily="BIZ UDGothic"
+                    FontSize="14"
+                    FontWeight="Normal"
+                    IsReadOnly="True"
+                    KeyDown="ErrorResult_KeyDown"
+                    Text="TextBox"
+                    TextWrapping="Wrap"
+                    VerticalScrollBarVisibility="Auto" />
             </TabItem>
         </TabControl>
+        <Border
+            x:Name="ButtonBorder"
+            Width="83"
+            Height="35"
+            Margin="0,7,25,0"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            BorderThickness="0"
+            CornerRadius="5">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Button
+                    Grid.Column="0"
+                    Width="45"
+                    Height="30"
+                    Margin="0,0,0,0"
+                    Padding="2,5,5,5"
+                    Background="Transparent"
+                    Click="ShowTabList">
+                    <ui:SymbolIcon Symbol="List" />
+                </Button>
+                <Button
+                    x:Name="CommandButton"
+                    Grid.Column="1"
+                    Width="45"
+                    Height="30"
+                    Margin="0,0,0,0"
+                    Padding="5,4,5,5"
+                    HorizontalAlignment="Right"
+                    Background="Transparent"
+                    Click="CommandButton_Click"
+                    Content="CMD">
+                    <!--<ui:SymbolIcon Symbol="AlignLeft" />-->
+                </Button>
+            </Grid>
+        </Border>
+        <ListBox
+            x:Name="TabList"
+            SelectionChanged="TabList_SelectionChanged"
+            Visibility="Collapsed" />
     </Grid>
 </Window>
diff --git a/msbuild-gui/Console.xaml.cs b/msbuild-gui/Console.xaml.cs
index 713ab04..65682db 100644
--- a/msbuild-gui/Console.xaml.cs
+++ b/msbuild-gui/Console.xaml.cs
@@ -1,6 +1,7 @@
 using ModernWpf;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
@@ -17,7 +18,8 @@ public partial class Console : Window
     {
         private int searchIndex { get; set; }
         private int searchIndexMAX { get; set; }
-        public Console(string result , int maxCount, string[,] list, string errorLog)
+        private string command;
+        public Console(string result, int maxCount, string[,] list, string errorLog)
         {
             InitializeComponent();
             this.WindowStartupLocation = WindowStartupLocation.CenterOwner;
@@ -34,12 +36,25 @@ public Console(string result , int maxCount, string[,] list, string errorLog)
             {
                 ResultTabControl.Items.Remove(ErrorTab);
             }
-            
+
             Brush black = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF111111"));
             Brush gray = new SolidColorBrush((Color)ColorConverter.ConvertFromString("LightGray"));
             Brush white = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FFFFFF"));
+            Brush black80 = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#CC111111"));
+            Brush white80 = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#CCFFFFFF"));
             ErrorResult.Text = errorLog;
 
+            if (ThemeManager.Current.ApplicationTheme == ApplicationTheme.Dark
+            || ThemeManager.Current.ActualApplicationTheme == ApplicationTheme.Dark)
+            {
+                ButtonBorder.Background = black80;
+            }
+            else if (ThemeManager.Current.ApplicationTheme == ApplicationTheme.Light
+                || ThemeManager.Current.ActualApplicationTheme == ApplicationTheme.Light)
+            {
+                ButtonBorder.Background = white80;
+            }
+
             for (int count = 0; count < searchIndexMAX; count++)
             {
                 TabItem item = new TabItem();
@@ -80,9 +95,10 @@ public Console(string result , int maxCount, string[,] list, string errorLog)
 
                 item.Content = text;
                 ResultTabControl.Items.Add(item);
+                command += list[count, 2].ToString() + "\r\n\r\n";
             }
 
-            if (ThemeManager.Current.ApplicationTheme == ApplicationTheme.Dark 
+            if (ThemeManager.Current.ApplicationTheme == ApplicationTheme.Dark
                 || ThemeManager.Current.ActualApplicationTheme == ApplicationTheme.Dark)
             {
                 ErrorResult.Background = black;
@@ -155,5 +171,42 @@ private void ErrorResult_KeyDown(object sender, KeyEventArgs e)
                 }
             }
         }
+        private void CommandButton_Click(object sender, RoutedEventArgs e)
+        {
+            var window = new Messagebox("Execution command", command);
+            window.Owner = this;
+            window.ShowDialog();
+        }
+        private void ShowTabList(object sender, RoutedEventArgs e)
+        {
+            TabList.Items.Clear();
+            foreach (TabItem tabItem in ResultTabControl.Items)
+            {
+                if (tabItem.Header is TextBlock textBlock)
+                {
+                    string text = textBlock.Text;
+                    TreeViewItem item = new TreeViewItem();
+                    item.Header = text;
+                    TabList.Items.Add(item);
+                }
+                else
+                {
+                    string text = tabItem.Header.ToString();
+                    TreeViewItem item = new TreeViewItem();
+                    item.Header = text;
+                    TabList.Items.Add(item);
+                }
+            }
+            TabList.Visibility = Visibility.Visible;
+        }
+        private void TabList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            int selectedIndex = TabList.SelectedIndex;
+            if (selectedIndex != -1)
+            {
+                ResultTabControl.SelectedIndex = selectedIndex;
+                TabList.Visibility = Visibility.Collapsed;
+            }
+        }
     }
 }
diff --git a/msbuild-gui/MainWindow.xaml b/msbuild-gui/MainWindow.xaml
index b6d822c..e6845fd 100644
--- a/msbuild-gui/MainWindow.xaml
+++ b/msbuild-gui/MainWindow.xaml
@@ -1,23 +1,24 @@
-<Window x:Class="msbuild_gui.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:msbuild_gui"
-        xmlns:ui="http://schemas.modernwpf.com/2019"
-        ui:WindowHelper.UseModernWindowStyle="True"
-        mc:Ignorable="d"
-        Title="MsBuild-Gui"
-        ResizeMode="CanResize"
-        Height="600"
-        Width="800"
-        SourceInitialized="Window_SourceInitialized"
-        WindowStartupLocation="CenterScreen"
-        xmlns:properties="clr-namespace:msbuild_gui.Properties"
-        xmlns:app="clr-namespace:msbuild_gui"
-        Closing="Window_Closing"
-        KeyDown="Window_KeyDown"
-        Icon="/msbuild-gui;component/Resources/MsBuild-Gui.ico">
+<Window
+    x:Class="msbuild_gui.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:app="clr-namespace:msbuild_gui"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:msbuild_gui"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:properties="clr-namespace:msbuild_gui.Properties"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    Title="MsBuild-Gui"
+    Width="800"
+    Height="600"
+    ui:WindowHelper.UseModernWindowStyle="True"
+    Closing="Window_Closing"
+    Icon="/msbuild-gui;component/Resources/MsBuild-Gui.ico"
+    KeyDown="Window_KeyDown"
+    ResizeMode="CanResize"
+    SourceInitialized="Window_SourceInitialized"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
@@ -30,101 +31,107 @@
             <ColumnDefinition Width="4*" />
             <ColumnDefinition Width="15*" />
         </Grid.ColumnDefinitions>
-        <ProgressBar x:Name="ProgressBar"
-                     Grid.Row="3"
-                     MinHeight="5"
-                     MinWidth="800"
-                     Background="#33000000"
-                     Orientation="Horizontal"
-                     Grid.ColumnSpan="3"
-                     VerticalAlignment="Bottom"
-                     Opacity="0.9" />
-        <StackPanel Margin="0,2,0,0"
-                    Grid.Row="1">
-            <Label Content="{Binding Resources.Project, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                   HorizontalContentAlignment="Center"
-                   Height="30"
-                   VerticalContentAlignment="Center"
-                   FontSize="14" />
-            <ComboBox x:Name="ProjCombo"
-                      Width="180"
-                      HorizontalAlignment="Center"
-                      SelectionChanged="ProjCombo_SelectionChanged"
-                      VerticalAlignment="Center"
-                      TabIndex="4" />
-            <Button x:Name="SettingButton"
-                    Content="{Binding Resources.ProjectSettings, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                    Margin="30,10,30,10"
-                    FontSize="14"
-                    HorizontalAlignment="Center"
-                    Click="SettingButton_Click"
-                    TabIndex="5" />
-        </StackPanel>
-        <Button x:Name="AddButton"
-                Content="{Binding Resources.Add, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                HorizontalAlignment="Center"
-                FontFamily="Yu Gothic UI"
+        <ProgressBar
+            x:Name="ProgressBar"
+            Grid.Row="3"
+            Grid.ColumnSpan="3"
+            MinWidth="800"
+            MinHeight="5"
+            VerticalAlignment="Bottom"
+            Background="#33000000"
+            Opacity="0.9"
+            Orientation="Horizontal" />
+        <StackPanel Grid.Row="1" Margin="0,2,0,0">
+            <Label
                 Height="30"
-                Grid.Column="1"
-                Grid.Row="2"
-                Padding="5,0,5,0"
-                Width="90"
-                Margin="0,-50,0,0"
-                Click="AddButton_Click"
-                TabIndex="8"
-                ToolTip="{Binding Resources.Tt_AddTargetList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"/>
-        <Button x:Name="RemoveButton"
-                Content="{Binding Resources.Remove, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Content="{Binding Resources.Project, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+                FontSize="14" />
+            <ComboBox
+                x:Name="ProjCombo"
+                Width="180"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontFamily="Yu Gothic UI"
-                Height="30"
-                Grid.Column="1"
-                Margin="0,50,0,0"
-                Grid.Row="2"
-                Padding="5,0,5,0"
-                Width="90"
-                Click="RemoveButton_Click"
-                TabIndex="9"
-                ToolTip="{Binding Resources.Tt_RemoveTargetList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"/>
-        <ListBox x:Name="SourceList"
-                 d:ItemsSource="{d:SampleData ItemCount=5}"
-                 Margin="10,40,10,0"
-                 FontFamily="Consolas"
-                 Grid.Row="2"
-                 FontSize="12"
-                 MouseDoubleClick="SourceList_MouseDoubleClick"
-                 KeyDown="SourceList_KeyDown"
-                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                 TabIndex="7"
-                 SelectionMode="Extended" />
-        <ListBox x:Name="TargetList"
-                 d:ItemsSource="{d:SampleData ItemCount=5}"
-                 Margin="10,40,10,0"
-                 FontFamily="Consolas"
-                 Grid.Column="2"
-                 Grid.Row="2"
-                 FontSize="12"
-                 MouseDoubleClick="TargetList_MouseDoubleClick"
-                 KeyDown="TargetList_KeyDown"
-                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                 TabIndex="10"
-                 SelectionMode="Extended" />
-        <Grid Grid.Column="2"
-              Grid.Row="3">
+                SelectionChanged="ProjCombo_SelectionChanged"
+                TabIndex="4" />
+            <Button
+                x:Name="SettingButton"
+                Margin="30,10,30,10"
+                HorizontalAlignment="Center"
+                Click="SettingButton_Click"
+                Content="{Binding Resources.ProjectSettings, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+                FontSize="14"
+                TabIndex="5" />
+        </StackPanel>
+        <Button
+            x:Name="AddButton"
+            Grid.Row="2"
+            Grid.Column="1"
+            Width="90"
+            Height="30"
+            Margin="0,-50,0,0"
+            Padding="5,0,5,0"
+            HorizontalAlignment="Center"
+            Click="AddButton_Click"
+            Content="{Binding Resources.Add, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+            FontFamily="Yu Gothic UI"
+            TabIndex="8"
+            ToolTip="{Binding Resources.Tt_AddTargetList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
+        <Button
+            x:Name="RemoveButton"
+            Grid.Row="2"
+            Grid.Column="1"
+            Width="90"
+            Height="30"
+            Margin="0,50,0,0"
+            Padding="5,0,5,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Click="RemoveButton_Click"
+            Content="{Binding Resources.Remove, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+            FontFamily="Yu Gothic UI"
+            TabIndex="9"
+            ToolTip="{Binding Resources.Tt_RemoveTargetList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
+        <ListBox
+            x:Name="SourceList"
+            Grid.Row="2"
+            Margin="10,40,10,0"
+            d:ItemsSource="{d:SampleData ItemCount=5}"
+            FontFamily="Consolas"
+            FontSize="12"
+            KeyDown="SourceList_KeyDown"
+            MouseDoubleClick="SourceList_MouseDoubleClick"
+            ScrollViewer.HorizontalScrollBarVisibility="Auto"
+            SelectionMode="Extended"
+            TabIndex="7" />
+        <ListBox
+            x:Name="TargetList"
+            Grid.Row="2"
+            Grid.Column="2"
+            Margin="10,40,10,0"
+            d:ItemsSource="{d:SampleData ItemCount=5}"
+            FontFamily="Consolas"
+            FontSize="12"
+            KeyDown="TargetList_KeyDown"
+            MouseDoubleClick="TargetList_MouseDoubleClick"
+            ScrollViewer.HorizontalScrollBarVisibility="Auto"
+            SelectionMode="Extended"
+            TabIndex="10" />
+        <Grid Grid.Row="3" Grid.Column="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Grid HorizontalAlignment="Center"
-                  Width="260">
-                <ui:ProgressRing x:Name="ProgressRing"
-                                 IsActive="False"
-                                 Height="30"
-                                 Width="30"
-                                 HorizontalAlignment="Left"
-                                 Margin="-40,0,0,0"
-                                 Opacity="0.9" />
-                <!--"{Binding IsOn, ElementName=ProgressToggle}"-->
+            <Grid Width="260" HorizontalAlignment="Center">
+                <ui:ProgressRing
+                    x:Name="ProgressRing"
+                    Width="30"
+                    Height="30"
+                    Margin="-40,0,0,0"
+                    HorizontalAlignment="Left"
+                    IsActive="False"
+                    Opacity="0.9" />
+                <!--  "{Binding IsOn, ElementName=ProgressToggle}"  -->
                 <!--<ui:ToggleSwitch x:Name="ProgressToggle"
                                  Header="Toggle work"
                                  OffContent="Do work"
@@ -132,15 +139,16 @@
                                  IsOn="False"
                                  Margin="-314,-6,0,0"
                                  VerticalAlignment="Top" />-->
-                <Button x:Name="BuildButton"
-                        Content="{Binding Resources.Build, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                        Height="30"
-                        FontSize="14"
-                        Padding="0,1,0,1"
-                        Width="120"
-                        Style="{StaticResource AccentButtonStyle}"
-                        TabIndex="13"
-                        Click="BuildButton_Click">
+                <Button
+                    x:Name="BuildButton"
+                    Width="120"
+                    Height="30"
+                    Padding="0,1,0,1"
+                    Click="BuildButton_Click"
+                    Content="{Binding Resources.Build, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+                    FontSize="14"
+                    Style="{StaticResource AccentButtonStyle}"
+                    TabIndex="13">
                     <!--<ui:FlyoutService.Flyout>
                         <ui:Flyout x:Name="Flyout1">
                             <StackPanel x:Name="StackPanelFlyout">
@@ -151,34 +159,37 @@
                         </ui:Flyout>
                     </ui:FlyoutService.Flyout>-->
                 </Button>
-                <CheckBox x:Name="ShowLogCheck"
-                          Content="{Binding Resources.ShowBuildLog, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                          Click="ShowLogCheck_Click"
-                          HorizontalAlignment="Right"
-                          TabIndex="14"
-                          MinHeight="32"
-                          Width="130" />
+                <CheckBox
+                    x:Name="ShowLogCheck"
+                    Width="130"
+                    MinHeight="32"
+                    HorizontalAlignment="Right"
+                    Click="ShowLogCheck_Click"
+                    Content="{Binding Resources.ShowBuildLog, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+                    TabIndex="14" />
             </Grid>
         </Grid>
-        <Label Grid.Column="2"
-               Content="{Binding Resources.BuildTarget, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-               HorizontalAlignment="Center"
-               VerticalAlignment="Top"
-               FontSize="14"
-               Grid.Row="2"
-               Height="29"
-               HorizontalContentAlignment="Center"
-               VerticalContentAlignment="Center"
-               Margin="0,5,0,0" />
-        <Label Content="{Binding Resources.CsProjList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-               HorizontalAlignment="Center"
-               VerticalAlignment="Top"
-               FontSize="14"
-               Grid.Row="2"
-               Height="29"
-               HorizontalContentAlignment="Center"
-               VerticalContentAlignment="Center"
-               Margin="0,5,0,0" />
+        <Label
+            Grid.Row="2"
+            Grid.Column="2"
+            Height="29"
+            Margin="0,5,0,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="Center"
+            VerticalContentAlignment="Center"
+            Content="{Binding Resources.BuildTarget, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+            FontSize="14" />
+        <Label
+            Grid.Row="2"
+            Height="29"
+            Margin="0,5,0,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="Center"
+            VerticalContentAlignment="Center"
+            Content="{Binding Resources.CsProjList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+            FontSize="14" />
         <!--<Button x:Name="UpdateButton"
                 Content="更新"
                 HorizontalAlignment="Right"
@@ -190,68 +201,68 @@
                 Width="46"
                 FontSize="12"
                 Click="UpdateButton_Click" />-->
-        <Menu Grid.ColumnSpan="3"
-              Margin="0,4,0,6">
-            <MenuItem Header="{Binding Resources.File_F, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                      Click="MenuItem_Click" TabIndex="1">
+        <Menu Grid.ColumnSpan="3" Margin="0,4,0,6">
+            <MenuItem
+                Click="MenuItem_Click"
+                Header="{Binding Resources.File_F, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
+                TabIndex="1">
                 <MenuItem Header="{Binding Resources.Exit_X, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
             </MenuItem>
-            <MenuItem Header="{Binding Resources.Settings_E, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                      TabIndex="2">
-                <MenuItem Header="{Binding Resources.ColorSettings_C, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                          Click="ColorSetting_Click" />
-                <MenuItem Header="{Binding Resources.LanguageSettings_L, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                          Click="Button_Click" />
+            <MenuItem Header="{Binding Resources.Settings_E, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" TabIndex="2">
+                <MenuItem Click="ColorSetting_Click" Header="{Binding Resources.ColorSettings_C, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
+                <MenuItem Click="Button_Click" Header="{Binding Resources.LanguageSettings_L, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
             </MenuItem>
-            <MenuItem Header="{Binding Resources.Help, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                      TabIndex="3">
-                <MenuItem Header="{Binding Resources.Version_A, Source={x:Static app:ResourceService.Current}, Mode=OneWay}"
-                          Click="MenuItem_Click_1" />
+            <MenuItem Header="{Binding Resources.Help, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" TabIndex="3">
+                <MenuItem Click="MenuItem_Click_1" Header="{Binding Resources.Version_A, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
             </MenuItem>
         </Menu>
-        <Button x:Name="UpButton"
-                Content="▲"
-                HorizontalAlignment="Right"
-                Margin="0,15,10,0"
-                Grid.Row="2"
-                VerticalAlignment="Top"
-                Padding="0,0,0,0"
-                Height="20"
-                Width="20"
-                FontSize="12"
-                Grid.Column="2"
-                Click="UpButton_Click"
-                TabIndex="12"
-                ToolTip="{Binding Resources.Tt_ReplaceTargetList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
-        <Button x:Name="DownButton"
-                Content="▼"
-                HorizontalAlignment="Right"
-                Margin="0,15,35,0"
-                Grid.Row="2"
-                VerticalAlignment="Top"
-                Padding="0,0,0,0"
-                Height="20"
-                Width="20"
-                FontSize="12"
-                Click="DownButton_Click"
-                Grid.Column="2"
-                TabIndex="11" 
-                ToolTip="{Binding Resources.Tt_ReplaceTargetList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
-        <TextBox x:Name="SearchTextbox"
-                 HorizontalAlignment="Right"
-                 Margin="0,5,10,0"
-                 Grid.Row="2"
-                 TextWrapping="Wrap"
-                 VerticalAlignment="Top"
-                 Width="120"
-                 Height="20"
-                 Padding="5,5,5,5"
-                 VerticalContentAlignment="Center"
-                 FontSize="14"
-                 TextChanged="SearchTextbox_TextChanged"
-                 ui:ControlHelper.PlaceholderText="Search"
-                 TextAlignment="Left"
-                 TabIndex="6" />
+        <Button
+            x:Name="UpButton"
+            Grid.Row="2"
+            Grid.Column="2"
+            Width="20"
+            Height="20"
+            Margin="0,15,10,0"
+            Padding="0,0,0,0"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Click="UpButton_Click"
+            Content="▲"
+            FontSize="12"
+            TabIndex="12"
+            ToolTip="{Binding Resources.Tt_ReplaceTargetList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
+        <Button
+            x:Name="DownButton"
+            Grid.Row="2"
+            Grid.Column="2"
+            Width="20"
+            Height="20"
+            Margin="0,15,35,0"
+            Padding="0,0,0,0"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Click="DownButton_Click"
+            Content="▼"
+            FontSize="12"
+            TabIndex="11"
+            ToolTip="{Binding Resources.Tt_ReplaceTargetList, Source={x:Static app:ResourceService.Current}, Mode=OneWay}" />
+        <TextBox
+            x:Name="SearchTextbox"
+            Grid.Row="2"
+            Width="120"
+            Height="20"
+            Margin="0,5,10,0"
+            Padding="5,5,5,5"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            VerticalContentAlignment="Center"
+            ui:ControlHelper.PlaceholderText="Search"
+            AcceptsReturn="True"
+            FontSize="14"
+            TabIndex="6"
+            TextAlignment="Left"
+            TextChanged="SearchTextbox_TextChanged"
+            TextWrapping="Wrap" />
 
     </Grid>
 </Window>
diff --git a/msbuild-gui/MainWindow.xaml.cs b/msbuild-gui/MainWindow.xaml.cs
index 71f4908..6ed87c7 100644
--- a/msbuild-gui/MainWindow.xaml.cs
+++ b/msbuild-gui/MainWindow.xaml.cs
@@ -559,9 +559,10 @@ public void RunBuild(List<string> targets, string? SourceFolder, string? OutputF
             {
                 int targetIndex = 0;
                 string cmdErrorText = "";
-                string[,] list = new string[targets.Count, 2];
+                string[,] list = new string[targets.Count, 3];
                 string errorLogBef = "";
                 string errorLogNow = "";
+                string command = "";
 
                 string? asp = AssemblySearchPaths == "" ? "" : "/p:AssemblySearchPaths=\"" + AssemblySearchPaths + "\" ";
                 string? vsv = VisualStudioVersion == "" ? "" : "/p:VisualStudioVersion=\"" + VisualStudioVersion + "\" ";
@@ -569,10 +570,7 @@ public void RunBuild(List<string> targets, string? SourceFolder, string? OutputF
                 foreach (var target in targets)
                 {
                     string targetFilePath = SourceFolder + target;
-                    Process? process = Process.Start(new ProcessStartInfo
-                    {
-                        FileName = "cmd.exe",
-                        Arguments = $"/c \"" +
+                    command = $"/c \"" +
                         $"\"{MsBuild}\" " +
                         $"{targetFilePath} " +
                         $"/target:{Target} " +
@@ -580,7 +578,12 @@ public void RunBuild(List<string> targets, string? SourceFolder, string? OutputF
                         asp +
                         $"/p:Configuration={Configuration} " +
                         vsv +
-                        $"/fileloggerparameters:LogFile=\"{Directory.GetCurrentDirectory()}\\BuildErrorLog.txt\";ErrorsOnly;Append=True",
+                        $"/fileloggerparameters:LogFile=\"{Directory.GetCurrentDirectory()}\\BuildErrorLog.txt\";ErrorsOnly;Append=True";
+
+                    Process? process = Process.Start(new ProcessStartInfo
+                    {
+                        FileName = "cmd.exe",
+                        Arguments = command,
                         CreateNoWindow = true,
                         UseShellExecute = false,
                         RedirectStandardOutput = true,
@@ -604,6 +607,7 @@ public void RunBuild(List<string> targets, string? SourceFolder, string? OutputF
 
                     list[targetIndex,0] = Path.GetFileNameWithoutExtension(target) + errFlg;
                     list[targetIndex,1] = standardOutput;
+                    list[targetIndex,2] = command.Replace("/c \"","");
 
                     // ProgressBarを進める
                     Application.Current.Dispatcher.Invoke(() => {
diff --git a/msbuild-gui/Messagebox.xaml b/msbuild-gui/Messagebox.xaml
new file mode 100644
index 0000000..ec59b54
--- /dev/null
+++ b/msbuild-gui/Messagebox.xaml
@@ -0,0 +1,47 @@
+<Window
+    x:Class="msbuild_gui.Messagebox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:app="clr-namespace:msbuild_gui"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:msbuild_gui"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:properties="clr-namespace:msbuild_gui.Properties"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    Title="Messagebox"
+    VerticalAlignment="Top"
+    ui:WindowHelper.UseModernWindowStyle="True"
+    KeyDown="Window_KeyDown"
+    Loaded="Window_Loaded"
+    ResizeMode="NoResize"
+    SizeChanged="Window_SizeChanged"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="None"
+    mc:Ignorable="d">
+    <Grid VerticalAlignment="Top">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="60" />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Margin="15,15,15,15">
+            <TextBox
+                x:Name="ContentLabel"
+                Height="400"
+                Padding="10,10,10,10"
+                BorderBrush="{x:Null}"
+                HorizontalScrollBarVisibility="Auto"
+                IsReadOnly="True"
+                TextWrapping="Wrap"
+                VerticalScrollBarVisibility="Visible" />
+        </StackPanel>
+        <StackPanel Grid.Row="1" Margin="15,0,15,15">
+            <Button
+                x:Name="OkButton"
+                MinWidth="60"
+                HorizontalAlignment="Right"
+                Click="Button_Click"
+                Content="OK" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/msbuild-gui/Messagebox.xaml.cs b/msbuild-gui/Messagebox.xaml.cs
new file mode 100644
index 0000000..d56bedd
--- /dev/null
+++ b/msbuild-gui/Messagebox.xaml.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace msbuild_gui
+{
+    /// <summary>
+    /// Messagebox.xaml の相互作用ロジック
+    /// </summary>
+    public partial class Messagebox : Window
+    {
+        public Messagebox(string title, string content)
+        {
+            InitializeComponent();
+            OkButton.Focus();
+            this.Title = title;
+            //this.MaxWidth = SystemParameters.PrimaryScreenWidth * 0.8;
+            ContentLabel.Text = content;
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void Window_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                this.Close();
+            }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (this.Owner != null)
+            {
+                this.Width = this.Owner.Width;
+                this.Height = this.Owner.Height;
+            }
+        }
+
+        private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (this.Owner != null)
+            {
+                this.Left = this.Owner.Left + (this.Owner.ActualWidth - this.ActualWidth) / 2;
+                this.Top = this.Owner.Top + (this.Owner.ActualHeight - this.ActualHeight) / 2;
+            }
+        }
+    }
+}
diff --git a/msbuild-gui/msbuild-gui.csproj.user b/msbuild-gui/msbuild-gui.csproj.user
index 520caf5..20ad3bb 100644
--- a/msbuild-gui/msbuild-gui.csproj.user
+++ b/msbuild-gui/msbuild-gui.csproj.user
@@ -20,6 +20,9 @@
     </Compile>
     <Compile Update="LanguageSettings.xaml.cs">
       <SubType>Code</SubType>
+    </Compile>
+        <Compile Update="Messagebox.xaml.cs">
+      <SubType>Code</SubType>
     </Compile>
     <Compile Update="ProjectSettings.xaml.cs">
       <SubType>Code</SubType>
@@ -43,6 +46,9 @@
     </Page>
     <Page Update="LanguageSettings.xaml">
       <SubType>Designer</SubType>
+    </Page>
+        <Page Update="Messagebox.xaml">
+      <SubType>Designer</SubType>
     </Page>
     <Page Update="MainWindow.xaml">
       <SubType>Designer</SubType>