diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2025-01-27 10:17:36 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2025-01-27 10:17:36 +0200 |
| commit | a712332e02b8346de626e267b3cba3f819fd3743 (patch) | |
| tree | 4d613806740b6fce84054b51fc8690bebea972ec /Software/Visual_Studio | |
| parent | e204e6ac5d04114778b5b836a3e3707e819ad349 (diff) | |
| download | Tango-a712332e02b8346de626e267b3cba3f819fd3743.tar.gz Tango-a712332e02b8346de626e267b3cba3f819fd3743.zip | |
Allow SMS notifications.
Diffstat (limited to 'Software/Visual_Studio')
21 files changed, 188 insertions, 416 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SettingsView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SettingsView.xaml index c0824eedb..50e1d1d5c 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SettingsView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SettingsView.xaml @@ -51,7 +51,7 @@ <DockPanel Margin="0 20 0 0" ToolTip="Perform UWF activation for protecting the disk by resetting file system changes after each system restart"> <ToggleButton IsChecked="{Binding EditingComposition.Machine.SetupUwf}" /> - <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Activate Disk Protection</TextBlock> + <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Activate Disk Protection (TS-1800)</TextBlock> </DockPanel> <DockPanel Margin="0 20 0 0" ToolTip="Connect the panel PC application to an in-memory emulator (for testing purpose only)"> @@ -59,6 +59,11 @@ <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Use Firmware Emulator (Demo Machine)</TextBlock> </DockPanel> + <DockPanel Margin="0 20 0 0" ToolTip="Enables sending text messages to mobile phones. (requires machine database update)"> + <ToggleButton IsChecked="{Binding EditingComposition.Machine.AllowSmsNotifications}" /> + <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Allow SMS Notifications</TextBlock> + </DockPanel> + <StackPanel Margin="2 40 0 0"> <Separator Margin="0 10" /> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj index 07b3f360f..2e9556b47 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj @@ -271,10 +271,6 @@ <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project> <Name>Tango.SharedUI</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Tango.Synchronization\Tango.Synchronization.csproj"> - <Project>{7ada4e86-cad7-4968-a210-3a8a9e5153ab}</Project> - <Name>Tango.Synchronization</Name> - </ProjectReference> <ProjectReference Include="..\..\..\Tango.Transport\Tango.Transport.csproj"> <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project> <Name>Tango.Transport</Name> @@ -333,7 +329,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.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml index 852e60d0f..2ef48f9b3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml @@ -91,7 +91,7 @@ <TextBlock FontWeight="SemiBold">Setup Remote Assistance</TextBlock> <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupRemoteAssistance}"></ToggleButton> - <TextBlock FontWeight="SemiBold">Setup UWF</TextBlock> + <TextBlock FontWeight="SemiBold">Setup UWF (TS-1800)</TextBlock> <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupUwf}"></ToggleButton> <TextBlock FontWeight="SemiBold">Setup Firmware</TextBlock> @@ -114,6 +114,9 @@ <TextBlock FontWeight="SemiBold">BTSR Installed</TextBlock> <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.BtsrInstalled}"></ToggleButton> + + <TextBlock FontWeight="SemiBold">Allow SMS Notifications</TextBlock> + <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AllowSmsNotifications}"></ToggleButton> </controls:TableGrid> </Grid> </Border> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml index e6a21d826..3728ecf82 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml @@ -396,7 +396,7 @@ </touch:TouchExpander> <!--SMS--> - <touch:TouchExpander Margin="0 20 0 0" Header="SMS Notifications" IsExpanded="True" FontSize="{StaticResource TangoExpanderHeaderFontSize}"> + <touch:TouchExpander Margin="0 20 0 0" Header="SMS Notifications" IsExpanded="True" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Visibility="{Binding MachineProvider.Machine.AllowSmsNotifications,Converter={StaticResource BooleanToVisibilityConverter}}"> <StackPanel> <controls:TableGrid Margin="10" RowHeight="60" MakeFirstColumnVerticalAlignmentBottom="False" TextElement.FontSize="{StaticResource TangoDefaultFontSize}"> <TextBlock VerticalAlignment="Center">Enable Notifications</TextBlock> diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs index 48974eb96..c09e8156e 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs @@ -309,5 +309,13 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// allow sms notifications + /// </summary> + public Boolean AllowSmsNotifications + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs index dcd84d9eb..e7db884b0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs @@ -83,6 +83,8 @@ namespace Tango.BL.Entities public event EventHandler<Int32> MachineTypeChanged; + public event EventHandler<Boolean> AllowSmsNotificationsChanged; + public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; public event EventHandler<SynchronizedObservableCollection<ColorProcessParameter>> ColorProcessParametersChanged; @@ -1066,6 +1068,33 @@ namespace Tango.BL.Entities } } + protected Boolean _allowsmsnotifications; + + /// <summary> + /// Gets or sets the machinebase allow sms notifications. + /// </summary> + + [Column("ALLOW_SMS_NOTIFICATIONS")] + + public Boolean AllowSmsNotifications + { + get + { + return _allowsmsnotifications; + } + + set + { + if (_allowsmsnotifications != value) + { + _allowsmsnotifications = value; + + OnAllowSmsNotificationsChanged(value); + + } + } + } + protected SynchronizedObservableCollection<Cat> _cats; /// <summary> @@ -1640,6 +1669,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the AllowSmsNotifications has changed. + /// </summary> + protected virtual void OnAllowSmsNotificationsChanged(Boolean allowsmsnotifications) + { + AllowSmsNotificationsChanged?.Invoke(this, allowsmsnotifications); + RaisePropertyChanged(nameof(AllowSmsNotifications)); + } + + /// <summary> /// Called when the Cats has changed. /// </summary> protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats) diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs index 415ecaf50..fdf8e81ee 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs @@ -67,6 +67,7 @@ namespace Tango.DAL.Remote.DB public bool BTSR_INSTALLED { get; set; } public string VERSION_TAG { get; set; } public int MACHINE_TYPE { get; set; } + public bool ALLOW_SMS_NOTIFICATIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<CAT> CATS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index be35aea37..4b7448f98 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1010,6 +1010,7 @@ <Property Name="BTSR_INSTALLED" Type="bit" Nullable="false" /> <Property Name="VERSION_TAG" Type="varchar" MaxLength="50" /> <Property Name="MACHINE_TYPE" Type="int" Nullable="false" /> + <Property Name="ALLOW_SMS_NOTIFICATIONS" Type="bit" Nullable="false" /> </EntityType> <EntityType Name="MACHINES_EVENTS"> <Key> @@ -6727,6 +6728,7 @@ <Property Name="BTSR_INSTALLED" Type="Boolean" Nullable="false" /> <Property Name="VERSION_TAG" Type="String" MaxLength="50" FixedLength="false" Unicode="false" /> <Property Name="MACHINE_TYPE" Type="Int32" Nullable="false" /> + <Property Name="ALLOW_SMS_NOTIFICATIONS" Type="Boolean" Nullable="false" /> <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_MACHINES" FromRole="MACHINE" ToRole="CAT" /> <NavigationProperty Name="COLOR_PROCESS_PARAMETERS" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_MACHINES" FromRole="MACHINE" ToRole="COLOR_PROCESS_PARAMETERS" /> <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_MACHINES_CONFIGURATIONS" FromRole="MACHINE" ToRole="CONFIGURATION" /> @@ -10208,6 +10210,7 @@ <EntitySetMapping Name="MACHINES"> <EntityTypeMapping TypeName="RemoteModel.MACHINE"> <MappingFragment StoreEntitySet="MACHINES"> + <ScalarProperty Name="ALLOW_SMS_NOTIFICATIONS" ColumnName="ALLOW_SMS_NOTIFICATIONS" /> <ScalarProperty Name="MACHINE_TYPE" ColumnName="MACHINE_TYPE" /> <ScalarProperty Name="VERSION_TAG" ColumnName="VERSION_TAG" /> <ScalarProperty Name="BTSR_INSTALLED" ColumnName="BTSR_INSTALLED" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 48983b83f..b7c4620bd 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,103 +5,103 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="58"> - <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="47.625" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="53.5" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="80" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="72.375" /> - <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="8.75" PointY="1.125" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="21.125" /> - <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="15.5" /> - <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="12.25" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="36.625" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="25.75" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="32.875" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="9" PointY="30" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="13.5" PointY="21.125" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="15.75" PointY="19.875" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="29.75" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_MEASUREMENTS" Width="1.5" PointX="2.75" PointY="10.125" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="4.75" PointY="10.125" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="34.25" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="59.25" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="48.875" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="17.75" /> - <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="69.75" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="85.875" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="85.25" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69.5" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="44.875" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="45.25" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="29.875" /> - <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="35.25" /> - <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="36.125" /> - <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="10.75" PointY="1.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="90" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="75.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="94" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="79.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="90" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="89" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="75.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="8.5" PointY="68" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="10.75" PointY="68.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="94" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="80.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="75.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="5.5" PointY="85" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="7.75" PointY="71.875" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="42.75" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="36.625" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="11.75" PointY="5.125" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="16.375" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="70.375" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="80.625" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="83.625" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="77.75" /> + <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="6" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="21" /> + <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="42.125" /> + <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="29.5" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="66.125" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="21.75" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="15.25" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="1.5" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="2" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="25.625" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_MEASUREMENTS" Width="1.5" PointX="2.75" PointY="6" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="8.75" PointY="1" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="38.625" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="83.5" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="66.5" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="42.125" /> + <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="86.625" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.75" PointY="105" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="8" PointY="104.375" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="86.5" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="70.125" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="45.375" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="21.5" /> + <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="12.625" /> + <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="12" /> + <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="8.75" PointY="5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="108.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="94.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="98.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="96.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.5" PointY="71.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="8.75" PointY="81.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="109.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="90.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="94.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="89.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="8.5" PointY="77.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="10.75" PointY="86.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="89.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="101.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="91" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="101.125" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="45.25" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="18.75" PointY="1" /> <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="42.375" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="14.25" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="26" /> - <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="26.125" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="12.75" PointY="1.125" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="44.125" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="65.875" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="57.5" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="51.25" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="18.875" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="21.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="39.5" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="39.5" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="5.75" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="60.125" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="32.75" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="7.25" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="21.875" /> + <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="38.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="8.75" PointY="9" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="34.125" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="74.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="74.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="50.5" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="18.625" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="35.625" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="26.25" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="45.875" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="68.375" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="4.5" /> <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.125" /> <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="56.375" /> - <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="5.375" /> - <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="5.5" /> - <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="6" PointY="1.375" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.75" /> - <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21.5" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="56.125" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="56.125" /> - <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="13.75" PointY="5.125" /> + <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="12.25" /> + <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="12.5" /> + <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="5" PointY="13.25" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.625" /> + <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="25.375" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="8.375" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="8.5" /> + <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="14.75" PointY="1" /> <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="25.75" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="26.125" /> - <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="5.875" /> - <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="11.25" PointY="18.5" /> - <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="22.125" /> - <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="8.25" PointY="10.125" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="16" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="39.5" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="13.75" PointY="9.125" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="13.75" PointY="12.125" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="51.25" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="14.75" PointY="1.125" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="15.75" PointY="5.125" /> - <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="8.125" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="11.125" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="1.125" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="16.125" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="37.75" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="39.125" /> - <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="3.75" PointY="1.75" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="13.875" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="26" /> + <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="35.75" /> + <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="18" /> + <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="30.125" /> + <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="33.25" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="30.125" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="56.125" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="10" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="16" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="13.25" PointY="44.125" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="13" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="10.75" PointY="1" /> + <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="14.75" PointY="5" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="20" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="1" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="17" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="15.125" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="16.5" /> + <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="2.75" PointY="13.75" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="35.5" /> <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml Binary files differindex f260ea416..fbfc821a2 100644 --- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml +++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml Binary files differindex fae15d85e..e124666da 100644 --- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml +++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml diff --git a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj index 3fea4faf5..97545eeb5 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj +++ b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj @@ -98,10 +98,6 @@ <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project> <Name>Tango.Core</Name> </ProjectReference> - <ProjectReference Include="..\Tango.DAL.Local\Tango.DAL.Local.csproj"> - <Project>{0e0eef3e-8f4e-4f23-9d19-479fd8d76c12}</Project> - <Name>Tango.DAL.Local</Name> - </ProjectReference> <ProjectReference Include="..\Tango.DAL.Remote\Tango.DAL.Remote.csproj"> <Project>{38197109-8610-4d3f-92b9-16d48df94d7c}</Project> <Name>Tango.DAL.Remote</Name> @@ -126,7 +122,7 @@ </Target> <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/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj index 4d76daabc..ceb9ac7db 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj +++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj @@ -221,10 +221,6 @@ <Project>{58e8825f-0c96-449c-b320-1e82b0aa876b}</Project> <Name>Tango.CSV</Name> </ProjectReference> - <ProjectReference Include="..\Tango.DAL.Local\Tango.DAL.Local.csproj"> - <Project>{0e0eef3e-8f4e-4f23-9d19-479fd8d76c12}</Project> - <Name>Tango.DAL.Local</Name> - </ProjectReference> <ProjectReference Include="..\Tango.DAL.Remote\Tango.DAL.Remote.csproj"> <Project>{38197109-8610-4d3f-92b9-16d48df94d7c}</Project> <Name>Tango.DAL.Remote</Name> @@ -265,10 +261,6 @@ <Project>{e1e66ed9-597d-45fa-8048-de90a6930484}</Project> <Name>Tango.SQLExaminer</Name> </ProjectReference> - <ProjectReference Include="..\Tango.Synchronization\Tango.Synchronization.csproj"> - <Project>{7ada4e86-cad7-4968-a210-3a8a9e5153ab}</Project> - <Name>Tango.Synchronization</Name> - </ProjectReference> <ProjectReference Include="..\Tango.TFS\Tango.TFS.csproj"> <Project>{998f8471-dc1b-41b6-9d96-354e1b4e7a32}</Project> <Name>Tango.TFS</Name> @@ -323,7 +315,7 @@ <Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index a37b4354e..651c55d34 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -48,14 +48,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{59B2E8DA-2D5 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineService", "Web\Tango.MachineService\Tango.MachineService.csproj", "{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Synchronization", "Tango.Synchronization\Tango.Synchronization.csproj", "{7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.ShortcutGenerator.CLI", "Utilities\Tango.ShortcutGenerator.CLI\Tango.ShortcutGenerator.CLI.csproj", "{ADDEEDAF-B45C-4681-8FB7-1C0A0DC63B4B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DAL.Remote", "Tango.DAL.Remote\Tango.DAL.Remote.csproj", "{38197109-8610-4D3F-92B9-16D48DF94D7C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DAL.Local", "Tango.DAL.Local\Tango.DAL.Local.csproj", "{0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Settings", "Tango.Settings\Tango.Settings.csproj", "{D8F1AD85-526A-4F50-B6DC-D437AF63D8D8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Serialization", "Tango.Serialization\Tango.Serialization.csproj", "{22F87980-E990-4686-BE81-BE63D562C4D5}" @@ -2206,126 +2202,6 @@ Global {3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.X1|x64.Build.0 = Release|Any CPU {3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.X1|x86.ActiveCfg = Release|Any CPU {3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.X1|x86.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|Any CPU.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|ARM.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|ARM.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|ARM64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|x64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|x64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|x86.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.AppVeyor|x86.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|ARM.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|ARM64.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|x64.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|x64.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|x86.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Debug|x86.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|Any CPU.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|ARM.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|ARM.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|ARM64.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|ARM64.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|x64.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|x64.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|x86.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka_Debug|x86.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|Any CPU.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|Any CPU.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|ARM.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|ARM.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|ARM64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|ARM64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|x64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|x64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|x86.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Eureka|x86.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|Any CPU.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|Any CPU.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|ARM.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|ARM.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|ARM64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|ARM64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|x64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|x64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|x86.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.0|x86.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|Any CPU.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|ARM.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|ARM.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|ARM64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|ARM64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|x64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|x64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|x86.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.5|x86.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|Any CPU.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|Any CPU.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|ARM.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|ARM.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|ARM64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|ARM64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|x64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|x64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|x86.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release 4.6.1|x86.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|Any CPU.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|ARM.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|ARM.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|ARM64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|ARM64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|x64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|x64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|x86.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.Release|x86.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|Any CPU.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|ARM.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|ARM.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|ARM64.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|ARM64.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|x64.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|x64.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|x86.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS_Debug|x86.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|Any CPU.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|Any CPU.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|ARM.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|ARM.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|ARM64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|ARM64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|x64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|x64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|x86.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.TS|x86.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|Any CPU.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|ARM.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|ARM.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|ARM64.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|ARM64.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|x64.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|x64.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|x86.ActiveCfg = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1_Debug|x86.Build.0 = Debug|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|Any CPU.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|Any CPU.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|ARM.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|ARM.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|ARM64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|ARM64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|x64.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|x64.Build.0 = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|x86.ActiveCfg = Release|Any CPU - {7ADA4E86-CAD7-4968-A210-3A8A9E5153AB}.X1|x86.Build.0 = Release|Any CPU {ADDEEDAF-B45C-4681-8FB7-1C0A0DC63B4B}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU {ADDEEDAF-B45C-4681-8FB7-1C0A0DC63B4B}.AppVeyor|Any CPU.Build.0 = Release|Any CPU {ADDEEDAF-B45C-4681-8FB7-1C0A0DC63B4B}.AppVeyor|ARM.ActiveCfg = Release|Any CPU @@ -2566,126 +2442,6 @@ Global {38197109-8610-4D3F-92B9-16D48DF94D7C}.X1|x64.Build.0 = Release|Any CPU {38197109-8610-4D3F-92B9-16D48DF94D7C}.X1|x86.ActiveCfg = Release|Any CPU {38197109-8610-4D3F-92B9-16D48DF94D7C}.X1|x86.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|Any CPU.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|ARM.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|ARM.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|ARM64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|x64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|x64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|x86.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.AppVeyor|x86.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|ARM.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|ARM64.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|x64.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|x64.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|x86.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Debug|x86.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|Any CPU.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|ARM.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|ARM.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|ARM64.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|ARM64.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|x64.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|x64.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|x86.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka_Debug|x86.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|Any CPU.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|Any CPU.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|ARM.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|ARM.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|ARM64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|ARM64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|x64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|x64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|x86.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Eureka|x86.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|Any CPU.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|Any CPU.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|ARM.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|ARM.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|ARM64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|ARM64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|x64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|x64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|x86.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.0|x86.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|Any CPU.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|ARM.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|ARM.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|ARM64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|ARM64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|x64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|x64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|x86.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.5|x86.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|Any CPU.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|Any CPU.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|ARM.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|ARM.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|ARM64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|ARM64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|x64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|x64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|x86.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release 4.6.1|x86.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|Any CPU.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|ARM.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|ARM.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|ARM64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|ARM64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|x64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|x64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|x86.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.Release|x86.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|Any CPU.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|ARM.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|ARM.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|ARM64.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|ARM64.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|x64.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|x64.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|x86.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS_Debug|x86.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|Any CPU.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|Any CPU.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|ARM.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|ARM.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|ARM64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|ARM64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|x64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|x64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|x86.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.TS|x86.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|Any CPU.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|ARM.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|ARM.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|ARM64.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|ARM64.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|x64.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|x64.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|x86.ActiveCfg = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1_Debug|x86.Build.0 = Debug|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|Any CPU.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|Any CPU.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|ARM.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|ARM.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|ARM64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|ARM64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|x64.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|x64.Build.0 = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|x86.ActiveCfg = Release|Any CPU - {0E0EEF3E-8F4E-4F23-9D19-479FD8D76C12}.X1|x86.Build.0 = Release|Any CPU {D8F1AD85-526A-4F50-B6DC-D437AF63D8D8}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU {D8F1AD85-526A-4F50-B6DC-D437AF63D8D8}.AppVeyor|Any CPU.Build.0 = Release|Any CPU {D8F1AD85-526A-4F50-B6DC-D437AF63D8D8}.AppVeyor|ARM.ActiveCfg = Release|Any CPU @@ -25917,12 +25673,12 @@ Global {04FCA0BA-A64B-4C6A-A011-A94CE335D616} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_UpdateFileVersion = False - BuildVersion_StartDate = 2000/1/1 - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs BuildVersion_UseGlobalSettings = False + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_StartDate = 2000/1/1 + BuildVersion_UpdateFileVersion = False + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} EndGlobalSection EndGlobal diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj index 92537ac83..d7e4a4e5f 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj @@ -72,15 +72,11 @@ <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project> <Name>Tango.Settings</Name> </ProjectReference> - <ProjectReference Include="..\..\Tango.Synchronization\Tango.Synchronization.csproj"> - <Project>{7ada4e86-cad7-4968-a210-3a8a9e5153ab}</Project> - <Name>Tango.Synchronization</Name> - </ProjectReference> </ItemGroup> <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/VSIX/Tango.BuildExtensions/BuildForm.Designer.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.Designer.cs index da3796faf..1f2ca10b7 100644 --- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.Designer.cs +++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.Designer.cs @@ -31,7 +31,6 @@ this.panel1 = new System.Windows.Forms.Panel(); this.btnCancel = new System.Windows.Forms.Button(); this.btnOK = new System.Windows.Forms.Button(); - this.chkBuildSolution = new System.Windows.Forms.CheckBox(); this.chkUpdateAndBuildPMR = new System.Windows.Forms.CheckBox(); this.chkGeneratePMR = new System.Windows.Forms.CheckBox(); this.chkGenerateObservables = new System.Windows.Forms.CheckBox(); @@ -39,7 +38,6 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.chkSQLite = new System.Windows.Forms.CheckBox(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -47,10 +45,8 @@ // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.chkSQLite); this.panel1.Controls.Add(this.btnCancel); this.panel1.Controls.Add(this.btnOK); - this.panel1.Controls.Add(this.chkBuildSolution); this.panel1.Controls.Add(this.chkUpdateAndBuildPMR); this.panel1.Controls.Add(this.chkGeneratePMR); this.panel1.Controls.Add(this.chkGenerateObservables); @@ -96,18 +92,6 @@ this.btnOK.Text = "START"; this.btnOK.UseVisualStyleBackColor = false; // - // chkBuildSolution - // - this.chkBuildSolution.AutoSize = true; - this.chkBuildSolution.Cursor = System.Windows.Forms.Cursors.Arrow; - this.chkBuildSolution.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.chkBuildSolution.Location = new System.Drawing.Point(27, 222); - this.chkBuildSolution.Name = "chkBuildSolution"; - this.chkBuildSolution.Size = new System.Drawing.Size(111, 20); - this.chkBuildSolution.TabIndex = 9; - this.chkBuildSolution.Text = "Build Solution."; - this.chkBuildSolution.UseVisualStyleBackColor = true; - // // chkUpdateAndBuildPMR // this.chkUpdateAndBuildPMR.AutoSize = true; @@ -174,9 +158,9 @@ this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.Location = new System.Drawing.Point(24, 47); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(266, 16); + this.label2.Size = new System.Drawing.Size(261, 16); this.label2.TabIndex = 1; - this.label2.Text = "Select the components you want to initialize."; + this.label2.Text = "Select the components you want to update."; // // label1 // @@ -192,18 +176,6 @@ this.label1.Text = "Tango Build Engine"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // chkSQLite - // - this.chkSQLite.AutoSize = true; - this.chkSQLite.Cursor = System.Windows.Forms.Cursors.Arrow; - this.chkSQLite.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.chkSQLite.Location = new System.Drawing.Point(27, 196); - this.chkSQLite.Name = "chkSQLite"; - this.chkSQLite.Size = new System.Drawing.Size(252, 20); - this.chkSQLite.TabIndex = 12; - this.chkSQLite.Text = "Generate SQLite DB from SQL Server."; - this.chkSQLite.UseVisualStyleBackColor = true; - // // BuildForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -239,9 +211,7 @@ private System.Windows.Forms.CheckBox chkGenerateObservables; private System.Windows.Forms.CheckBox chkGeneratePMR; private System.Windows.Forms.CheckBox chkUpdateAndBuildPMR; - private System.Windows.Forms.CheckBox chkBuildSolution; private System.Windows.Forms.Button btnOK; private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.CheckBox chkSQLite; } }
\ No newline at end of file diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.cs index 86ad94a13..dea7c324e 100644 --- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.cs +++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.cs @@ -41,8 +41,6 @@ namespace Tango.BuildExtensions GenerateAndBuildObservables = chkGenerateObservables.Checked; GenerateAutoPmrMessages = chkGeneratePMR.Checked; UpdateAndBuildPmrMessages = chkUpdateAndBuildPMR.Checked; - GenerateSQLite = chkSQLite.Checked; - BuildSolution = chkBuildSolution.Checked; Close(); } diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs index 2fc9e8249..c378628e5 100644 --- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs +++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs @@ -181,14 +181,13 @@ namespace Tango.BuildExtensions SetVSProgress("Done!"); Wait(1000); CloseVSProgress(); + ShowMessage("Tango Build Completed Successfully!"); + DTE.Solution.Properties.Item("StartupProject").Value = current_startup_project; } catch (Exception ex) { - ShowMessage(ex.Message); - } - finally - { CloseVSProgress(); + ShowMessage($"Tango Build Failed.\n{ex.Message}"); DTE.Solution.Properties.Item("StartupProject").Value = current_startup_project; } }); @@ -227,7 +226,7 @@ namespace Tango.BuildExtensions SetVSProgress("Waiting for EDMX diagram window..."); - _window.WaitTill(() => _window.Get(SearchCriteria.ByText(edmxModelName + " [Diagram1]")) != null); + _window.WaitTill(() => _window.Get(SearchCriteria.ByText(edmxModelName + " [Diagram1]")) != null,TimeSpan.FromSeconds(30)); SetVSProgress("Cleaning up EDMX scheme..."); @@ -341,7 +340,7 @@ namespace Tango.BuildExtensions { SetVSProgress("Adding/Updating file " + Path.GetFileName(file) + "..."); observablesProject.ProjectItems.AddFromFile(file); - Wait(10); + Wait(5); } } diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs index 57bdc2fbf..d1a56138e 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs @@ -842,6 +842,21 @@ namespace Tango.MachineService.Controllers { var response = new SendSMSResponse(); + using (ObservablesContext db = ObservablesWebContext.CreateContext()) + { + var machine = db.Machines.SingleOrDefault(x => x.Guid == RequestToken.Object.MachineGuid); + + if (machine == null) + { + throw new AuthenticationException("The specified machine could not be found."); + } + + if (!machine.AllowSmsNotifications) + { + throw new Exception("This machine is not allowed to send text messages. Please contact your administrator."); + } + } + if (MachineServiceConfig.TWILIO_ENABLE_SMS) { if (MachineServiceConfig.TWILIO_ENABLE_ALPHA_SENDER) diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs index 63cc1a253..7eb0e1e90 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.24.0")] +[assembly: AssemblyVersion("3.0.25.0")] diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index e011cf63c..a027b9f53 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -454,10 +454,6 @@ <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project> <Name>Tango.PMR</Name> </ProjectReference> - <ProjectReference Include="..\..\Tango.Synchronization\Tango.Synchronization.csproj"> - <Project>{7ada4e86-cad7-4968-a210-3a8a9e5153ab}</Project> - <Name>Tango.Synchronization</Name> - </ProjectReference> <ProjectReference Include="..\..\Tango.Transport\Tango.Transport.csproj"> <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project> <Name>Tango.Transport</Name> @@ -510,7 +506,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"> |