TwineRSM_v2.0.5

13 files changed, 23 insertions, 19 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip
index a78d6584e..d3dcdd7ee 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip
@@ -25,10 +25,10 @@
     <ROW Property="ExtractFilesFirst" Value="1"/>
     <ROW Property="LogoIcon" Value="externalui.ico" MultiBuildValue="DefaultBuild:rsm.ico" Type="1" MsiKey="LogoIcon"/>
     <ROW Property="Manufacturer" Value="Twine Solutions LTD"/>
-    <ROW Property="ProductCode" Value="1033:{ECFAA03C-B34A-42FA-9CF3-6D2211E22FFF} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{FD787377-5C57-45F5-BB9A-10D85F07057E} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
-    <ROW Property="ProductName" Value="Twine RSM"/>
-    <ROW Property="ProductVersion" Value="2.0.3.0" Type="32"/>
+    <ROW Property="ProductName" Value="Twine Studio"/>
+    <ROW Property="ProductVersion" Value="2.0.5.0" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{22D27628-0032-4538-8C96-8A699B84A3EC}"/>
@@ -107,6 +107,7 @@
     <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{6D0DE91D-C829-4AF7-928B-DF669B909EE1}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/>
     <ROW Component="Microsoft.Data.OData.dll" ComponentId="{E106D07B-A4F4-4AF3-A6C4-CE9A50D1B090}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/>
     <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{B7062C02-4E85-48AE-94D8-96A30839A818}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/>
+    <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" ComponentId="{1E13C501-671B-4D84-B8CE-87DAFE16AB4D}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{C8FF51E6-B8BB-401D-BD03-58FD08E4C389}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Component="Microsoft.JScript.dll" ComponentId="{606C7E2D-D9B0-42D7-8FD1-D5358CA2A65F}" Directory_="ProceduresAssemblies_Dir" Attributes="0" KeyPath="Microsoft.JScript.dll"/>
     <ROW Component="Microsoft.ML.Core.dll" ComponentId="{D74D6AD0-3D56-4335-B2BE-76623F12F431}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ML.Core.dll"/>
@@ -1126,6 +1127,8 @@
     <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICRO~48.DLL|Microsoft.Data.OData.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Twine RSM\Release\Microsoft.Data.OData.dll" SelfReg="false"/>
     <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICRO~49.DLL|Microsoft.Data.Services.Client.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Twine RSM\Release\Microsoft.Data.Services.Client.dll" SelfReg="false"/>
     <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYST~122.DLL|System.Spatial.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Twine RSM\Release\System.Spatial.dll" SelfReg="false"/>
+    <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" FileName="MICROS~2.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Twine RSM\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" SelfReg="false"/>
+    <ROW File="Tango.PPC.Shared.xml" Component_="Dragablz.xml" FileName="TANGOP~1.XML|Tango.PPC.Shared.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Twine RSM\Release\Tango.PPC.Shared.xml" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
     <ROW RemoveFile="_" Options="3"/>
@@ -1137,7 +1140,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\TwineRSM\Release" PackageFileName="Twine RSM v2.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Twine RSM v2.0.3"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\TwineRSM\Release" PackageFileName="Twine Studio v2.0.5" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Twine Studio v2.0.5"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -1704,6 +1707,7 @@
     <ROW Feature_="TwineRSM" Component_="Microsoft.Data.OData.dll"/>
     <ROW Feature_="TwineRSM" Component_="Microsoft.Data.Services.Client.dll"/>
     <ROW Feature_="TwineRSM" Component_="System.Spatial.dll"/>
+    <ROW Feature_="TwineRSM" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
     <ROW Name="Tango.TwineRSM.UI.exe" SourcePath="..\Build\Twine RSM\Release\Tango.TwineRSM.UI.exe" Index="0"/>
@@ -1778,8 +1782,8 @@
     <ROW FileKey="_" Component_="System.Runtime.InteropServices.RuntimeInformation.dll" DirProperty="APPDIR" InstallMode="3"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
-    <ROW Shortcut="TwineRSM" Directory_="DesktopFolder" Name="TWINES~1|Twine RSM" Component_="Tango.TwineRSM.UI.exe" Target="[#Tango.TwineRSM.UI.exe]" Description="Twine Solutions - Twine RSM" Hotkey="0" Icon_="Tango.TwineRSM.UI.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR" Advertised="true"/>
-    <ROW Shortcut="TwineRSM_1" Directory_="SHORTCUTDIR" Name="TWINES~1|Twine RSM" Component_="Tango.TwineRSM.UI.exe" Target="[#Tango.TwineRSM.UI.exe]" Description="Twine Solutions - Twine RSM" Hotkey="0" Icon_="Tango.TwineRSM.UI.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR" Advertised="true"/>
+    <ROW Shortcut="TwineRSM" Directory_="DesktopFolder" Name="TWINES~2|Twine Studio" Component_="Tango.TwineRSM.UI.exe" Target="[#Tango.TwineRSM.UI.exe]" Description="Twine Solutions - Twine Studio" Hotkey="0" Icon_="Tango.TwineRSM.UI.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR" Advertised="true"/>
+    <ROW Shortcut="TwineRSM_1" Directory_="SHORTCUTDIR" Name="TWINES~2|Twine Studio" Component_="Tango.TwineRSM.UI.exe" Target="[#Tango.TwineRSM.UI.exe]" Description="Twine Solutions - Twine Studio" Hotkey="0" Icon_="Tango.TwineRSM.UI.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR" Advertised="true"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
     <ATTRIBUTE name="UsedTheme" value="modern"/>
diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml
index ab4b62ae7..2bb430014 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml
@@ -71,7 +71,7 @@
                 <TextBlock FontWeight="SemiBold">Tango FSE Version:</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=FseVersion.Version}"></TextBlock>
 
-                <TextBlock FontWeight="SemiBold">Twine RSM Version:</TextBlock>
+                <TextBlock FontWeight="SemiBold">Twine Studio Version:</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=TwineRSMVersion.Version}"></TextBlock>
 
                 <TextBlock FontWeight="SemiBold">Machine Service Version:</TextBlock>
diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml
index 546ac31f2..54a3e4876 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml
@@ -51,8 +51,8 @@
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeEurekaDatabaseVersion}" >Upgrade Twine X4 Database Version</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyFSEStorageBlobs}" >Upgrade FSE Blob Storage</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeFSEDatabaseVersion}" >Upgrade FSE Database Version</CheckBox>
-                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyTwineRSMStorageBlobs}" >Upgrade Twine RSM Blob Storage</CheckBox>
-                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeTwineRSMDatabaseVersion}" >Upgrade Twine RSM Database Version</CheckBox>
+                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyTwineRSMStorageBlobs}" >Upgrade Twine Studio Blob Storage</CheckBox>
+                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeTwineRSMDatabaseVersion}" >Upgrade Twine Studio Database Version</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyMachineServiceFiles}" >Upgrade Machine Service</CheckBox>
 
                         <StackPanel Margin="0 5 0 0">
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
index bc8789622..5ab46b176 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml
index 57119d1fe..cb99015a9 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
         xmlns:local="clr-namespace:Tango.FSE.Publisher.UI"
         mc:Ignorable="d"
-        Title="Tango FSE/Twine RSM Publisher" Height="600" Width="400" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}">
+        Title="Tango FSE/Twine Studio Publisher" Height="600" Width="400" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}">
     <Window.Style>
         <Style TargetType="Window">
             <Setter Property="Cursor" Value="Arrow"></Setter>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
index 9793e3c76..e99d6e723 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
@@ -23,7 +23,7 @@ namespace Tango.FSE.UI.Build
 
 #if TS
             CurrentBuild = BuildVariants.TwineRSM;
-            BuildName = "Twine RSM";
+            BuildName = "Twine Studio";
 #endif
         }
     }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
index 3cec668ff..9da4124e6 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango FSE")]
-[assembly: AssemblyVersion("2.0.3.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
index e1cc8225f..b8daaa3f8 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
@@ -457,8 +457,8 @@
                     <Grid>
                         <Grid HorizontalAlignment="Center" >
                             <Image Source="{StaticResource FSE_Twine_Logo_Colored}" RenderOptions.BitmapScalingMode="Fant" Margin="5 5 5 10"></Image>
-                            <TextBlock Visibility="{Binding BuildProvider.IsTwineRSM,Converter={StaticResource BooleanToVisibilityConverter}}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -24 4" FontFamily="{StaticResource hand}" FontWeight="Bold" FontSize="20">
-                                <Run Foreground="#00BEFF">R</Run><Run Foreground="Magenta">S</Run><Run Foreground="Yellow">M</Run>
+                            <TextBlock Visibility="{Binding BuildProvider.IsTwineRSM,Converter={StaticResource BooleanToVisibilityConverter}}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -34 4" FontFamily="{StaticResource hand}" FontWeight="Bold" FontSize="20">
+                                <Run Foreground="#E9E9E9">Studio</Run>
                             </TextBlock>
                         </Grid>
                     </Grid>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs
index 5b5342e41..e711e7d45 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs
@@ -11,7 +11,7 @@ namespace Tango.FSE.Web.Messages
     {
         [Description("Tango FSE")]
         FSE,
-        [Description("Twine RSM")]
+        [Description("Twine Studio")]
         TwineRSM
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/FSEBuildVariants.cs b/Software/Visual_Studio/Tango.BL/Enumerations/FSEBuildVariants.cs
index f4704b76c..4b8ebe509 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/FSEBuildVariants.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/FSEBuildVariants.cs
@@ -11,7 +11,7 @@ namespace Tango.BL.Enumerations
     {
         [Description("Tango FSE")]
         FSE,
-        [Description("Twine RSM")]
+        [Description("Twine Studio")]
         TwineRSM
     }
 }
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
index 9df3a2d11..61d184870 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
@@ -92,7 +92,7 @@ namespace Tango.MachineService.Controllers
 
                 if (request.Build == BuildVariants.TwineRSM && !user.HasPermission(Permissions.TwineRSMAccess))
                 {
-                    throw new AuthenticationException("You do not have permission to access Twine RSM. Please contact your administrator.");
+                    throw new AuthenticationException("You do not have permission to access Twine Studio. Please contact your administrator.");
                 }
 
                 user.LastLogin = DateTime.UtcNow;
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEDownloadsController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEDownloadsController.cs
index 782bef3a2..6e92e1c3c 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEDownloadsController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEDownloadsController.cs
@@ -35,7 +35,7 @@ namespace Tango.MachineService.Controllers
                 var manager = new BlobStorageManager();
                 var container = manager.GetContainer(MachineServiceConfig.FSE_VERSIONS_CONTAINER);
 
-                String appName = ((FSEBuildVariants)build) == FSEBuildVariants.FSE ? "Tango FSE" : "Twine RSM";
+                String appName = ((FSEBuildVariants)build) == FSEBuildVariants.FSE ? "Tango FSE" : "Twine Studio";
 
                 ViewBag.BuildName = appName;
 
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
index 7b9a55380..24888db0b 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
@@ -24,4 +24,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.19.0")]
+[assembly: AssemblyVersion("3.0.20.0")]