Eureka_v2.0.0

6 files changed, 26 insertions, 22 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
index 5f1048363..e67457871 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
@@ -15,10 +15,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="ExtractFilesFirst" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine Solutions LTD"/>
-    <ROW Property="ProductCode" Value="1033:{D9E03B1C-0E45-4D73-8815-3056BF8DDFFF} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{953BE31D-5C69-491D-8F51-A3B4D76384BD} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Twine X4"/>
-    <ROW Property="ProductVersion" Value="1.8.9.0" Type="32" TargetFile="Tango.PPC.UI.exe"/>
+    <ROW Property="ProductVersion" Value="2.0.0.0" Type="32" TargetFile="Tango.PPC.UI.exe"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{4D8FDA03-F63E-4002-9A96-4BDE65B04355}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -64,9 +64,6 @@
     <ROW Component="LiteDB.dll" ComponentId="{19DC3560-1C92-492E-BD9B-DC36E71185B2}" Directory_="APPDIR" Attributes="0" KeyPath="LiteDB.dll"/>
     <ROW Component="Microsoft.AspNet.SignalR.Client.dll" ComponentId="{8359389B-8413-48E3-9361-27D8DB9744EB}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.AspNet.SignalR.Client.dll"/>
     <ROW Component="Microsoft.Azure.ActiveDirectory.GraphClient.dll" ComponentId="{3925347D-F3C9-4305-B16A-0ED7EC469370}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/>
-    <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{FC414C84-8666-4749-9F22-F0479B3D70D4}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/>
-    <ROW Component="Microsoft.Data.OData.dll" ComponentId="{B836386B-C27A-4E01-BD04-328D7D1F62F8}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/>
-    <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{D0889BDA-D48E-46A3-9621-C1C2FB2F15C6}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{33A72E59-DC78-457D-AD80-7BE99191B663}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Component="Microsoft.ServiceBus.dll" ComponentId="{C08F188F-0E73-4FEB-9B56-849D9604E6F4}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ServiceBus.dll"/>
     <ROW Component="Microsoft.SqlServer.ConnectionInfo.dll" ComponentId="{380CCB99-BE98-425C-A111-9BDF520EB71C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.ConnectionInfo.dll"/>
@@ -126,7 +123,6 @@
     <ROW Component="System.Reactive.Interfaces.dll" ComponentId="{F8ADD7D3-7FA5-4D5A-B6AF-7865E656DF18}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Interfaces.dll"/>
     <ROW Component="System.Reactive.Linq.dll" ComponentId="{CB3B39C5-A09D-41C3-BD3D-2418EDEE1B7E}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Linq.dll"/>
     <ROW Component="System.Reactive.PlatformServices.dll" ComponentId="{FD7A1A65-6497-4392-AA5E-032B1CEAAD0B}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.PlatformServices.dll"/>
-    <ROW Component="System.Spatial.dll" ComponentId="{507663DF-0402-4E30-B249-9EA87DC0D281}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/>
     <ROW Component="System.Web.Http.WebHost.dll" ComponentId="{18DD2F13-E03E-4535-BBDF-3621387564FC}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.WebHost.dll"/>
     <ROW Component="System.Web.Http.dll" ComponentId="{02EE2ED8-EDE7-4DDA-BBCE-77D0998E3815}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.dll"/>
     <ROW Component="System.Web.Razor.dll" ComponentId="{58F85C46-451E-4EE8-8CCF-2052C92FDD1A}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Razor.dll"/>
@@ -229,9 +225,6 @@
     <ROW File="Microsoft.AspNet.SignalR.Client.dll" Component_="Microsoft.AspNet.SignalR.Client.dll" FileName="MICROS~1.DLL|Microsoft.AspNet.SignalR.Client.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.AspNet.SignalR.Client.dll" SelfReg="false"/>
     <ROW File="Microsoft.AspNet.SignalR.Client.pdb" Component_="Microsoft.AspNet.SignalR.Client.dll" FileName="MICROS~1.PDB|Microsoft.AspNet.SignalR.Client.pdb" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.AspNet.SignalR.Client.pdb" SelfReg="false"/>
     <ROW File="Microsoft.Azure.ActiveDirectory.GraphClient.dll" Component_="Microsoft.Azure.ActiveDirectory.GraphClient.dll" FileName="MICROS~2.DLL|Microsoft.Azure.ActiveDirectory.GraphClient.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Azure.ActiveDirectory.GraphClient.dll" SelfReg="false"/>
-    <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICROS~3.DLL|Microsoft.Data.Edm.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.Edm.dll" SelfReg="false"/>
-    <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICROS~4.DLL|Microsoft.Data.OData.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.OData.dll" SelfReg="false"/>
-    <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICROS~5.DLL|Microsoft.Data.Services.Client.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.Services.Client.dll" SelfReg="false"/>
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" FileName="MICROS~6.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" SelfReg="false"/>
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" FileName="MICROS~2.PDB|Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" SelfReg="false"/>
     <ROW File="Microsoft.ServiceBus.dll" Component_="Microsoft.ServiceBus.dll" FileName="MICROS~7.DLL|Microsoft.ServiceBus.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.ServiceBus.dll" SelfReg="false"/>
@@ -303,7 +296,6 @@
     <ROW File="System.Reactive.Interfaces.dll" Component_="System.Reactive.Interfaces.dll" FileName="SYSTEM~7.DLL|System.Reactive.Interfaces.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Reactive.Interfaces.dll" SelfReg="false"/>
     <ROW File="System.Reactive.Linq.dll" Component_="System.Reactive.Linq.dll" FileName="SYSTEM~8.DLL|System.Reactive.Linq.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Reactive.Linq.dll" SelfReg="false"/>
     <ROW File="System.Reactive.PlatformServices.dll" Component_="System.Reactive.PlatformServices.dll" FileName="SYSTEM~9.DLL|System.Reactive.PlatformServices.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Reactive.PlatformServices.dll" SelfReg="false"/>
-    <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYSTE~10.DLL|System.Spatial.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Spatial.dll" SelfReg="false"/>
     <ROW File="System.Web.Http.dll" Component_="System.Web.Http.dll" FileName="SYSTE~11.DLL|System.Web.Http.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Web.Http.dll" SelfReg="false"/>
     <ROW File="System.Web.Http.WebHost.dll" Component_="System.Web.Http.WebHost.dll" FileName="SYSTE~12.DLL|System.Web.Http.WebHost.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Web.Http.WebHost.dll" SelfReg="false"/>
     <ROW File="System.Web.Razor.dll" Component_="System.Web.Razor.dll" FileName="SYSTE~13.DLL|System.Web.Razor.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Web.Razor.dll" SelfReg="false"/>
@@ -447,7 +439,6 @@
     <ROW File="Tango.PPC.Updater.exe" Component_="Tango.PPC.Updater.exe" FileName="TANGOP~2.EXE|Tango.PPC.Updater.exe" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.PPC.Updater.exe" SelfReg="false" DigSign="true"/>
     <ROW File="Tango.PPC.Updater.exe.config" Component_="GetVersionTag.bat" FileName="TANGO~11.CON|Tango.PPC.Updater.exe.config" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.PPC.Updater.exe.config" SelfReg="false"/>
     <ROW File="Tango.PPC.Updater.pdb" Component_="Tango.PPC.Updater.exe" FileName="TANGO~15.PDB|Tango.PPC.Updater.pdb" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.PPC.Updater.pdb" SelfReg="false"/>
-    <ROW File="LibGit2Sharp.dll.config" Component_="GetVersionTag.bat" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Attributes="0" SourcePath="..\Build\PPC\Eureka\LibGit2Sharp.dll.config" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
     <ROW BootstrOptKey="GlobalOptions" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites" Options="2"/>
@@ -456,7 +447,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\Eureka" PackageFileName="TwineX4 Installer_v1.8.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v1.8.9"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Eureka" PackageFileName="TwineX4 Installer_v2.0.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v2.0.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -580,9 +571,6 @@
     <ROW Feature_="MainFeature" Component_="LiteDB.dll"/>
     <ROW Feature_="MainFeature" Component_="Microsoft.AspNet.SignalR.Client.dll"/>
     <ROW Feature_="MainFeature" Component_="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/>
-    <ROW Feature_="MainFeature" Component_="Microsoft.Data.Edm.dll"/>
-    <ROW Feature_="MainFeature" Component_="Microsoft.Data.OData.dll"/>
-    <ROW Feature_="MainFeature" Component_="Microsoft.Data.Services.Client.dll"/>
     <ROW Feature_="MainFeature" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Feature_="MainFeature" Component_="Microsoft.ServiceBus.dll"/>
     <ROW Feature_="MainFeature" Component_="Microsoft.SqlServer.ConnectionInfo.dll"/>
@@ -645,7 +633,6 @@
     <ROW Feature_="MainFeature" Component_="System.Reactive.Interfaces.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Reactive.Linq.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Reactive.PlatformServices.dll"/>
-    <ROW Feature_="MainFeature" Component_="System.Spatial.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Web.Http.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Web.Http.WebHost.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Web.Razor.dll"/>
diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
index fcafe6b4a..53e1c79b1 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
@@ -16,10 +16,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{FAD836DF-2182-4041-B746-C0E84C6C284C} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{6FCAB80B-BBF0-4624-AC15-C38B625FC397} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="5.4.0.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="5.7.0.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -845,7 +845,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\Machine Studio\Release" PackageFileName="Machine Studio Installer_v5.4.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v5.4.0"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v5.7.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v5.7.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
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 7bfa0571b..e1e952af9 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("5.4.0.0")]
+[assembly: AssemblyVersion("5.7.0.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>
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml
index e02abdacc..385d3cfd7 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml
@@ -24,5 +24,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <UserName>$machineservice-alpha-beta__MachineService-BETA</UserName>
     <_SavePWD>True</_SavePWD>
     <_DestinationType>AzureWebSite</_DestinationType>
+    <PublishDatabaseSettings>
+      <Objects xmlns="">
+        <ObjectGroup Name="Tango.BL.ObservablesContext" Order="1" Enabled="False">
+          <Destination Path="" />
+          <Object Type="DbCodeFirst">
+            <Source Path="DBContext" DbContext="Tango.BL.ObservablesContext, Tango.BL" Origin="Convention" />
+          </Object>
+        </ObjectGroup>
+      </Objects>
+    </PublishDatabaseSettings>
   </PropertyGroup>
+  <ItemGroup>
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)Tango.BL.ObservablesContext-Web.config Connection String" />
+  </ItemGroup>
+  <ItemGroup>
+    <_ConnectionStringsToInsert Include="Tango.BL.ObservablesContext" />
+  </ItemGroup>
 </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 451706a19..3cb22c5b1 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
@@ -345,6 +345,7 @@
     <Compile Include="Views\FSEDownloads\IndexViewModel.cs" />
     <Content Include="Images\eureka.png" />
     <Content Include="Nswag\DataStoreClient.nswag" />
+    <None Include="Properties\PublishProfiles\Staging.pubxml" />
     <None Include="Security\RefreshTokenEncoder.cs" />
     <None Include="Security\RefreshTokenEntity.cs" />
     <None Include="Security\RefreshTokensManager.cs" />
@@ -506,7 +507,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <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>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">