Removed APPLICATION_VERSIONS & EMBEDDED_SOFTWARE_VERSIONS TABLES.

Added TANGO_VERSIONS.
Working on PPC machine setup.

15 files changed, 11 insertions, 424 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index 8cf8c592d..7a905fa24 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -91,7 +91,6 @@
     <Compile Include="ViewModels\ApplicationDisplayPanelVersionsViewVM.cs" />
     <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\ApplicationOsVersionsViewVM.cs" />
-    <Compile Include="ViewModels\ApplicationVersionsViewVM.cs" />
     <Compile Include="ViewModels\CartridgeTypesViewVM.cs" />
     <Compile Include="ViewModels\CatsViewVM.cs" />
     <Compile Include="ViewModels\CctsViewVM.cs" />
@@ -103,7 +102,6 @@
     <Compile Include="ViewModels\DialogOpenMode.cs" />
     <Compile Include="ViewModels\DispenserTypesViewVM.cs" />
     <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" />
-    <Compile Include="ViewModels\EmbeddedSoftwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\EventTypesViewVM.cs" />
     <Compile Include="ViewModels\FiberShapesViewVM.cs" />
     <Compile Include="ViewModels\FiberSynthsViewVM.cs" />
@@ -287,15 +285,9 @@
     <Compile Include="Views\DBViews\HardwareVersionView.xaml.cs">
       <DependentUpon>HardwareVersionView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\EmbeddedSoftwareVersionView.xaml.cs">
-      <DependentUpon>EmbeddedSoftwareVersionView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\EmbeddedFirmwareVersionView.xaml.cs">
       <DependentUpon>EmbeddedFirmwareVersionView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\ApplicationVersionView.xaml.cs">
-      <DependentUpon>ApplicationVersionView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\ApplicationOsVersionView.xaml.cs">
       <DependentUpon>ApplicationOsVersionView.xaml</DependentUpon>
     </Compile>
@@ -305,15 +297,9 @@
     <Compile Include="Views\DBViews\HardwareVersionsView.xaml.cs">
       <DependentUpon>HardwareVersionsView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\EmbeddedSoftwareVersionsView.xaml.cs">
-      <DependentUpon>EmbeddedSoftwareVersionsView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\EmbeddedFirmwareVersionsView.xaml.cs">
       <DependentUpon>EmbeddedFirmwareVersionsView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\ApplicationVersionsView.xaml.cs">
-      <DependentUpon>ApplicationVersionsView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\ApplicationOsVersionsView.xaml.cs">
       <DependentUpon>ApplicationOsVersionsView.xaml</DependentUpon>
     </Compile>
@@ -605,18 +591,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\EmbeddedSoftwareVersionView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\EmbeddedFirmwareVersionView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\ApplicationVersionView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\ApplicationOsVersionView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -629,18 +607,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\EmbeddedSoftwareVersionsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\EmbeddedFirmwareVersionsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\ApplicationVersionsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\ApplicationOsVersionsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -810,7 +780,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index 7bf3c6717..409b66e12 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -27,9 +27,7 @@ namespace Tango.MachineStudio.DB
             TangoIOC.Default.Register<ApplicationDisplayPanelVersionsViewVM>();
             TangoIOC.Default.Register<ApplicationFirmwareVersionsViewVM>();
             TangoIOC.Default.Register<ApplicationOsVersionsViewVM>();
-            TangoIOC.Default.Register<ApplicationVersionsViewVM>();
             TangoIOC.Default.Register<EmbeddedFirmwareVersionsViewVM>();
-            TangoIOC.Default.Register<EmbeddedSoftwareVersionsViewVM>();
             TangoIOC.Default.Register<HardwareVersionsViewVM>();
 
             TangoIOC.Default.Register<IdsPacksViewVM>();
@@ -165,14 +163,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static ApplicationVersionsViewVM ApplicationVersionsViewVM
-        {
-            get
-            {
-                return TangoIOC.Default.GetInstance<ApplicationVersionsViewVM>();
-            }
-        }
-
         public static EmbeddedFirmwareVersionsViewVM EmbeddedFirmwareVersionsViewVM
         {
             get
@@ -181,14 +171,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static EmbeddedSoftwareVersionsViewVM EmbeddedSoftwareVersionsViewVM
-        {
-            get
-            {
-                return TangoIOC.Default.GetInstance<EmbeddedSoftwareVersionsViewVM>();
-            }
-        }
-
         public static HardwareVersionsViewVM HardwareVersionsViewVM
         {
             get
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs
deleted file mode 100644
index a35c97672..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class ApplicationVersionsViewVM : DbTableViewModel<ApplicationVersion>
-    {
-        public ApplicationVersionsViewVM(INotificationProvider notification) : base(notification)
-        {
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs
deleted file mode 100644
index eb47e4e54..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class EmbeddedSoftwareVersionsViewVM : DbTableViewModel<EmbeddedSoftwareVersion>
-    {
-        public EmbeddedSoftwareVersionsViewVM(INotificationProvider notification) : base(notification)
-        {
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionView.xaml
deleted file mode 100644
index 05c0b48e0..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionView.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.ApplicationVersionView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
-    <Grid>
-        <controls:TableGrid>
-            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Version:" FontWeight="Bold"></TextBlock>
-            <TextBox Background="Transparent" HorizontalContentAlignment="Left" Text="{Binding EditEntity.Version,Mode=TwoWay}"></TextBox>
-            <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
-        </controls:TableGrid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionView.xaml.cs
deleted file mode 100644
index bde27ee0d..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-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.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachineView.xaml
-    /// </summary>
-    public partial class ApplicationVersionView : UserControl
-    {
-        public ApplicationVersionView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionsView.xaml
deleted file mode 100644
index 09df0fee4..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionsView.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.ApplicationVersionsView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:global="clr-namespace:Tango.MachineStudio.DB"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ApplicationVersionsViewVM}">
-    <Grid>
-        <controls:DbTableView>
-            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.ApplicationVersionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Version" Binding="{Binding Version}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-        </controls:DbTableView>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionsView.xaml.cs
deleted file mode 100644
index 23cab4296..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationVersionsView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-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.Navigation;
-using System.Windows.Shapes;
-using Tango.MachineStudio.DB.CustomAttributes;
-using Tango.MachineStudio.DB.Managers;
-using Tango.SharedUI.Controls;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachinesView.xaml
-    /// </summary>
-    [DBView]
-    public partial class ApplicationVersionsView : UserControl
-    {
-        public ApplicationVersionsView() : base()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionView.xaml
deleted file mode 100644
index 43d9ab0eb..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionView.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EmbeddedSoftwareVersionView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
-    <Grid>
-        <controls:TableGrid>
-            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Version:" FontWeight="Bold"></TextBlock>
-            <TextBox Background="Transparent" HorizontalContentAlignment="Left" Text="{Binding EditEntity.Version,Mode=TwoWay}"></TextBox>
-            <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
-        </controls:TableGrid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionView.xaml.cs
deleted file mode 100644
index e2e626fb5..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-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.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachineView.xaml
-    /// </summary>
-    public partial class EmbeddedSoftwareVersionView : UserControl
-    {
-        public EmbeddedSoftwareVersionView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionsView.xaml
deleted file mode 100644
index 64814a416..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionsView.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EmbeddedSoftwareVersionsView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:global="clr-namespace:Tango.MachineStudio.DB"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.EmbeddedSoftwareVersionsViewVM}">
-    <Grid>
-        <controls:DbTableView>
-            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.EmbeddedSoftwareVersionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Version" Binding="{Binding Version}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-        </controls:DbTableView>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionsView.xaml.cs
deleted file mode 100644
index 55f7a03a6..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedSoftwareVersionsView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-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.Navigation;
-using System.Windows.Shapes;
-using Tango.MachineStudio.DB.CustomAttributes;
-using Tango.MachineStudio.DB.Managers;
-using Tango.SharedUI.Controls;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachinesView.xaml
-    /// </summary>
-    [DBView]
-    public partial class EmbeddedSoftwareVersionsView : UserControl
-    {
-        public EmbeddedSoftwareVersionsView() : base()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 0bd8f8133..1f410d49c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -205,12 +205,10 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
 
             List<ICollectionView> collections = new List<ICollectionView>();
+            collections.Add(Adapter.ApplicationFirmwareVersionsViewSource);
             collections.Add(Adapter.ApplicationDisplayPanelVersionsViewSource);
-            collections.Add(Adapter.ApplicationVersionsViewSource);
-            collections.Add(Adapter.EmbeddedSoftwareVersionsViewSource);
-            collections.Add(Adapter.EmbeddedFirmwareVersionsViewSource);
             collections.Add(Adapter.ApplicationOsVersionsViewSource);
-            collections.Add(Adapter.ApplicationVersionsViewSource);
+            collections.Add(Adapter.EmbeddedFirmwareVersionsViewSource);
             collections.Add(Adapter.DispenserTypesViewSource);
             collections.Add(Adapter.CartridgeTypesViewSource);
             collections.Add(Adapter.LiquidTypesViewSource);
@@ -274,16 +272,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         }
 
         /// <summary>
-        /// Drops the application version.
-        /// </summary>
-        /// <param name="applicationVersion">The application version.</param>
-        public void DropApplicationVersion(ApplicationVersion applicationVersion)
-        {
-            Configuration.ApplicationVersion = applicationVersion;
-            Configuration.ApplicationVersionGuid = applicationVersion.Guid;
-        }
-
-        /// <summary>
         /// Drops the hardware version.
         /// </summary>
         /// <param name="hardwareVersion">The hardware version.</param>
@@ -304,23 +292,13 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         }
 
         /// <summary>
-        /// Drops the embedded software.
-        /// </summary>
-        /// <param name="embeddedSoftwareVersion">The embedded software version.</param>
-        public void DropEmbeddedSoftware(EmbeddedSoftwareVersion embeddedSoftwareVersion)
-        {
-            Configuration.EmbeddedSoftwareVersion = embeddedSoftwareVersion;
-            Configuration.EmbeddedSoftwareVersionGuid = embeddedSoftwareVersion.Guid;
-        }
-
-        /// <summary>
         /// Drops the application os version.
         /// </summary>
         /// <param name="applicationOsVersion">The application os version.</param>
         public void DropApplicationOsVersion(ApplicationOsVersion applicationOsVersion)
         {
             Configuration.ApplicationOsVersion = applicationOsVersion;
-            Configuration.ApplicationVersionGuid = applicationOsVersion.Guid;
+            Configuration.ApplicationOsVersionGuid = applicationOsVersion.Guid;
         }
 
         /// <summary>
@@ -457,21 +435,11 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 errors.Add("Application operation system is required.");
             }
 
-            if (Configuration.ApplicationVersion == null)
-            {
-                errors.Add("Application version is required.");
-            }
-
             if (Configuration.EmbeddedFirmwareVersion == null)
             {
                 errors.Add("Embedded firmware is required.");
             }
 
-            if (Configuration.EmbeddedSoftwareVersion == null)
-            {
-                errors.Add("Embedded software is required.");
-            }
-
             if (Configuration.HardwareVersion == null)
             {
                 errors.Add("Hardware version is required.");
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
index 79949405e..4e3e31326 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
@@ -130,7 +130,7 @@
                                     </Border>
                                 </Grid>
 
-                                <TextBlock Canvas.Left="532" FontStyle="Italic" Foreground="Gray" Canvas.Top="-22">Hardware</TextBlock>
+                                <TextBlock Canvas.Left="532" FontStyle="Italic" Foreground="Gray" Canvas.Top="-22">Hardware Version</TextBlock>
                                 <Grid Width="97" Height="90" Canvas.Left="431" Canvas.Top="-13">
                                     <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
                                     <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
@@ -293,22 +293,10 @@
                                 </Grid>
 
                                 <Grid Width="61" IsHitTestVisible="True" SnapsToDevicePixels="True" ClipToBounds="True" Height="42" Canvas.Left="85" Canvas.Top="385">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="1*" />
-                                        <RowDefinition Height="1*" />
-                                    </Grid.RowDefinitions>
-
                                     <StackPanel Orientation="Horizontal">
                                         <Image Source="../Images/embedded.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
                                     </StackPanel>
-                                    <StackPanel Grid.Row="1" Orientation="Horizontal">
-                                        <Image Source="../Images/embedded-software.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock Padding="1" IsHitTestVisible="False" VerticalAlignment="Center" Foreground="Gainsboro" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="14" Margin="0,6,0,1" Width="47">
-                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersion.Name}"></Run>
-                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersion.Version}"></Run>
-                                        </TextBlock>
-                                    </StackPanel>
                                 </Grid>
 
                                 <TextBlock Canvas.Top="163" Canvas.Left="288" FontStyle="Italic" Foreground="Gray">Touch Panel</TextBlock>
@@ -356,7 +344,6 @@
                                         <RowDefinition Height="1*" />
                                         <RowDefinition Height="1*" />
                                         <RowDefinition Height="1*" />
-                                        <RowDefinition Height="1*" />
                                     </Grid.RowDefinitions>
 
                                     <StackPanel>
@@ -367,16 +354,8 @@
                                         </TextBlock>
                                     </StackPanel>
 
-                                    <StackPanel Grid.Row="2" >
-                                        <Image Source="../Images/app.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationVersion.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationVersion.Version}"></Run>
-                                        </TextBlock>
-                                    </StackPanel>
 
-
-                                    <StackPanel Grid.Row="3" >
+                                    <StackPanel Grid.Row="1" >
                                         <Image Source="../Images/application-firmware.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Name}"></Run>
@@ -384,7 +363,7 @@
                                         </TextBlock>
                                     </StackPanel>
 
-                                    <StackPanel Grid.Row="1" >
+                                    <StackPanel Grid.Row="2" >
                                         <Image Source="../Images/android.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding Configuration.ApplicationOsVersion.Name}"></Run>
@@ -628,7 +607,7 @@
                                         </ListBox>
                                     </Expander>
                                     <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Formulas">
+                                    <Expander HorizontalAlignment="Stretch" Header="IDS Pack Formulas">
                                         <ListBox ItemsSource="{Binding Adapter.IdsPackFormulasViewSource}" HorizontalContentAlignment="Stretch">
                                             <ListBox.ItemContainerStyle>
                                                 <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
@@ -708,33 +687,6 @@
                                         </ListBox>
                                     </Expander>
                                     <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Application Softwares">
-                                        <ListBox ItemsSource="{Binding Adapter.ApplicationVersionsViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/app.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
                                     <Expander HorizontalAlignment="Stretch" Header="Application Firmwares">
                                         <ListBox ItemsSource="{Binding Adapter.ApplicationFirmwareVersionsViewSource}" HorizontalContentAlignment="Stretch">
                                             <ListBox.ItemContainerStyle>
@@ -789,34 +741,7 @@
                                         </ListBox>
                                     </Expander>
                                     <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Embedded Softwares">
-                                        <ListBox ItemsSource="{Binding Adapter.EmbeddedSoftwareVersionsViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/embedded-software.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Hardwares">
+                                    <Expander HorizontalAlignment="Stretch" Header="Hardware Versions">
                                         <ListBox ItemsSource="{Binding Adapter.HardwareVersionsViewSource}" HorizontalContentAlignment="Stretch">
                                             <ListBox.ItemContainerStyle>
                                                 <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
index 67d42a350..9c7496484 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
@@ -67,11 +67,11 @@ namespace Tango.MachineStudio.MachineDesigner.Views
             {
                 SetHighlightRegion(hardwareGrid);
             }
-            else if (e.DataContext is ApplicationVersion || e.DataContext is ApplicationOsVersion || e.DataContext is ApplicationDisplayPanelVersion || e.DataContext is ApplicationFirmwareVersion)
+            else if (e.DataContext is ApplicationOsVersion || e.DataContext is ApplicationDisplayPanelVersion || e.DataContext is ApplicationFirmwareVersion)
             {
                 SetHighlightRegion(gridTablet);
             }
-            else if (e.DataContext is EmbeddedFirmwareVersion || e.DataContext is EmbeddedSoftwareVersion)
+            else if (e.DataContext is EmbeddedFirmwareVersion)
             {
                 SetHighlightRegion(gridEmbedded);
             }
@@ -123,10 +123,6 @@ namespace Tango.MachineStudio.MachineDesigner.Views
             {
                 _vm.DropTouchPanel(e.Draggable.DataContext as ApplicationDisplayPanelVersion);
             }
-            else if (e.Draggable.DataContext is ApplicationVersion)
-            {
-                _vm.DropApplicationVersion(e.Draggable.DataContext as ApplicationVersion);
-            }
             else if (e.Draggable.DataContext is ApplicationOsVersion)
             {
                 _vm.DropApplicationOsVersion(e.Draggable.DataContext as ApplicationOsVersion);
@@ -143,10 +139,6 @@ namespace Tango.MachineStudio.MachineDesigner.Views
             {
                 _vm.DropEmbeddedFirmware(e.Draggable.DataContext as EmbeddedFirmwareVersion);
             }
-            else if (e.Draggable.DataContext is EmbeddedSoftwareVersion)
-            {
-                _vm.DropEmbeddedSoftware(e.Draggable.DataContext as EmbeddedSoftwareVersion);
-            }
         }
 
         private void MachineDrop(object sender, DropEventArgs e)