From e245356c722792f8c23aa483cb323f4c47b54fb6 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 10 Feb 2019 13:32:03 +0200
Subject: Added new event types. Remove IsStable and AcceptBetaRelease from
 machine studio.

---
 .../Tango.MachineStudio.Publisher/MainWindow.xaml      |  6 +-----
 .../Tango.MachineStudio.Publisher/MainWindowVM.cs      | 18 ------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
index e76d933fb..195c89224 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
@@ -58,11 +58,7 @@
 
                         <TextBlock FontSize="16" Margin="0 20 0 0">Comments</TextBlock>
                         <TextBox Height="70" Margin="0 5 0 0" Width="500" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Comments,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-
-                        <StackPanel Orientation="Horizontal" Margin="0 10 0 0">
-                            <CheckBox IsChecked="{Binding ForcedUpdate}">Forced Update</CheckBox>
-                            <CheckBox Margin="10 0 0 0" IsChecked="{Binding IsStable}">Stable Release</CheckBox>
-                        </StackPanel>
+>
                     </StackPanel>
 
                     <Grid DockPanel.Dock="Bottom">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 6cfa96a18..206a2d31b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -54,22 +54,6 @@ namespace Tango.MachineStudio.Publisher
             set { _comments = value; RaisePropertyChangedAuto(); }
         }
 
-        private bool _forcesUpdate;
-
-        public bool ForcedUpdate
-        {
-            get { return _forcesUpdate; }
-            set { _forcesUpdate = value; RaisePropertyChangedAuto(); }
-        }
-
-        private bool _isStable;
-
-        public bool IsStable
-        {
-            get { return _isStable; }
-            set { _isStable = value; RaisePropertyChangedAuto(); }
-        }
-
         private DeploymentSlot _deploymentSlot;
         public DeploymentSlot DeploymentSlot
         {
@@ -176,8 +160,6 @@ namespace Tango.MachineStudio.Publisher
                         Password = _hashGenerator.Encrypt(Password),
                         Version = CurrentVersion.ToString(),
                         Comments = Comments,
-                        ForcedUpdate = ForcedUpdate,
-                        IsStable = IsStable,
                     }).Result;
 
                     using (ZipFile zip = new ZipFile())
-- 
cgit v1.3.1


From 12a5db26faffad018d831b99b77b1bbabe1ae5a9 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 10 Feb 2019 14:02:11 +0200
Subject: Machine Studio v4.0.5 PPC v1.0.2

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 22675456 -> 22675456 bytes
 .../Build/Shortcuts/Machine Studio.lnk             | Bin 1516 -> 1532 bytes
 .../Tango.MachineStudio.Publisher/MainWindow.xaml  |   4 ++--
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest    |   2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index c6ef8c7c1..9da18cbe7 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 130c69370..65cf98b25 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index 3e9b1c933..ec95c71d3 100644
Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
index 195c89224..0d9d6b667 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
@@ -46,7 +46,7 @@
                         <ComboBox Width="200" Margin="0 10 0 0" HorizontalAlignment="Left" ItemsSource="{Binding Source={x:Type web:DeploymentSlot},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding DeploymentSlot}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
                         
 
-                        <StackPanel Margin="0 20 0 0" Orientation="Horizontal" >
+                        <StackPanel Margin="0 20 0 0" Orientation="Horizontal">
                             <TextBlock FontSize="16">Email:</TextBlock>
                             <TextBox Margin="5 0 0 0" Width="230" BorderThickness="0 0 0 1" Text="{Binding Email,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
                         </StackPanel>
@@ -58,7 +58,7 @@
 
                         <TextBlock FontSize="16" Margin="0 20 0 0">Comments</TextBlock>
                         <TextBox Height="70" Margin="0 5 0 0" Width="500" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Comments,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
->
+
                     </StackPanel>
 
                     <Grid DockPanel.Dock="Bottom">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index c8a6d47c3..c9bba3ad8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.0.4.0")]
+[assembly: AssemblyVersion("4.0.5.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
-- 
cgit v1.3.1