From ccc6add5ea66565453283d7df0f6fbf2324b9264 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 18 Feb 2019 13:21:20 +0200
Subject: Refactored machine studio service.

---
 .../MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml           | 2 --
 1 file changed, 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 696cc051f..d9cb20d03 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -60,8 +60,6 @@
                             <TextBlock><Run Text="{Binding DataSource.Address,Mode=OneWay}"></Run>
                                 <Run>(</Run><Run Foreground="Gray" Text="{Binding DataSource.Catalog,Mode=OneWay}"></Run><Run>)</Run>
                             </TextBlock>
-                            <TextBlock FontWeight="SemiBold">Allow BETA Updates:</TextBlock>
-                            <ToggleButton IsChecked="{Binding MachineStudioSettings.AcceptBetaRelease,Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Bottom"></ToggleButton>
                         </controls:TableGrid>
 
                         <DockPanel Margin="0 0 0 0">
-- 
cgit v1.3.1


From 556975ba30e4984167cf2094edf8119c11168783 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 18 Feb 2019 18:48:41 +0200
Subject: Machine Studio v4.0.7.0

---
 .../Build/Shortcuts/Machine Studio.lnk             | Bin 1516 -> 1532 bytes
 .../MachineStudioSettings.cs                       |   8 ++++++
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.MachineStudio.UI/Views/AboutView.xaml    |   6 ++---
 .../Properties/PublishProfiles/Process.pubxml      |  28 +++++++++++++++++++++
 .../Tango.MachineService.csproj                    |   1 +
 6 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Process.pubxml

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')

diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index 9701ff7fc..4d317d343 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.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index b8d767c5e..f7c05c1a8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -107,6 +107,14 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public bool ByPassEnvironmentVersionCheck { get; set; }
 
+        /// <summary>
+        /// Gets the machine service address.
+        /// </summary>
+        public String MachineServiceAddress
+        {
+            get { return GetMachineServiceAddress(); }
+        }
+
         /// <summary>
         /// Gets the machine service address.
         /// </summary>
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 951b80ab4..bceaaf956 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.6.0")]
+[assembly: AssemblyVersion("4.0.7.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index d9cb20d03..640c3c1df 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -50,12 +50,12 @@
                             <TextBlock><Run>v</Run><Run Text="{Binding ApplicationManager.CoreVersion,Mode=OneWay}"></Run></TextBlock>
                             <TextBlock FontWeight="SemiBold">Build Date:</TextBlock>
                             <TextBlock Text="{Binding ApplicationManager.BuildDate,Mode=OneWay}"></TextBlock>
-                            <TextBlock FontWeight="SemiBold">Environment Mode:</TextBlock>
+                            <TextBlock FontWeight="SemiBold">Data Mode:</TextBlock>
                             <TextBlock Text="{Binding MachineStudioSettings.Environment,Mode=OneWay}"></TextBlock>
-                            <TextBlock FontWeight="SemiBold">Environment Slot:</TextBlock>
+                            <TextBlock FontWeight="SemiBold">Environment:</TextBlock>
                             <TextBlock Text="{Binding MachineStudioSettings.DeploymentSlot,Mode=OneWay}"></TextBlock>
                             <TextBlock FontWeight="SemiBold">Machine Service:</TextBlock>
-                            <TextBlock Text="{Binding MachineStudioSettings.DeploymentSlot,Converter={StaticResource EnumToDescriptionConverter},Mode=OneWay}"></TextBlock>
+                            <TextBlock Text="{Binding MachineStudioSettings.MachineServiceAddress}"></TextBlock>
                             <TextBlock FontWeight="SemiBold">Data Source:</TextBlock>
                             <TextBlock><Run Text="{Binding DataSource.Address,Mode=OneWay}"></Run>
                                 <Run>(</Run><Run Foreground="Gray" Text="{Binding DataSource.Catalog,Mode=OneWay}"></Run><Run>)</Run>
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Process.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Process.pubxml
new file mode 100644
index 000000000..a668d8243
--- /dev/null
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Process.pubxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <ResourceId>/subscriptions/10c8aa60-3b15-4e0d-b412-6aeef90e5e91/resourceGroups/Tango/providers/Microsoft.Web/sites/machineservice/slots/MachineService-PROCESS</ResourceId>
+    <ResourceGroup>Tango</ResourceGroup>
+    <PublishProvider>AzureWebSite</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>http://machineservice-machineservice-process.azurewebsites.net</SiteUrlToLaunchAfterPublish>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <MSDeployServiceURL>machineservice-machineservice-process.scm.azurewebsites.net:443</MSDeployServiceURL>
+    <DeployIisAppPath>machineservice__MachineService-PROCESS</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
+    <InstallAspNetCoreSiteExtension>False</InstallAspNetCoreSiteExtension>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>True</EnableMSDeployBackup>
+    <UserName>$machineservice__MachineService-PROCESS</UserName>
+    <_SavePWD>True</_SavePWD>
+    <_DestinationType>AzureWebSite</_DestinationType>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
index 44351869b..038849c72 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
@@ -348,6 +348,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Properties\PublishProfiles\Development.pubxml" />
+    <None Include="Properties\PublishProfiles\Process.pubxml" />
     <None Include="Properties\PublishProfiles\Testing.pubxml" />
     <None Include="Properties\PublishProfiles\Production.pubxml" />
     <None Include="Properties\PublishProfiles\Publish Machine Service via FTP.pubxml" />
-- 
cgit v1.3.1