From 51afc4f6a17383e91a72c2ce060e82604d43c3a8 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 20 Aug 2018 19:43:15 +0300 Subject: Working on new Machine Studio DB. --- .../Tango.MachineStudio.Developer.csproj | 12 +- .../ViewModelLocator.cs | 2 +- .../ViewModels/MainViewVM.cs | 422 ++++++++++++++------- .../Views/JobView.xaml | 2 - .../Views/JobView.xaml.cs | 2 +- .../Views/MachineJobSelectionView.xaml | 271 ++++++------- 6 files changed, 417 insertions(+), 294 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj index bd7484de8..86549a695 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj @@ -196,6 +196,10 @@ {b9ae25d6-be35-492f-9079-21a7f3e6f7cc} RealTimeGraphEx + + {BB2ABB74-BA58-4812-83AA-EC8171F42DF4} + Tango.AutoComplete + {f441feee-322a-4943-b566-110e12fd3b72} Tango.BL @@ -264,10 +268,6 @@ {fc337a7f-1214-41d8-9992-78092a3b961e} Tango.MachineStudio.DataCapture - - {94f7acf8-55e1-4a02-b9bc-a818413fdbbf} - Tango.MachineStudio.DB - {1674f726-0e66-414f-b9fd-c6f20d7f07c7} Tango.MachineStudio.Logging @@ -276,10 +276,6 @@ {d0ce8122-077d-42a2-9490-028ae4769b52} Tango.MachineStudio.MachineDesigner - - {5d39c1e1-3ecd-4634-bd1b-2bcf71c54a15} - Tango.MachineStudio.Technician - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs index ebf2f2446..5f82984a4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs @@ -16,8 +16,8 @@ namespace Tango.MachineStudio.Developer /// static ViewModelLocator() { - TangoIOC.Default.Register(); TangoIOC.Default.Register(); + TangoIOC.Default.Register(); } public static MainViewVM MainViewVM diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index dace2ceac..6ce1a6108 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -41,6 +41,9 @@ using Tango.MachineStudio.Common; using Tango.BL.ColorConversion; using Tango.MachineStudio.Logging.ViewModels; using Tango.MachineStudio.Logging.Views; +using Tango.AutoComplete.Editors; +using System.Data.Entity; +using System.Runtime.ExceptionServices; namespace Tango.MachineStudio.Developer.ViewModels { @@ -48,6 +51,7 @@ namespace Tango.MachineStudio.Developer.ViewModels /// Represents the developer module main view, view model. /// /// + [TangoCreateWhenRegistered] public class MainViewVM : StudioViewModel { private static object _syncLock = new object(); @@ -71,6 +75,7 @@ namespace Tango.MachineStudio.Developer.ViewModels private bool _hiveOpened; private bool _color_changed_from_hive; private bool _dialog_shown; + private bool _disable_gamut_check; #region Properties @@ -104,16 +109,6 @@ namespace Tango.MachineStudio.Developer.ViewModels set { _runningJobStatus = value; RaisePropertyChangedAuto(); } } - private ObservableCollection _machines; - /// - /// Gets or sets the machines. - /// - public ObservableCollection Machines - { - get { return _machines; } - set { _machines = value; RaisePropertyChangedAuto(); } - } - private ObservableCollection _colorSpaces; /// /// Gets or sets the color spaces. @@ -173,19 +168,32 @@ namespace Tango.MachineStudio.Developer.ViewModels get { return _selectedMachine; } set { - _selectedMachine = value; - OnSelectedMachineChanged(); - RaisePropertyChangedAuto(); - InvalidateRelayCommands(); - - if (_selectedMachine != null) + if (value != null && _selectedMachine != value) { - _selectedMachine.Modified -= SelectedMachine_Modified; - _selectedMachine.Modified += SelectedMachine_Modified; + _selectedMachine = value; + OnSelectedMachineChanged(); + RaisePropertyChangedAuto(); + InvalidateRelayCommands(); + + if (_selectedMachine != null) + { + _selectedMachine.Modified -= SelectedMachine_Modified; + _selectedMachine.Modified += SelectedMachine_Modified; + } } } } + private bool _isLoading; + /// + /// Gets or sets a value indicating whether this instance is loading machine. + /// + public bool IsLoading + { + get { return _isLoading; } + set { _isLoading = value; RaisePropertyChangedAuto(); } + } + private List _liquidTypesRmls; /// /// Gets or sets the liquid types RMLS. @@ -248,7 +256,6 @@ namespace Tango.MachineStudio.Developer.ViewModels { _activeJob = value; RaisePropertyChangedAuto(); - OnActiveJobChanged(); } } @@ -322,7 +329,7 @@ namespace Tango.MachineStudio.Developer.ViewModels set { _selectedRML = value; - InvalidateLiquidFactorsAndProcessTables(); + OnSelectedRMLChanged(); RaisePropertyChangedAuto(); InvalidateRelayCommands(); } @@ -504,6 +511,11 @@ namespace Tango.MachineStudio.Developer.ViewModels set { _selectedJobEvent = value; RaisePropertyChangedAuto(); OnSelectedJobEventChanged(); } } + /// + /// Gets or sets the machines providers. + /// + public ISuggestionProvider MachinesProvider { get; set; } + #endregion #region Commands @@ -643,29 +655,6 @@ namespace Tango.MachineStudio.Developer.ViewModels /// The notification provider. public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider diagnosticsFrameProvider, IVideoCaptureProvider videoCaptureProvider, DeveloperNavigationManager navigation, IAuthenticationProvider authentication, IEventLogger eventLogger, ISpeechProvider speech) { - _settings = SettingsManager.Default.GetOrCreate(); - - SelectedJobs = new ObservableCollection(); - - JobEvents = new ObservableCollection(); - - LogManager.Log("Initializing machine Db context..."); - _machineDbContext = ObservablesContext.CreateDefault(); - - Machines = _machineDbContext.Machines.ToObservableCollection(); - - if (_settings.LastSelectedMachineGuid != null) - { - LogManager.Log("Setting last selected machine from settings..."); - SelectedMachine = _machineDbContext.Machines.SingleOrDefault(x => x.Guid == _settings.LastSelectedMachineGuid); - } - - if (_settings.LastSelectedJobGuid != null && SelectedMachine != null) - { - LogManager.Log("Setting last selected job from settings..."); - SelectedMachineJob = SelectedMachine.Jobs.SingleOrDefault(x => x.Guid == _settings.LastSelectedJobGuid); - } - _authentication = authentication; _notification = notificationProvider; @@ -690,8 +679,8 @@ namespace Tango.MachineStudio.Developer.ViewModels SaveLiquidFactorsCommand = new RelayCommand(SaveLiquidFactors, () => SelectedRML != null); AddSegmentCommand = new RelayCommand(AddSegment, () => ActiveJob != null); RemoveSegmentCommand = new RelayCommand(RemoveSelectedSegments, () => SelectedSegment != null); - AddJobCommand = new RelayCommand(AddJob, () => SelectedMachine != null); - RemoveJobCommand = new RelayCommand(RemoveSelectedJobs, () => SelectedMachineJob != null); + AddJobCommand = new RelayCommand(AddJob, () => SelectedMachine != null && !IsLoading); + RemoveJobCommand = new RelayCommand(RemoveSelectedJobs, () => SelectedMachineJob != null && !IsLoading); AddBrushStopCommand = new RelayCommand(AddBrushStop, () => SelectedSegment != null); RemoveBrushStopCommand = new RelayCommand(RemoveSelectedBrushStops, () => SelectedBrushStop != null); SaveJobCommand = new RelayCommand(SaveActiveJob, () => SelectedMachine != null); @@ -700,20 +689,63 @@ namespace Tango.MachineStudio.Developer.ViewModels StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution))); StopJobCommand = new RelayCommand(StopJob, () => IsJobRunning); CloseJobCompletionStatusCommand = new RelayCommand(CloseJobCompletionStatusBar); - LoadJobCommand = new RelayCommand(LoadSelectedJob, () => SelectedMachineJob != null); - DuplicateJobCommand = new RelayCommand(DuplicateSelectedJobs, () => SelectedMachineJob != null); + LoadJobCommand = new RelayCommand(LoadSelectedJob, () => SelectedMachineJob != null && !IsLoading); + DuplicateJobCommand = new RelayCommand(DuplicateSelectedJobs, () => SelectedMachineJob != null && !IsLoading); DuplicateSegmentCommand = new RelayCommand(DuplicateSelectedSegments, () => SelectedSegment != null); DuplicateBrushStopCommand = new RelayCommand(DuplicateSelectedBrushStops, () => SelectedBrushStop != null); SaveProcessParametersCommand = new RelayCommand(SaveProcessParameters, () => SelectedRML != null && SelectedRML.ProcessParametersTablesGroups.Count > 0); PushProcessParametersCommand = new RelayCommand(PushProcessParameters, () => SelectedRML != null && SelectedRML.ProcessParametersTablesGroups.Count > 0 && SelectedProcessParametersTable != null && MachineOperator != null); - ImportEmbroideryFileCommand = new RelayCommand(ImportEmbroideryFile, () => SelectedMachine != null); + ImportEmbroideryFileCommand = new RelayCommand(ImportEmbroideryFile, () => SelectedMachine != null && !IsLoading); DisplayJobEmbroideryFileCommand = new RelayCommand(DisplayJobEmbroideryFile); - ReloadMachinesCommand = new RelayCommand(ReloadMachine); + ReloadMachinesCommand = new RelayCommand(() => LoadMachine()); ApplicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged; _eventLogger.NewLog += _eventLogger_NewLog; + + MachinesProvider = new SuggestionProvider((filter) => + { + try + { + return _machineDbContext.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList(); + } + catch + { + return null; + } + }); + } + + #endregion + + #region Application Ready + + public override void OnApplicationReady() + { + base.OnApplicationReady(); + + _settings = SettingsManager.Default.GetOrCreate(); + + SelectedJobs = new ObservableCollection(); + JobEvents = new ObservableCollection(); + + LogManager.Log("Initializing machine Db context..."); + _machineDbContext = ObservablesContext.CreateDefault(); + _machineDbContext.Configuration.LazyLoadingEnabled = false; + + if (_settings.LastSelectedMachineGuid != null) + { + LogManager.Log("Setting last selected machine from settings..."); + SelectedMachine = _machineDbContext.Machines.SingleOrDefault(x => x.Guid == _settings.LastSelectedMachineGuid); + } + + if (_settings.LastSelectedJobGuid != null && SelectedMachine != null) + { + LogManager.Log("Setting last selected job from settings..."); + SelectedMachineJob = SelectedMachine.Jobs.SingleOrDefault(x => x.Guid == _settings.LastSelectedJobGuid); + } + _colorConversionThread = new Thread(ColorConversionThreadMethod); _colorConversionThread.IsBackground = true; _colorConversionThread.Start(); @@ -723,37 +755,42 @@ namespace Tango.MachineStudio.Developer.ViewModels #region Color Conversion + [HandleProcessCorruptedStateExceptions] private void ColorConversionThreadMethod() { while (true) { - if (IsVisible && ActiveJob != null && ActiveJob.Segments != null) + if (!_disable_gamut_check && IsVisible && ActiveJob != null && ActiveJob.Segments != null) { - var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops).ToList(); - - foreach (var stop in stops) + try { - if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32() && !stop.IsLiquidVolumesOutOfRange) + var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops).ToList(); + + foreach (var stop in stops) { - try + if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32() && !stop.IsLiquidVolumesOutOfRange) { - var output = TangoColorConverter.GetSuggestions(stop); - - stop.Red = output.SingleCoordinates.Red; - stop.Green = output.SingleCoordinates.Green; - stop.Blue = output.SingleCoordinates.Blue; + try + { + var output = TangoColorConverter.GetSuggestions(stop); + + stop.Red = output.SingleCoordinates.Red; + stop.Green = output.SingleCoordinates.Green; + stop.Blue = output.SingleCoordinates.Blue; + } + catch { } } - catch { } - } - else if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.RGB.ToInt32() && !stop.Corrected) - { - try + else if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.RGB.ToInt32() && !stop.Corrected) { - stop.IsOutOfGamut = TangoColorConverter.IsOutOfGamut(stop); + try + { + stop.IsOutOfGamut = TangoColorConverter.IsOutOfGamut(stop); + } + catch { } } - catch { } } } + catch { } } Thread.Sleep(500); @@ -950,9 +987,12 @@ namespace Tango.MachineStudio.Developer.ViewModels if (RmlProcessParametersTableGroup != null && RmlProcessParametersTableGroup.ProcessParametersTables.Count > 0) { LogManager.Log("Process parameters group changed..."); - SelectedProcessParametersTable = RmlProcessParametersTableGroup.ProcessParametersTables.OrderBy(x => x.TableIndex).FirstOrDefault(); - UpdateEstimatedDuration(); + InvokeUI(() => + { + SelectedProcessParametersTable = RmlProcessParametersTableGroup.ProcessParametersTables.OrderBy(x => x.TableIndex).FirstOrDefault(); + UpdateEstimatedDuration(); + }); } } @@ -992,9 +1032,7 @@ namespace Tango.MachineStudio.Developer.ViewModels if (SelectedMachine != null) { LogManager.Log(String.Format("Machine {0} changed.", SelectedMachine.SerialNumber)); - ReloadMachine(); - JobsCollectionView = CollectionViewSource.GetDefaultView(SelectedMachine.Jobs); - JobsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Job.LastUpdated), ListSortDirection.Descending)); + LoadMachine(); } } @@ -1018,19 +1056,6 @@ namespace Tango.MachineStudio.Developer.ViewModels }; } - /// - /// Called when the active job has changed. - /// - protected virtual void OnActiveJobChanged() - { - if (ActiveJob != null) - { - LogManager.Log(String.Format("Active job {0} changed.", ActiveJob.Name)); - SegmentsCollectionView = CollectionViewSource.GetDefaultView(ActiveJob.Segments); - SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending)); - } - } - #endregion #region Drag & Drop @@ -1301,7 +1326,12 @@ namespace Tango.MachineStudio.Developer.ViewModels { LogManager.Log(String.Format("Saving liquid factors for RML {0}...", SelectedRML.Name)); await SelectedRML.SaveAsync(_activeJobDbContext); - InvalidateLiquidFactorsAndProcessTables(); + LiquidTypesRmls = ActiveJob.Machine.Configuration.NoneEmptyIdsPacks.Where(x => !x.IsEmpty).OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList(); + + if (SelectedSegment != null) + { + SetSegmentBrushStopsLiquidVolumes(SelectedSegment); + } } } } @@ -1323,7 +1353,10 @@ namespace Tango.MachineStudio.Developer.ViewModels if (SelectedRML != null && SelectedMachine != null) { LogManager.Log("Invalidating liquid factors, process parameters and process group history..."); - LiquidTypesRmls = SelectedMachine.Configuration.NoneEmptyIdsPacks.Where(x => !x.IsEmpty).OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList(); + LiquidTypesRmls = ActiveJob.Machine.Configuration.NoneEmptyIdsPacks.Where(x => !x.IsEmpty).OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList(); + + _activeJobDbContext.ProcessParametersTablesGroups.Where(x => x.RmlGuid == SelectedRML.Guid).Include(x => x.ProcessParametersTables).ToList(); + RmlProcessParametersTableGroup = SelectedRML.ProcessParametersTablesGroups.ToList().SingleOrDefault(x => x.Active); var selectedHistory = RmlProcessParametersTableGroup; @@ -1334,11 +1367,26 @@ namespace Tango.MachineStudio.Developer.ViewModels RmlProcessParametersTableGroup.ProcessParametersTables = RmlProcessParametersTableGroup.ProcessParametersTables.OrderBy(x => x.TableIndex).ToObservableCollection(); } - GroupsHistory = SelectedRML.ProcessParametersTablesGroups.OrderByDescending(x => x.SaveDate).OrderBy(x => !x.Active).ToObservableCollection(); + GroupsHistory = SelectedRML.ProcessParametersTablesGroups.OrderByDescending(x => x.SaveDate).OrderBy(x => !x.Active).ToObservableCollection(); _selectedGroupHistory = selectedHistory; - RaisePropertyChangedAuto(nameof(SelectedGroupHistory)); + InvokeUI(() => + { + RaisePropertyChanged(nameof(SelectedGroupHistory)); + RaisePropertyChanged(nameof(RmlProcessParametersTableGroup)); + }); + } + } + + private async void OnSelectedRMLChanged() + { + using (_notification.PushTaskItem("Loading RML...")) + { + await Task.Factory.StartNew(() => + { + InvalidateLiquidFactorsAndProcessTables(); + }); } } @@ -1417,62 +1465,86 @@ namespace Tango.MachineStudio.Developer.ViewModels /// /// Loads the selected job. /// - private void LoadSelectedJob() + private async void LoadSelectedJob() { if (SelectedMachineJob != null) { using (_notification.PushTaskItem("Loading job details...")) { - LogManager.Log(String.Format("Loading job {0}...", SelectedMachineJob.Name)); - SelectedSegments = new ObservableCollection(); - SelectedBrushStops = new ObservableCollection(); - SelectedRML = null; - SelectedSegment = null; - SelectedGroupHistory = null; - SelectedBrushStop = null; - SelectedProcessParametersTable = null; - RmlProcessParametersTableGroup = null; + await Task.Factory.StartNew(() => + { + _disable_gamut_check = true; + LogManager.Log(String.Format("Loading job {0}...", SelectedMachineJob.Name)); + SelectedSegments = new ObservableCollection(); + SelectedBrushStops = new ObservableCollection(); + SelectedRML = null; + SelectedSegment = null; + SelectedGroupHistory = null; + SelectedBrushStop = null; + SelectedProcessParametersTable = null; + RmlProcessParametersTableGroup = null; - _blockInvalidateCommands = false; + _blockInvalidateCommands = false; - LogManager.Log("Creating active job DB context..."); - _activeJobDbContext = ObservablesContext.CreateDefault(); - _activeJobDbContext.Configuration.LazyLoadingEnabled = true; + LogManager.Log("Creating active job DB context..."); + _activeJobDbContext = ObservablesContext.CreateDefault(); + _activeJobDbContext.Configuration.LazyLoadingEnabled = false; - LogManager.Log("Initializing available color spaces, RMLs & Winding methods..."); - var processParamsGroups = _activeJobDbContext.ProcessParametersTablesGroups.ToList(); - var processParams = _activeJobDbContext.ProcessParametersTables.ToList(); - ColorSpaces = _activeJobDbContext.ColorSpaces.ToObservableCollection(); - Rmls = _activeJobDbContext.Rmls.ToObservableCollection(); - WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection(); - SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection(); + LogManager.Log("Initializing available color spaces, RMLs & Winding methods..."); + //var processParamsGroups = _activeJobDbContext.ProcessParametersTablesGroups.ToList(); + //var processParams = _activeJobDbContext.ProcessParametersTables.ToList(); - LogManager.Log("Setting active job..."); - _activeJob = _activeJobDbContext.Jobs.SingleOrDefault(x => x.Guid == SelectedMachineJob.Guid); + ColorSpaces = _activeJobDbContext.ColorSpaces.ToObservableCollection(); + Rmls = _activeJobDbContext.Rmls.ToObservableCollection(); + WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection(); + SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection(); - _selectedRML = ActiveJob.Rml; + LogManager.Log("Setting active job..."); + ActiveJob = _activeJobDbContext.Jobs.Include(x => x.Rml).Include(x => x.Segments).Include(x => x.Segments.Select(y => y.BrushStops)).SingleOrDefault(x => x.Guid == SelectedMachineJob.Guid); - LogManager.Log("Setting selected segment..."); - _selectedSegment = ActiveJob.Segments.FirstOrDefault(); + _activeJobDbContext.Ccts.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList(); + _activeJobDbContext.Cats.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList(); + _activeJobDbContext.Machines.SingleOrDefault(x => x.Guid == ActiveJob.MachineGuid); + _activeJobDbContext.Configurations.SingleOrDefault(x => x.Guid == ActiveJob.Machine.ConfigurationGuid); - ActiveJob.LengthChanged -= ActiveJob_LengthChanged; - ActiveJob.LengthChanged += ActiveJob_LengthChanged; + _activeJobDbContext.LiquidTypesRmls.ToList(); - ActiveJob = _activeJob; + _activeJobDbContext.IdsPackFormulas.ToList(); + _activeJobDbContext.LiquidTypes.ToList(); + _activeJobDbContext.MidTankTypes.ToList(); + _activeJobDbContext.DispenserTypes.ToList(); - SelectedRML = _selectedRML; - SelectedSegment = _selectedSegment; + _activeJobDbContext.IdsPacks.Where(x => x.ConfigurationGuid == ActiveJob.Machine.ConfigurationGuid).ToList(); - UpdateEstimatedDuration(); - _blockInvalidateCommands = false; - InvalidateRelayCommands(); + + LogManager.Log("Setting selected segment..."); + _selectedSegment = ActiveJob.Segments.FirstOrDefault(); + + ActiveJob.LengthChanged -= ActiveJob_LengthChanged; + ActiveJob.LengthChanged += ActiveJob_LengthChanged; + + _selectedRML = ActiveJob.Rml; + InvalidateLiquidFactorsAndProcessTables(); + RaisePropertyChanged(nameof(SelectedRML)); + + UpdateEstimatedDuration(); + + _blockInvalidateCommands = false; + InvalidateRelayCommands(); + + _disable_gamut_check = false; + }); + + SegmentsCollectionView = CollectionViewSource.GetDefaultView(ActiveJob.Segments); + SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending)); + + SelectedSegment = _selectedSegment; UIHelper.DoEvents(); _navigation.NavigateTo(DeveloperNavigationView.JobView); - } } } @@ -1480,20 +1552,43 @@ namespace Tango.MachineStudio.Developer.ViewModels /// /// Saves the active job. /// - private void SaveActiveJob() + private async void SaveActiveJob() { if (ActiveJob != null) { using (_notification.PushTaskItem("Saving job details...")) { - LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name)); - ActiveJob.LastUpdated = DateTime.UtcNow; - ActiveJob.Rml = SelectedRML; - ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds; - - _activeJobDbContext.SaveChanges(); - ReloadMachine(); - SelectedMachineJob = SelectedMachine.Jobs.SingleOrDefault(x => x.Guid == ActiveJob.Guid); + await Task.Factory.StartNew(() => + { + LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name)); + ActiveJob.LastUpdated = DateTime.UtcNow; + ActiveJob.Rml = SelectedRML; + ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds; + _activeJobDbContext.SaveChanges(); + + _machineDbContext.Entry(SelectedMachineJob).Reload(); + + + _machineDbContext.Entry(SelectedMachineJob).Collection(x => x.Segments).Load(); + + foreach (var segment in SelectedMachineJob.Segments.ToList()) + { + _machineDbContext.Entry(segment).Collection(x => x.BrushStops).Load(); + + foreach (var brushStop in segment.BrushStops.ToList()) + { + _machineDbContext.Entry(brushStop).Reload(); + } + + _machineDbContext.Entry(segment).Reload(); + } + + InvokeUI(() => + { + SelectedMachineJob.Segments = SelectedMachineJob.Segments; + }); + + }); } } } @@ -1527,19 +1622,51 @@ namespace Tango.MachineStudio.Developer.ViewModels #region Private Methods - private void ReloadMachine() + private async void LoadMachine() { - LogManager.Log("Reloading selected machine..."); - _machineDbContext.Dispose(); - _machineDbContext = ObservablesContext.CreateDefault(); - _machineDbContext.Configuration.LazyLoadingEnabled = true; - String machineGuid = _selectedMachine.Guid; - Machines = _machineDbContext.Machines.ToObservableCollection(); - _selectedMachine = Machines.SingleOrDefault(x => x.Guid == machineGuid); - RaisePropertyChanged(nameof(SelectedMachine)); + try + { + LogManager.Log("Loading selected machine..."); + + IsLoading = true; + + using (_notification.PushTaskItem("Loading selected machine...")) + { + await _machineDbContext.Jobs.Where(x => x.MachineGuid == SelectedMachine.Guid).Include(x => x.User).Include(x => x.User.Contact).LoadAsync(); + await _machineDbContext.Configurations.SingleOrDefaultAsync(x => x.Guid == SelectedMachine.ConfigurationGuid); + + await _machineDbContext.ColorSpaces.LoadAsync(); + + SelectedMachine.Configuration.IdsPacks.EnableCrossThreadOperations(); + + await _machineDbContext.IdsPacks.OrderBy(x => x.PackIndex).Where(x => x.ConfigurationGuid == SelectedMachine.ConfigurationGuid). + Include(x => x.CartridgeType). + Include(x => x.DispenserType). + Include(x => x.LiquidType). + Include(x => x.IdsPackFormula). + Include(x => x.MidTankType).LoadAsync(); + + RaisePropertyChanged(nameof(SelectedMachine)); - JobsCollectionView = CollectionViewSource.GetDefaultView(SelectedMachine.Jobs); - JobsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Job.LastUpdated), ListSortDirection.Descending)); + JobsCollectionView = CollectionViewSource.GetDefaultView(SelectedMachine.Jobs); + JobsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Job.LastUpdated), ListSortDirection.Descending)); + } + + IsLoading = false; + + foreach (var job in SelectedMachine.Jobs.OrderByDescending(x => x.LastUpdated)) + { + if (IsLoading) break; + job.Segments.EnableCrossThreadOperations(); + await _machineDbContext.Segments.Where(x => x.JobGuid == job.Guid).Include(x => x.BrushStops).OrderBy(x => x.SegmentIndex).LoadAsync(); + } + } + catch (Exception ex) + { + LogManager.Log(ex); + _notification.ShowError("An error occurred while trying to load the selected machine."); + IsLoading = false; + } } private void UpdateEstimatedDuration() @@ -1557,7 +1684,7 @@ namespace Tango.MachineStudio.Developer.ViewModels LogManager.Log("Setting segment brush stops liquid volumes..."); foreach (var stop in segment.BrushStops) { - stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable); + stop.SetLiquidVolumes(ActiveJob.Machine.Configuration, SelectedRML, SelectedProcessParametersTable); } } } @@ -1713,14 +1840,15 @@ namespace Tango.MachineStudio.Developer.ViewModels newJob.Rml = _machineDbContext.Rmls.FirstOrDefault(); newJob.WindingMethod = _machineDbContext.WindingMethods.FirstOrDefault(); newJob.SpoolType = _machineDbContext.SpoolTypes.FirstOrDefault(); + newJob.ColorSpace = _machineDbContext.ColorSpaces.FirstOrDefault(); newJob.Machine = SelectedMachine; SelectedMachine.Jobs.Add(newJob); + newJob.AddSolidSegment(); LogManager.Log("Saving selected machine to database..."); await SelectedMachine.SaveAsync(_machineDbContext); SelectedMachineJob = newJob; LoadSelectedJob(); - AddSegment(); } } } @@ -1769,7 +1897,7 @@ namespace Tango.MachineStudio.Developer.ViewModels stop.OffsetPercent = 100; stop.Segment = SelectedSegment; - stop.ColorSpace = _activeJobDbContext.ColorSpaces.FirstOrDefault(); + stop.ColorSpace = ColorSpaces.FirstOrDefault(); stop.Color = Colors.Black; stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable); SelectedSegment.BrushStops.Add(stop); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 1b96b27ce..368f615a0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -11,11 +11,9 @@ xmlns:hive="clr-namespace:Tango.Hive;assembly=Tango.Hive" xmlns:automation="clr-namespace:Tango.MachineStudio.Common.Automation;assembly=Tango.MachineStudio.Common" xmlns:sys="clr-namespace:System;assembly=mscorlib" - xmlns:techViews="clr-namespace:Tango.MachineStudio.Technician.Views;assembly=Tango.MachineStudio.Technician" xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker" xmlns:dispensing="clr-namespace:Tango.BL.Dispensing;assembly=Tango.BL" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" - xmlns:db="clr-namespace:Tango.MachineStudio.DB.Views.DBViews;assembly=Tango.MachineStudio.DB" xmlns:commonControls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common" xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" xmlns:designer="clr-namespace:Tango.MachineStudio.MachineDesigner.Views;assembly=Tango.MachineStudio.MachineDesigner" diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs index bb17a502d..2942d36af 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs @@ -64,7 +64,7 @@ namespace Tango.MachineStudio.Developer.Views if (_vm != null && _vm.ActiveJob != null) { List segments = new List(); - foreach (var s in _vm.ActiveJob.Segments) + foreach (var s in _vm.ActiveJob.Segments.OrderBy(x => x.SegmentIndex)) { segments.Add(s); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml index c151b62bc..71e8f6b11 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml @@ -6,6 +6,7 @@ xmlns:global="clr-namespace:Tango.MachineStudio.Developer" xmlns:designer="clr-namespace:Tango.MachineStudio.MachineDesigner.Views;assembly=Tango.MachineStudio.MachineDesigner" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" xmlns:automation="clr-namespace:Tango.MachineStudio.Common.Automation;assembly=Tango.MachineStudio.Common" xmlns:localConverters="clr-namespace:Tango.MachineStudio.Developer.Converters" xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels" @@ -13,6 +14,7 @@ xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:commonControls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common" xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views" mc:Ignorable="d" x:Name="control" d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> @@ -23,6 +25,7 @@ + @@ -36,20 +39,20 @@ TARGET MACHINE - + - - + + - - + + /// The server file path. /// if set to true will try to connect to an .mdf file. - public ObservablesContext(String path, String dbName) : base(ComposeConnectionString(path, dbName)) + public ObservablesContext(DataSource dataSource) : base(dataSource.ToConnection(), true) { Database.SetInitializer(null); } /// - /// Initializes a new instance of the class. + /// Creates a default remote database context by the address specified in . /// - /// The SQLite connection. - public ObservablesContext(SQLiteConnection sqliteConnection) : base(sqliteConnection, true) + /// + public static ObservablesContext CreateDefault() { - Database.SetInitializer(null); + return new ObservablesContext(SettingsManager.Default.GetOrCreate().DataSource); } /// - /// Composes the connection string. - /// - /// The source. - /// if set to true [is file]. + /// Creates a default remote database context. + /// /// - private static String ComposeConnectionString(String source, String dbName) + public static ObservablesContext CreateDefault(DataSource dataSource) { - if (!File.Exists(source)) - { - return "Server=tcp:twine.database.windows.net,1433;Initial Catalog=Tango;Persist Security Info=False;User ID=roy@twine-s.com;Password=Maya039590898;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Authentication=\"Active Directory Password\";"; - } - else - { - return String.Format("Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFileName={0};Initial Catalog={1};Integrated Security=True;MultipleActiveResultSets=True;App=EntityFramework", Path.GetFullPath(source), dbName); - } + return new ObservablesContext(dataSource); } /// - /// Creates a default remote database context by the address specified in . + /// Creates a default remote database context. /// /// - public static ObservablesContext CreateDefault() + public static ObservablesContext CreateDefault(String address, String catalog, DataSourceType type) { - var context = CreateDefault(SettingsManager.Default.GetOrCreate().DataBaseSource); - return context; + return new ObservablesContext(new DataSource() + { + Address = address, + Catalog = catalog, + IntegratedSecurity = true, + Type = type + }); } /// /// Creates a default remote database context. /// /// - public static ObservablesContext CreateDefault(String dataSource) + public static ObservablesContext CreateDefault(String address, DataSourceType type) { - var source = dataSource; - - if (File.Exists(source) && Path.GetExtension(source).ToLower() == ".db") - { - var connection = new SQLiteConnection() - { - ConnectionString = new SQLiteConnectionStringBuilder() { DataSource = Path.GetFullPath(source), ForeignKeys = true }.ConnectionString - }; - - return new ObservablesContext(connection); - } - else - { - return new ObservablesContext(source, "Tango"); - } + return CreateDefault(address, "Tango", type); } /// /// Creates a default remote database context. /// /// - public static ObservablesContext CreateDefault(String address, String database) + public static ObservablesContext CreateDefault(String address) { - return new ObservablesContext(address, database); + return CreateDefault(address, "Tango", DataSourceType.SQLServer); } /// diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 650ce4b58..e35a128e0 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -8,7 +8,7 @@ library Tango.BL Tango.BL - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj index 6cde62c7b..13655c3ce 100644 --- a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj +++ b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj @@ -9,7 +9,7 @@ Properties Tango.BrushPicker Tango.BrushPicker - v4.6 + v4.7.2 512 SAK SAK diff --git a/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj b/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj index 7a2417457..f6bd6e949 100644 --- a/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj +++ b/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj @@ -9,7 +9,7 @@ Properties Tango.CSV Tango.CSV - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj index 09042eca0..658b0a0b0 100644 --- a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj +++ b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj @@ -10,7 +10,7 @@ Properties Tango.CircularGauge Tango.CircularGauge - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj index 7ba9d27fc..071f8b5a6 100644 --- a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj +++ b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj @@ -9,7 +9,7 @@ Properties Tango.ColorPicker Tango.ColorPicker - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Core/App.config b/Software/Visual_Studio/Tango.Core/App.config new file mode 100644 index 000000000..a8da70bc0 --- /dev/null +++ b/Software/Visual_Studio/Tango.Core/App.config @@ -0,0 +1,20 @@ + + + + +
+ + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.Core/CoreSettings.cs b/Software/Visual_Studio/Tango.Core/CoreSettings.cs index 2f40d0ef0..b9ce9412b 100644 --- a/Software/Visual_Studio/Tango.Core/CoreSettings.cs +++ b/Software/Visual_Studio/Tango.Core/CoreSettings.cs @@ -10,21 +10,21 @@ namespace Tango.Core public class CoreSettings : SettingsBase { /// - /// Gets or sets the default data base source. + /// Gets or sets the default SQL data base source. /// - public static String DefaultDataBaseSource { get; set; } + public static DataSource DefaultDataSource { get; set; } /// - /// Gets or sets the SQL server address. + /// Gets or sets the SQL data source. /// - public String DataBaseSource { get; set; } + public DataSource DataSource { get; set; } /// /// Initializes the class. /// static CoreSettings() { - DefaultDataBaseSource = "localhost\\SQLEXPRESS"; + DefaultDataSource = new DataSource(); } /// @@ -32,7 +32,7 @@ namespace Tango.Core /// public CoreSettings() { - DataBaseSource = DefaultDataBaseSource; + DataSource = DefaultDataSource; } } } diff --git a/Software/Visual_Studio/Tango.Core/DataSource.cs b/Software/Visual_Studio/Tango.Core/DataSource.cs new file mode 100644 index 000000000..fb46faa2e --- /dev/null +++ b/Software/Visual_Studio/Tango.Core/DataSource.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.Data.Common; +using System.Data.SqlClient; +using System.Data.SQLite; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Core +{ + /// + /// Represents an SQL data source. + /// + public class DataSource + { + /// + /// Gets or sets the type of source. + /// + public DataSourceType Type { get; set; } + + /// + /// Gets or sets the address. + /// + public String Address { get; set; } + + /// + /// Gets or sets the catalog name. + /// + public String Catalog { get; set; } + + /// + /// Gets or sets a value indicating whether to use integrated security. + /// + public bool IntegratedSecurity { get; set; } + + /// + /// Gets or sets the user name to use if is false. + /// + public String UserName { get; set; } + + /// + /// Gets or sets the password to use if is false. + /// + public String Password { get; set; } + + /// + /// Initializes a new instance of the class. + /// + public DataSource() + { + Type = DataSourceType.SQLServer; + Address = "localhost\\SQLEXPRESS"; + Catalog = "Tango"; + IntegratedSecurity = true; + UserName = String.Empty; + Password = String.Empty; + } + + /// + /// Creates a DBConnection instance which represents this data source. + /// + /// + public DbConnection ToConnection() + { + switch (Type) + { + case DataSourceType.SQLite: + + var connection = new SQLiteConnection() + { + ConnectionString = new SQLiteConnectionStringBuilder() { DataSource = Path.GetFullPath(Address), ForeignKeys = true }.ConnectionString + }; + return connection; + + case DataSourceType.MDF: + + if (IntegratedSecurity) + { + return new SqlConnection(String.Format("Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFileName={0};Initial Catalog={1};Integrated Security=True;MultipleActiveResultSets=True;App=EntityFramework", Path.GetFullPath(Address), Catalog)); + } + else + { + return new SqlConnection(String.Format("Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFileName={0};Initial Catalog={1};Integrated Security=False;User Id={2};Password={3};MultipleActiveResultSets=True;App=EntityFramework", Path.GetFullPath(Address), Catalog, UserName, Password)); + } + + case DataSourceType.SQLServer: + + if (IntegratedSecurity) + { + return new SqlConnection(String.Format("Data Source={0};Initial Catalog={1};Integrated Security=True;", Address, Catalog)); + } + else + { + return new SqlConnection(String.Format("Data Source={0};Initial Catalog={1};Integrated Security=False;User Id={2};Password={3};", Address, Catalog, UserName, Password)); + } + + case DataSourceType.Azure: + + if (IntegratedSecurity) + { + //var provider = new Microsoft.IdentityModel.Clients(); + + SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(); + + builder.DataSource = Address; + builder.InitialCatalog = Catalog; + builder.UserID = UserName; + builder.TrustServerCertificate = true; + builder.ConnectTimeout = 15; + builder.Pooling = false; + + builder.Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive; + + SqlConnection sqlConnection = new SqlConnection(builder.ConnectionString); + + return sqlConnection; + } + else + { + return new SqlConnection(String.Format("Server=tcp:{0},1433;Initial Catalog={1};Persist Security Info=False;User ID={2};Password={3};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Authentication=\"Active Directory Password\";", Address, Catalog, UserName, Password)); + } + + default: + + return null; + } + } + } +} diff --git a/Software/Visual_Studio/Tango.Core/DataSourceType.cs b/Software/Visual_Studio/Tango.Core/DataSourceType.cs new file mode 100644 index 000000000..c447dd5eb --- /dev/null +++ b/Software/Visual_Studio/Tango.Core/DataSourceType.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Core +{ + /// + /// Represents an SQL data source type. + /// + public enum DataSourceType + { + /// + /// Microsoft SQL Server. + /// + SQLServer, + /// + /// Microsoft SQL .mdf file. + /// + MDF, + /// + /// Azure SQL Database. + /// + Azure, + /// + /// SQLite database file. + /// + SQLite + } +} diff --git a/Software/Visual_Studio/Tango.Core/Properties/Resources.Designer.cs b/Software/Visual_Studio/Tango.Core/Properties/Resources.Designer.cs index 4f47c533a..29ed0e72b 100644 --- a/Software/Visual_Studio/Tango.Core/Properties/Resources.Designer.cs +++ b/Software/Visual_Studio/Tango.Core/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Tango.Core.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj index 14058bd3b..7b44cb540 100644 --- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj +++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj @@ -9,9 +9,11 @@ Properties Tango.Core Tango.Core - v4.6 + v4.7.2 512 + + true @@ -31,6 +33,12 @@ 4 + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll @@ -43,17 +51,27 @@ ..\packages\SimpleValidator.0.6.1.0\lib\net40\SimpleValidator.dll + + + ..\packages\System.Data.SQLite.Core.1.0.108.0\lib\net46\System.Data.SQLite.dll + + + ..\packages\System.Data.SQLite.EF6.1.0.108.0\lib\net46\System.Data.SQLite.EF6.dll + + + ..\packages\System.Data.SQLite.Linq.1.0.108.0\lib\net46\System.Data.SQLite.Linq.dll + + - @@ -73,6 +91,8 @@ + + @@ -99,6 +119,7 @@ + @@ -154,7 +175,14 @@ - + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Core/packages.config b/Software/Visual_Studio/Tango.Core/packages.config index a9ac483b5..1da7b8d76 100644 --- a/Software/Visual_Studio/Tango.Core/packages.config +++ b/Software/Visual_Studio/Tango.Core/packages.config @@ -1,7 +1,12 @@  + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj index b8051c108..9bcc7f849 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj +++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj @@ -9,7 +9,7 @@ Properties Tango.DAL.Local Tango.DAL.Local - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs b/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs index a492df462..5905a0f7e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs @@ -20,36 +20,9 @@ namespace Tango.DAL.Remote.DB ///
/// The server file path. /// if set to true will try to connect to an .mdf file. - public RemoteDB(String path, bool isFile) : base(ComposeConnectionString(path, isFile)) + public RemoteDB(DataSource dataSource) : base(dataSource.ToConnection(), true) { } - - /// - /// Composes the connection string. - /// - /// The source. - /// if set to true [is file]. - /// - private static String ComposeConnectionString(String source, bool isFile) - { - if (!isFile) - { - return String.Format("metadata=res://*/DB.RemoteADO.csdl|res://*/DB.RemoteADO.ssdl|res://*/DB.RemoteADO.msl;provider=System.Data.SqlClient;provider connection string=\"data source={0};initial catalog=Tango;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework\"", source); - } - else - { - return null; - } - } - - /// - /// Creates a default remote database context by the address specified in . - /// - /// - public static RemoteDB CreateDefault() - { - return new RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false); - } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index 3ab4194f9..c242d3837 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -9,7 +9,7 @@ Properties Tango.DAL.Remote Tango.DAL.Remote - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj index f688f005b..cbfd9c79b 100644 --- a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj +++ b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj @@ -8,7 +8,7 @@ library Tango.Documents Tango.Documents - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj index 41c31954a..7f72ffcc0 100644 --- a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj +++ b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj @@ -9,7 +9,7 @@ Properties Tango.DragAndDrop Tango.DragAndDrop - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj index b0f6184ae..613e6df7e 100644 --- a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj +++ b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj @@ -8,7 +8,7 @@ library Tango.Editors Tango.Editors - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj b/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj index c68b620a1..4054ab567 100644 --- a/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj @@ -8,7 +8,7 @@ library Tango.EmbroideryUI Tango.EmbroideryUI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.EmbroideryUI/app.config b/Software/Visual_Studio/Tango.EmbroideryUI/app.config index 462d17b27..72700d700 100644 --- a/Software/Visual_Studio/Tango.EmbroideryUI/app.config +++ b/Software/Visual_Studio/Tango.EmbroideryUI/app.config @@ -42,6 +42,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj index ec7315668..05be1077a 100644 --- a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj +++ b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj @@ -9,7 +9,7 @@ Properties Tango.Emulations Tango.Emulations - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj b/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj index bda3d1d85..21aea4a42 100644 --- a/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj +++ b/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj @@ -9,7 +9,7 @@ Properties Tango.Hive Tango.Hive - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj index 035bbbe1f..a89bb0a6f 100644 --- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj +++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj @@ -9,7 +9,7 @@ Properties Tango.Integration Tango.Integration - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj index cdc5e56ba..69a47819a 100644 --- a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj +++ b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj @@ -9,7 +9,7 @@ Properties Tango.Logging Tango.Logging - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 0609b7bff..4090031e9 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -9,7 +9,7 @@ Properties Tango.PMR Tango.PMR - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj index 1b1abc9f4..bf01bc079 100644 --- a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj +++ b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj @@ -9,7 +9,7 @@ Properties Tango.Protobuf Tango.Protobuf - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj b/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj index cfa6aa282..a00259c58 100644 --- a/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj +++ b/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj @@ -9,7 +9,7 @@ Properties Tango.SQLExaminer Tango.SQLExaminer - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj index b6503101c..66cf56c98 100644 --- a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj +++ b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj @@ -9,7 +9,7 @@ Properties Tango.Scripting Tango.Scripting - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Tango.Scripting/app.config b/Software/Visual_Studio/Tango.Scripting/app.config index 8766b29db..3a5d80ead 100644 --- a/Software/Visual_Studio/Tango.Scripting/app.config +++ b/Software/Visual_Studio/Tango.Scripting/app.config @@ -42,6 +42,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj index 91cac4c16..c9ec3cd12 100644 --- a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj +++ b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj @@ -9,7 +9,7 @@ Properties Tango.Serialization Tango.Serialization - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj index 1f6596c0d..e4aafab3d 100644 --- a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj +++ b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj @@ -9,7 +9,7 @@ Properties Tango.Settings Tango.Settings - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj index a17b66caf..1ecb8bc2f 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj +++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj @@ -8,7 +8,7 @@ library Tango.SharedUI Tango.SharedUI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.SharedUI/app.config b/Software/Visual_Studio/Tango.SharedUI/app.config index 462d17b27..5e8c3436a 100644 --- a/Software/Visual_Studio/Tango.SharedUI/app.config +++ b/Software/Visual_Studio/Tango.SharedUI/app.config @@ -42,6 +42,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj index f270043c1..acc658e16 100644 --- a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj +++ b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj @@ -9,7 +9,7 @@ Properties Tango.Stubs Tango.Stubs - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Stubs/app.config b/Software/Visual_Studio/Tango.Stubs/app.config index 5d794b958..8924e52e3 100644 --- a/Software/Visual_Studio/Tango.Stubs/app.config +++ b/Software/Visual_Studio/Tango.Stubs/app.config @@ -46,6 +46,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBSynchronizer.cs b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBSynchronizer.cs index 79c719d0e..778a24b86 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBSynchronizer.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBSynchronizer.cs @@ -32,7 +32,7 @@ namespace Tango.Synchronization.Remote sqlite.ClearDataBase(); } - using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { using (var localDB = new local.LocalDB(sqliteDbFile)) { diff --git a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj index e02b737ab..6150888da 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj +++ b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj @@ -9,7 +9,7 @@ Properties Tango.Synchronization Tango.Synchronization - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj index f34892c4e..0d84fa56e 100644 --- a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj +++ b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj @@ -8,7 +8,7 @@ library Tango.TFS Tango.TFS - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj index 3b66f6c61..4a9b7c7aa 100644 --- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj +++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj @@ -8,7 +8,7 @@ library Tango.Touch Tango.Touch - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Touch/app.config b/Software/Visual_Studio/Tango.Touch/app.config index 462d17b27..72700d700 100644 --- a/Software/Visual_Studio/Tango.Touch/app.config +++ b/Software/Visual_Studio/Tango.Touch/app.config @@ -42,6 +42,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj index 608538578..c0d37b76c 100644 --- a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj +++ b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj @@ -9,7 +9,7 @@ Properties Tango.Transport Tango.Transport - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs index 305849694..0ea7b59ef 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs @@ -17,7 +17,7 @@ namespace Tango.UnitTesting { String guid = Guid.NewGuid().ToString(); - using (var db = new DAL.Remote.DB.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var db = new DAL.Remote.DB.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { var action = new DAL.Remote.DB.ACTION_TYPES(); action.CODE = 1; @@ -30,7 +30,7 @@ namespace Tango.UnitTesting db.SaveChanges(); } - using (var db = new DAL.Remote.DB.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var db = new DAL.Remote.DB.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { var action = db.ACTION_TYPES.Single(x => x.GUID == guid); db.ACTION_TYPES.Remove(action); @@ -67,7 +67,7 @@ namespace Tango.UnitTesting [TestMethod] public void Validate_SQLite_Connection_Using_Observables() { - using (ObservablesContext db = ObservablesContext.CreateDefault(@"D:\Development\Tango\Software\DB\Tango.db")) + using (ObservablesContext db = ObservablesContext.CreateDefault(@"D:\Development\Tango\Software\DB\Tango.db", DataSourceType.SQLite)) { var actions = db.ActionTypes.ToList(); } diff --git a/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs index 5ab70938c..5b7ce16ca 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs @@ -9,6 +9,7 @@ using System.Text; using System.Threading.Tasks; using Tango.BL; using Tango.BL.Entities; +using Tango.Core; using Tango.Core.DB; using Tango.Core.IO; using Tango.SQLExaminer; @@ -274,7 +275,7 @@ namespace Tango.UnitTesting String job_guid = String.Empty; - using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", target_db)) + using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", target_db, DataSourceType.SQLServer)) { context.Configuration.LazyLoadingEnabled = false; Assert.IsTrue(context.Machines.Count() == 1); @@ -323,13 +324,13 @@ namespace Tango.UnitTesting Assert.IsTrue(data_report.HasDifferences); //Check the new job exists on source.. - using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", source_db)) + using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", source_db, DataSourceType.SQLServer)) { Assert.IsTrue(context.Jobs.Any(x => x.Guid == job_guid)); } //Now change configuration in source and push to machine - using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", source_db)) + using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", source_db, DataSourceType.SQLServer)) { var machine = context.Machines.SingleOrDefault(x => x.SerialNumber == machine_serial_number); machine.Configuration.Name = "Test Name " + new Random().Next(0, 1000); diff --git a/Software/Visual_Studio/Tango.UnitTesting/Synchronization_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/Synchronization_TST.cs index e4bbcaf51..d6713c2ac 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Synchronization_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/Synchronization_TST.cs @@ -21,7 +21,7 @@ namespace Tango.UnitTesting { var console = Helper.InitializeLogging(true); - using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { using (var localDB = new local.LocalDB(Helper.GetSQLiteFilePath())) { @@ -45,7 +45,7 @@ namespace Tango.UnitTesting [TestMethod] public void Generate_Demo_Remote_Machine() { - using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { var organization = new remote.ORGANIZATION() { diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj index 0bf97caa6..7a37655a8 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj +++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj @@ -9,7 +9,7 @@ Properties Tango.UnitTesting Tango.UnitTesting - v4.6 + v4.7.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 15.0 diff --git a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj index e485ce615..d60bf3f88 100644 --- a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj +++ b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj @@ -8,7 +8,7 @@ library Tango.Video Tango.Video - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj index 337b91faa..682b64c39 100644 --- a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj +++ b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj @@ -9,7 +9,7 @@ Properties Tango.Visuals Tango.Visuals - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.WiFi/Tango.WiFi.csproj b/Software/Visual_Studio/Tango.WiFi/Tango.WiFi.csproj index 8b6231a3d..22d1e4d4d 100644 --- a/Software/Visual_Studio/Tango.WiFi/Tango.WiFi.csproj +++ b/Software/Visual_Studio/Tango.WiFi/Tango.WiFi.csproj @@ -10,7 +10,7 @@ Properties Tango.WiFi Tango.WiFi - v4.6 + v4.7.2 diff --git a/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj b/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj index d799e8231..0ace0d37b 100644 --- a/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj +++ b/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj @@ -8,7 +8,7 @@ Exe Tango.BugReporter Tango.BugReporter - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj index 85e4e5687..8eac3890f 100644 --- a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj @@ -8,7 +8,7 @@ Exe Tango.CatalogGenerator Tango.CatalogGenerator - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/App.config b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/App.config index 92aa00bf9..a9e16aebe 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/App.config @@ -13,4 +13,12 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs index b76b73715..59bfed1bd 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs @@ -33,7 +33,7 @@ namespace Tango.DBObservablesGenerator.CLI List dbDescriptions = new List(); //Get column descriptions... - using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { db.Configuration.LazyLoadingEnabled = false; db.Database.Connection.Open(); @@ -135,7 +135,7 @@ namespace Tango.DBObservablesGenerator.CLI //Generate Entities... //Generate Enumerations... - using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { foreach (var tableProp in db.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsGenericType)) { @@ -324,7 +324,7 @@ namespace Tango.DBObservablesGenerator.CLI //Generate Entities... //Generate Enumerations... - using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { foreach (var tableProp in db.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsGenericType)) { diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj index 3b2e82a0b..e76ec0836 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.DBObservablesGenerator.CLI dbobgen - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/App.config b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/App.config index 0715f3c37..cfaef6c7d 100644 --- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/App.config +++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/App.config @@ -45,6 +45,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj index b059730b3..f8237bc27 100644 --- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj @@ -8,7 +8,7 @@ WinExe Tango.EmbroideryViewer Tango.EmbroideryViewer - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj index cbc88d4b2..8845ab479 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj @@ -8,7 +8,7 @@ Exe Tango.EventsTypesGenerator Tango.EventsTypesGenerator - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj index d7cae7a29..45e68cc70 100644 --- a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj @@ -8,7 +8,7 @@ Exe Tango.HashGenerator Tango.HashGenerator - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/App.config b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/App.config index 0715f3c37..cfaef6c7d 100644 --- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/App.config @@ -45,6 +45,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj index b751815ce..685abb122 100644 --- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.ILMerge.UI Tango.ILMerge.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/App.config b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/App.config index ada51894a..8adf1a638 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/App.config @@ -53,6 +53,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj index 8df299f0e..28f1bf6fa 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.MachineEM.UI Tango.MachineEM.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj index 543fab734..7026fe389 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.PMRGenerator.CLI Tango.PMRGenerator.CLI - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj index e2119e7b1..54e3bb0b1 100644 --- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj @@ -8,7 +8,7 @@ Exe Tango.PortsListGenerator Tango.PortsListGenerator - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj index d51e2c019..84bd48950 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.Protobuf.CLI proto-tc - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/App.config b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/App.config index 6a26aa552..b53d37a13 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/App.config @@ -45,6 +45,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj index 3ae824d59..37952e03c 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.Protobuf.UI TangoProtoGUI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/App.config b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/App.config index c06036970..3c5b5ff38 100644 --- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/App.config @@ -4,5 +4,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj index df2fc762a..afada30e0 100644 --- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.RemoteRunner.UI Tango.RemoteRunner.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/App.config b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/App.config index 92aa00bf9..a9e16aebe 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/App.config @@ -13,4 +13,12 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs index b254833a6..b971621ab 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs @@ -41,7 +41,7 @@ namespace Tango.SQLiteGenerator.CLI bool completed = false; - String connectionString = SettingsManager.Default.GetOrCreate().DataBaseSource; + String connectionString = SettingsManager.Default.GetOrCreate().DataSource.ToConnection().ConnectionString; Console.WriteLine("Connecting to " + connectionString + "..."); @@ -49,7 +49,7 @@ namespace Tango.SQLiteGenerator.CLI List sync_configurations = new List(); - using (RemoteDB db = RemoteDB.CreateDefault()) + using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { sync_configurations = db.SYNC_CONFIGURATIONS.ToList(); } 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 2fe5bf15d..a49870aff 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 @@ -8,7 +8,7 @@ Exe Tango.SQLiteGenerator.CLI sqlitegen - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj index 70f711bba..15736ba8f 100644 --- a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.ShortcutGenerator.CLI linkgen - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj index 3ed5b46b2..785f8af54 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.Stubs.CLI stubexec - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config index be1387189..e42f12838 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config @@ -49,6 +49,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj index e2f57e4c6..0dd165bb4 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.Stubs.UI StubsExecutionGUI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/App.config b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/App.config index d14be49eb..adc853f50 100644 --- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/App.config @@ -49,6 +49,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj index 89d7aa2f9..831db6598 100644 --- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.TransportRouter.UI Tango.TransportRouter.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/App.config b/Software/Visual_Studio/Utilities/Tango.UITests/App.config index f6e6de0cc..77c59fc95 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/App.config +++ b/Software/Visual_Studio/Utilities/Tango.UITests/App.config @@ -56,6 +56,10 @@ + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj b/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj index a89b67dfb..593b1ecd3 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj +++ b/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj @@ -8,7 +8,7 @@ WinExe Tango.UITests Tango.UITests - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj index ccc33aac4..f2aee8e22 100644 --- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj +++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj @@ -40,7 +40,7 @@ Properties Tango.BuildExtensions Tango.BuildExtensions - v4.6 + v4.7.2 true true true diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index 87d50b99d..bc05f04bc 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -15,7 +15,7 @@ Properties Tango.MachineService Tango.MachineService - v4.6 + v4.7.2 false true -- cgit v1.3.1 From 5c58e6499306b3087015758c1054497dccc407e6 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 21 Aug 2018 13:05:37 +0300 Subject: Done with Developer Module. Implemented DB auth using Azure Active Directory Interactive! --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 15400960 -> 15400960 bytes .../ViewModels/MainViewVM.cs | 82 +++++++++++++-------- .../Views/MachineJobSelectionView.xaml | 6 +- .../ViewModels/EventsViewVM.cs | 2 +- .../AutoComplete/MachinesProvider.cs | 2 +- .../Tango.MachineStudio.UI/App.config | 8 ++ .../ViewModels/MachineSerialViewVM.cs | 2 +- .../Connection/DefaultMachineProvider.cs | 2 +- .../PPC/Tango.PPC.Common/PPCViewModel.cs | 4 +- Software/Visual_Studio/PPC/Tango.PPC.UI/App.config | 8 ++ .../DefaultAuthenticationProvider.cs | 2 +- .../Tango.BL/EntitiesExtensions/MachineEvent.cs | 2 +- .../Visual_Studio/Tango.BL/ObservableEntity.cs | 21 +----- .../Tango.BL/ObservablesEntitiesAdapter.cs | 1 + .../Tango.BL/ObservablesStaticCollections.cs | 4 + .../ActiveDirectoryAuthenticationProvider.cs | 36 +++++++++ Software/Visual_Studio/Tango.Core/DataSource.cs | 10 ++- .../Visual_Studio/Tango.Core/Tango.Core.csproj | 9 ++- Software/Visual_Studio/Tango.Core/packages.config | 1 + .../Diagnostics/DiagnosticsFileEvent.cs | 6 +- .../ExternalBridge/ExternalBridgeTcpClient.cs | 2 +- .../ExternalBridge/ExternalBridgeUsbClient.cs | 2 +- .../Visual_Studio/Tango.UnitTesting/App.config | 8 ++ .../Utilities/Tango.BugReporter/App.config | 8 ++ 25 files changed, 160 insertions(+), 68 deletions(-) create mode 100644 Software/Visual_Studio/Tango.Core/ActiveDirectoryAuthenticationProvider.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 6f1996b74..6d427fd5e 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 4c2759132..38010497b 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 6ce1a6108..9eaa56870 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -184,14 +184,14 @@ namespace Tango.MachineStudio.Developer.ViewModels } } - private bool _isLoading; + private bool _canWork; /// /// Gets or sets a value indicating whether this instance is loading machine. /// - public bool IsLoading + public bool CanWork { - get { return _isLoading; } - set { _isLoading = value; RaisePropertyChangedAuto(); } + get { return _canWork; } + set { _canWork = value; RaisePropertyChangedAuto(); } } private List _liquidTypesRmls; @@ -655,6 +655,8 @@ namespace Tango.MachineStudio.Developer.ViewModels /// The notification provider. public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider diagnosticsFrameProvider, IVideoCaptureProvider videoCaptureProvider, DeveloperNavigationManager navigation, IAuthenticationProvider authentication, IEventLogger eventLogger, ISpeechProvider speech) { + CanWork = true; + _authentication = authentication; _notification = notificationProvider; @@ -673,31 +675,31 @@ namespace Tango.MachineStudio.Developer.ViewModels }); //Initialize Commands... - EditMachineCommand = new RelayCommand(EditMachine, () => SelectedMachine != null); - EditRMLCommand = new RelayCommand(EditRML, () => SelectedRML != null); + EditMachineCommand = new RelayCommand(EditMachine, () => SelectedMachine != null && CanWork); + EditRMLCommand = new RelayCommand(EditRML, () => SelectedRML != null && CanWork); ToggleSideBarCommand = new RelayCommand(() => IsSideBarOpened = !IsSideBarOpened); - SaveLiquidFactorsCommand = new RelayCommand(SaveLiquidFactors, () => SelectedRML != null); - AddSegmentCommand = new RelayCommand(AddSegment, () => ActiveJob != null); - RemoveSegmentCommand = new RelayCommand(RemoveSelectedSegments, () => SelectedSegment != null); - AddJobCommand = new RelayCommand(AddJob, () => SelectedMachine != null && !IsLoading); - RemoveJobCommand = new RelayCommand(RemoveSelectedJobs, () => SelectedMachineJob != null && !IsLoading); - AddBrushStopCommand = new RelayCommand(AddBrushStop, () => SelectedSegment != null); - RemoveBrushStopCommand = new RelayCommand(RemoveSelectedBrushStops, () => SelectedBrushStop != null); - SaveJobCommand = new RelayCommand(SaveActiveJob, () => SelectedMachine != null); - DiscardJobCommand = new RelayCommand(BackToJobs, () => SelectedMachine != null); - StartJobCommand = new RelayCommand(StartJob, () => ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution))); + SaveLiquidFactorsCommand = new RelayCommand(SaveLiquidFactors, () => SelectedRML != null && CanWork); + AddSegmentCommand = new RelayCommand(AddSegment, () => ActiveJob != null && CanWork); + RemoveSegmentCommand = new RelayCommand(RemoveSelectedSegments, () => SelectedSegment != null && CanWork); + AddJobCommand = new RelayCommand(AddJob, () => SelectedMachine != null && CanWork); + RemoveJobCommand = new RelayCommand(RemoveSelectedJobs, () => SelectedMachineJob != null && CanWork); + AddBrushStopCommand = new RelayCommand(AddBrushStop, () => SelectedSegment != null && CanWork); + RemoveBrushStopCommand = new RelayCommand(RemoveSelectedBrushStops, () => SelectedBrushStop != null && CanWork); + SaveJobCommand = new RelayCommand(SaveActiveJob, () => SelectedMachine != null && CanWork); + DiscardJobCommand = new RelayCommand(BackToJobs, () => SelectedMachine != null && CanWork); + StartJobCommand = new RelayCommand(StartJob, () => ActiveJob != null && CanWork && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution))); StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution))); - StopJobCommand = new RelayCommand(StopJob, () => IsJobRunning); + StopJobCommand = new RelayCommand(StopJob, () => IsJobRunning && CanWork); CloseJobCompletionStatusCommand = new RelayCommand(CloseJobCompletionStatusBar); - LoadJobCommand = new RelayCommand(LoadSelectedJob, () => SelectedMachineJob != null && !IsLoading); - DuplicateJobCommand = new RelayCommand(DuplicateSelectedJobs, () => SelectedMachineJob != null && !IsLoading); - DuplicateSegmentCommand = new RelayCommand(DuplicateSelectedSegments, () => SelectedSegment != null); - DuplicateBrushStopCommand = new RelayCommand(DuplicateSelectedBrushStops, () => SelectedBrushStop != null); - SaveProcessParametersCommand = new RelayCommand(SaveProcessParameters, () => SelectedRML != null && SelectedRML.ProcessParametersTablesGroups.Count > 0); - PushProcessParametersCommand = new RelayCommand(PushProcessParameters, () => SelectedRML != null && SelectedRML.ProcessParametersTablesGroups.Count > 0 && SelectedProcessParametersTable != null && MachineOperator != null); - ImportEmbroideryFileCommand = new RelayCommand(ImportEmbroideryFile, () => SelectedMachine != null && !IsLoading); - DisplayJobEmbroideryFileCommand = new RelayCommand(DisplayJobEmbroideryFile); - ReloadMachinesCommand = new RelayCommand(() => LoadMachine()); + LoadJobCommand = new RelayCommand(LoadSelectedJob, () => SelectedMachineJob != null && CanWork); + DuplicateJobCommand = new RelayCommand(DuplicateSelectedJobs, () => SelectedMachineJob != null && CanWork); + DuplicateSegmentCommand = new RelayCommand(DuplicateSelectedSegments, () => SelectedSegment != null && CanWork); + DuplicateBrushStopCommand = new RelayCommand(DuplicateSelectedBrushStops, () => SelectedBrushStop != null && CanWork); + SaveProcessParametersCommand = new RelayCommand(SaveProcessParameters, () => SelectedRML != null && CanWork && SelectedRML.ProcessParametersTablesGroups.Count > 0); + PushProcessParametersCommand = new RelayCommand(PushProcessParameters, () => SelectedRML != null && CanWork && SelectedRML.ProcessParametersTablesGroups.Count > 0 && SelectedProcessParametersTable != null && MachineOperator != null); + ImportEmbroideryFileCommand = new RelayCommand(ImportEmbroideryFile, () => SelectedMachine != null && CanWork); + DisplayJobEmbroideryFileCommand = new RelayCommand(DisplayJobEmbroideryFile, () => CanWork); + ReloadMachinesCommand = new RelayCommand(() => LoadMachine(), () => CanWork); ApplicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged; @@ -1322,6 +1324,8 @@ namespace Tango.MachineStudio.Developer.ViewModels { if (SelectedRML != null) { + CanWork = false; + using (_notification.PushTaskItem("Saving Liquid Factors...")) { LogManager.Log(String.Format("Saving liquid factors for RML {0}...", SelectedRML.Name)); @@ -1333,6 +1337,8 @@ namespace Tango.MachineStudio.Developer.ViewModels SetSegmentBrushStopsLiquidVolumes(SelectedSegment); } } + + CanWork = true; } } @@ -1423,6 +1429,8 @@ namespace Tango.MachineStudio.Developer.ViewModels if (response == null) return; + CanWork = false; + using (_notification.PushTaskItem("Saving Parameters Group...")) { LogManager.Log(String.Format("Saving process parameters group under the name {0}...", response)); @@ -1456,6 +1464,8 @@ namespace Tango.MachineStudio.Developer.ViewModels InvalidateLiquidFactorsAndProcessTables(); } + + CanWork = true; } #endregion @@ -1469,6 +1479,8 @@ namespace Tango.MachineStudio.Developer.ViewModels { if (SelectedMachineJob != null) { + CanWork = false; + using (_notification.PushTaskItem("Loading job details...")) { await Task.Factory.StartNew(() => @@ -1546,6 +1558,8 @@ namespace Tango.MachineStudio.Developer.ViewModels UIHelper.DoEvents(); _navigation.NavigateTo(DeveloperNavigationView.JobView); } + + CanWork = true; } } @@ -1556,6 +1570,8 @@ namespace Tango.MachineStudio.Developer.ViewModels { if (ActiveJob != null) { + CanWork = false; + using (_notification.PushTaskItem("Saving job details...")) { await Task.Factory.StartNew(() => @@ -1590,6 +1606,8 @@ namespace Tango.MachineStudio.Developer.ViewModels }); } + + CanWork = true; } } @@ -1628,7 +1646,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { LogManager.Log("Loading selected machine..."); - IsLoading = true; + CanWork = false; using (_notification.PushTaskItem("Loading selected machine...")) { @@ -1652,11 +1670,11 @@ namespace Tango.MachineStudio.Developer.ViewModels JobsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Job.LastUpdated), ListSortDirection.Descending)); } - IsLoading = false; + CanWork = true; foreach (var job in SelectedMachine.Jobs.OrderByDescending(x => x.LastUpdated)) { - if (IsLoading) break; + if (!CanWork) break; job.Segments.EnableCrossThreadOperations(); await _machineDbContext.Segments.Where(x => x.JobGuid == job.Guid).Include(x => x.BrushStops).OrderBy(x => x.SegmentIndex).LoadAsync(); } @@ -1665,7 +1683,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { LogManager.Log(ex); _notification.ShowError("An error occurred while trying to load the selected machine."); - IsLoading = false; + CanWork = true; } } @@ -1949,6 +1967,8 @@ namespace Tango.MachineStudio.Developer.ViewModels { using (_notification.PushTaskItem("Cloning selected jobs...")) { + CanWork = false; + LogManager.LogFormat("Duplicating {0} jobs...", SelectedJobs.Count); int index = SelectedMachine.Jobs.Max(x => x.JobIndex); @@ -1962,6 +1982,8 @@ namespace Tango.MachineStudio.Developer.ViewModels LogManager.Log("Saving selected machine to database..."); await SelectedMachine.SaveAsync(_machineDbContext); + + CanWork = true; } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml index 71e8f6b11..279a9daf3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml @@ -39,11 +39,11 @@ TARGET MACHINE - + - + @@ -130,7 +130,7 @@ - + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BreakSensorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BreakSensorElementEditor.xaml index 18c992193..78834aca7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BreakSensorElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BreakSensorElementEditor.xaml @@ -27,7 +27,7 @@ - + @@ -38,7 +38,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml index 346c0067b..de604625d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml @@ -28,7 +28,7 @@ - + @@ -99,7 +99,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DancerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DancerElementEditor.xaml index 3c6ee7d49..2960a8807 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DancerElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DancerElementEditor.xaml @@ -27,7 +27,7 @@ - + @@ -38,7 +38,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalInElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalInElementEditor.xaml index 8c72798d5..5c1cfc3ad 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalInElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalInElementEditor.xaml @@ -27,7 +27,7 @@ - + @@ -51,7 +51,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalOutElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalOutElementEditor.xaml index 5fd92c336..862fa0597 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalOutElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DigitalOutElementEditor.xaml @@ -28,7 +28,7 @@ - + @@ -62,7 +62,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml index 0a088df69..1fa1c6c48 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml @@ -45,7 +45,7 @@ - + @@ -254,7 +254,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/JobRunnerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/JobRunnerElementEditor.xaml index c481f1e1b..76a6a16a7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/JobRunnerElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/JobRunnerElementEditor.xaml @@ -42,7 +42,7 @@ - + @@ -239,7 +239,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MeterElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MeterElementEditor.xaml index 98ace7816..2631f3a06 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MeterElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MeterElementEditor.xaml @@ -28,7 +28,7 @@ - + @@ -47,7 +47,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorElementEditor.xaml index 8f66adeeb..a39fa975c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorElementEditor.xaml @@ -27,7 +27,7 @@ - + @@ -55,7 +55,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml index 48186fd56..80bfe8f96 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml @@ -47,7 +47,7 @@ - + @@ -243,7 +243,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml index 64ed5bb43..3adee13d6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml @@ -47,7 +47,7 @@ - + @@ -229,7 +229,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml index 9bc22d0f6..dcba1e77b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml @@ -43,7 +43,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/PidElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/PidElementEditor.xaml index 6d4f49ace..197640b14 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/PidElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/PidElementEditor.xaml @@ -27,7 +27,7 @@ - + @@ -38,7 +38,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ProcessParametersElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ProcessParametersElementEditor.xaml index 716ac0a2d..f057521e0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ProcessParametersElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ProcessParametersElementEditor.xaml @@ -31,7 +31,7 @@ - + @@ -73,7 +73,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml index 16f94b251..a9eb9e9f4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml @@ -43,7 +43,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SpeedSensorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SpeedSensorElementEditor.xaml index b9dce9112..8696a3c53 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SpeedSensorElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SpeedSensorElementEditor.xaml @@ -27,7 +27,7 @@ - + @@ -38,7 +38,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml index 3bac433ad..6e2315dc8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml @@ -47,7 +47,7 @@ - + @@ -158,7 +158,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/WinderElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/WinderElementEditor.xaml index f81597574..2b6ee303d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/WinderElementEditor.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/WinderElementEditor.xaml @@ -27,7 +27,7 @@ - + @@ -38,7 +38,22 @@ - + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index 8b331b5f5..f96960883 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -41,7 +41,7 @@ namespace Tango.MachineStudio.Technician.ViewModels /// /// /// - public class MachineTechViewVM : StudioViewModel + public class MachineTechViewVM : StudioViewModel { private List _diagnoticsMonitorsDataProperties; private IDiagnosticsFrameProvider _diagnosticsFrameProvider; @@ -1572,6 +1572,11 @@ namespace Tango.MachineStudio.Technician.ViewModels }); } + public override void OnApplicationReady() + { + + } + #endregion #region Hardware Configuration diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml.cs index b60f4d725..977974f8a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml.cs @@ -59,7 +59,7 @@ namespace Tango.MachineStudio.Technician.Views private void OnActionModeClicked(object sender, MouseButtonEventArgs e) { - editor.DeselectElements(); + //editor.DeselectElements(); } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs index 56888e631..a5ef4f095 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs @@ -17,7 +17,7 @@ using System.Data.Entity; namespace Tango.MachineStudio.UsersAndRoles.ViewModels { - public class MainViewVM : StudioViewModel + public class MainViewVM : StudioViewModel { private ObservablesContext _organizationsContext; private ObservablesContext _manageContext; @@ -146,7 +146,6 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels public override void OnApplicationReady() { - base.OnApplicationReady(); LoadOrganizations(); } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioViewModel.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioViewModel.cs index 76cc0433c..be0906fc4 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioViewModel.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioViewModel.cs @@ -3,24 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using static Tango.SharedUI.Controls.NavigationControl; namespace Tango.MachineStudio.Common { /// /// Represents a Machine Studio view model. /// - public interface IStudioViewModel + public interface IStudioViewModel : INavigationViewModel { - /// - /// Called when the user has navigated in to the module. - /// - void OnNavigatedTo(); - - /// - /// Called when the user has navigated out of the module. - /// - void OnNavigatedFrom(); - /// /// Called when application is shutting down. /// @@ -33,12 +24,6 @@ namespace Tango.MachineStudio.Common /// Task OnShutdownRequest(); - /// - /// Called when another module has wants to navigate to this module with some arguments. - /// - /// The arguments. - void OnModuleRequest(params object[] args); - /// /// Called when the application has been started /// diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationBlocker.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationBlocker.cs new file mode 100644 index 000000000..abd6db172 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationBlocker.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.Common.Navigation +{ + /// + /// Represents an object which can abort the navigation from it. + /// + public interface INavigationBlocker + { + /// + /// Called before the navigation system navigates from this object. + /// Return false to abort the navigation. + /// + /// + Task OnNavigateOutRequest(); + + /// + /// Called before the navigation system navigates back from this object. + /// Return false to abort the navigation. + /// + /// + Task OnNavigateBackRequest(); + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationManager.cs index 4d1cbea8c..e20940c8d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core.Commands; namespace Tango.MachineStudio.Common.Navigation { @@ -12,9 +13,102 @@ namespace Tango.MachineStudio.Common.Navigation public interface INavigationManager { /// - /// Navigates to the specified view. + /// Gets the current module. + /// + IStudioModule CurrentModule { get; } + + /// + /// Gets the current view model. + /// + StudioViewModel CurrentVM { get; } + + /// + /// Gets a value indicating whether the navigation system is able to navigate to the previous view. + /// + bool CanNavigateBack { get; } + + /// + /// Navigates to the previous view if is true. + /// + Task NavigateBack(); + + /// + /// Navigates to the previous view.. + /// + RelayCommand NavigateBackCommand { get; } + + /// + /// Navigates to the specified full path in command parameter. + /// + RelayCommand NavigateToCommand { get; } + + /// + /// Navigates to the specified PPC view. /// /// The view. - void NavigateTo(NavigationView view); + Task NavigateTo(NavigationView view, bool pushToHistory = true); + + /// + /// Navigates to the specified PPC view with the specified receive object. + /// + /// The view. + Task NavigateWithObject(NavigationView view, TPass obj, bool pushToHistory = true); + + /// + /// Navigates to the specified module. + /// + /// + Task NavigateTo(bool pushToHistory = true) where T : IStudioModule; + + /// + /// Navigates to the specified module using the view path (e.g MainView.JobsView). + /// + /// + /// The view path. + Task NavigateTo(String viewPath, bool pushToHistory = true) where T : IStudioModule; + + /// + /// Navigates to the specified module using the view path (e.g MainView,JobsView). + /// This method makes it easy to do stuff like NavigateTo(nameof(MainView),nameof(JobsView)); + /// + /// + /// The view path. + Task NavigateTo(bool pushToHistory = true, params String[] viewPath) where T : IStudioModule; + + /// + /// Navigates to the specified module and view by full path (e.g Jobs.JobsView). + /// + /// The full path. + Task NavigateTo(String fullPath, bool pushToHistory = true); + + /// + /// Navigates to the specified module and view with the specified object and expecting a return parameter. + /// The view must be of type INavigationResultProvider. + /// + /// The full path. + Task NavigateForResult(TPass obj, bool pushToHistory = true) + where TModule : IStudioModule; + + /// + /// Navigates to the specified module and view with the specified object. + /// + /// The type of the module. + /// The type of the view. + /// The type of the pass. + /// The object. + /// if set to true [push to history]. + /// + Task NavigateWithObject(TPass obj, bool pushToHistory = true) + where TModule : IStudioModule; + + /// + /// Clears the navigation back history. + /// + void ClearHistory(); + + /// + /// Clears the navigation back history except the specified view type. + /// + void ClearHistoryExcept(); } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationObjectReceiver.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationObjectReceiver.cs new file mode 100644 index 000000000..5072881d2 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationObjectReceiver.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.Common.Navigation +{ + /// + /// Represents an object which supports receiving an object as part of the navigation to it. + /// + /// + public interface INavigationObjectReceiver + { + /// + /// Called when navigation system is going to navigate to this instance with the specified object. + /// + /// The object. + void OnNavigatedToWithObject(T obj); + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationResultProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationResultProvider.cs new file mode 100644 index 000000000..dee037432 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Navigation/INavigationResultProvider.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.Common.Navigation +{ + /// + /// Represents a object which provides a result the navigation system navigates away from it. + /// + /// The type of the result. + /// The type of the pass. + public interface INavigationResultProvider + { + /// + /// Called when the navigation system requests a result when it is navigating away from this instance. + /// + /// + TResult GetNavigationResult(); + + /// + /// Called when navigation system is going to navigate to this instance with the specified object. + /// + /// The object. + void OnNavigationObjectReceived(TPass obj); + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioApplication/IStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioApplication/IStudioApplicationManager.cs index 441a4ca93..96de3eea0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioApplication/IStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioApplication/IStudioApplicationManager.cs @@ -44,13 +44,6 @@ namespace Tango.MachineStudio.Common.StudioApplication /// bool IsMachineConnectedViaTCP { get; } - /// - /// Loads the specified module if permitted. - /// - /// Name of the module. - /// The arguments. - void RequestModule(String moduleName, params object[] args); - /// /// Gets the machine studio application version. /// diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs index 08ddbc073..63ff2119a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core.DI; using Tango.SharedUI; namespace Tango.MachineStudio.Common @@ -10,128 +11,42 @@ namespace Tango.MachineStudio.Common /// /// Represents a Machine Studio view model /// - /// The type of the module. /// /// - public abstract class StudioViewModelInternal : ViewModel, IStudioViewModel + public abstract class StudioViewModel : ViewModel, IStudioViewModel { - public bool IsVisible { get; private set; } - - /// - /// Gets or sets a value indicating whether this view model studio module is currently loaded. - /// - public bool IsModuleLoaded { get; private set; } - - /// - /// Initializes a new instance of the class. - /// - public StudioViewModelInternal() : base() - { - - } - - /// - /// Called when another module has wants to navigate to this module with some arguments. - /// - /// The arguments. - public virtual void OnModuleRequest(params object[] args) - { - - } - + private bool _isVisible; /// - /// Called when the user has navigated out of the module. + /// Gets or sets a value indicating whether this view model view's is visible. /// - public virtual void OnNavigatedFrom() + public bool IsVisible { - IsVisible = false; - IsModuleLoaded = false; + get { return _isVisible; } + set { _isVisible = value; RaisePropertyChangedAuto(); } } /// - /// Called when the user has navigated in to the module. - /// - public virtual void OnNavigatedTo() - { - IsVisible = true; - IsModuleLoaded = true; - } - - /// - /// Called before the application is shutting down. - /// Return false to cancel the shutdown in case an important process is in progress. - /// - /// - public virtual Task OnShutdownRequest() - { - return Task.FromResult(true); - } - - /// - /// Called when application is shutting down. - /// - public virtual void OnShuttingDown() - { - - } - - /// - /// Called when the application has been started - /// - public virtual void OnApplicationStarted() - { - - } - - /// - /// Called when the application is ready and all modules are loaded. - /// - public virtual void OnApplicationReady() - { - - } - } - - /// - /// Represents a Machine Studio view model - /// - /// The type of the module. - /// - /// - public abstract class StudioViewModel : ViewModel, IStudioViewModel where Module : IStudioModule - { - public bool IsVisible { get; private set; } - - /// - /// Gets or sets a value indicating whether this view model studio module is currently loaded. - /// - public bool IsModuleLoaded { get; private set; } - - /// - /// Called when another module has wants to navigate to this module with some arguments. + /// Initializes a new instance of the class. /// - /// The arguments. - public virtual void OnModuleRequest(params object[] args) + public StudioViewModel() : base() { } /// - /// Called when the user has navigated out of the module. + /// Called when the user has navigated out of this view model. /// public virtual void OnNavigatedFrom() { IsVisible = false; - IsModuleLoaded = false; } /// - /// Called when the user has navigated in to the module. + /// Called when the user has navigated in to this view model. /// public virtual void OnNavigatedTo() { IsVisible = true; - IsModuleLoaded = true; } /// @@ -163,79 +78,38 @@ namespace Tango.MachineStudio.Common /// /// Called when the application is ready and all modules are loaded. /// - public virtual void OnApplicationReady() - { - - } + public abstract void OnApplicationReady(); } /// - /// Represents a Machine Studio view model. + /// Represents a Machine Studio view model with a support for a view contract. /// - /// The type of the module. - /// + /// /// - /// - public abstract class StudioViewModel : ViewModel, IStudioViewModel where Module : IStudioModule where T : IView + public abstract class StudioViewModel : StudioViewModel where TView : IView { /// - /// Called when the application has been started - /// - public virtual void OnApplicationStarted() - { - - } - - /// - /// Called when the application is ready and all modules are loaded. - /// - public virtual void OnApplicationReady() - { - - } - - /// - /// Called when another module has wants to navigate to this module with some arguments. + /// Gets the view model's view. /// - /// The arguments. - public virtual void OnModuleRequest(params object[] args) - { - - } + public TView View { get; private set; } /// - /// Called when the user has navigated out of the module. + /// Initializes a new instance of the class. /// - public virtual void OnNavigatedFrom() + public StudioViewModel() : base() { - + TangoIOC.Default.GetInstanceWhenAvailable((view) => + { + View = view; + OnViewAttached(view); + }); } /// - /// Called when the user has navigated in to the module. + /// Called when the view has been attached /// - public virtual void OnNavigatedTo() - { - - } - - /// - /// Called before the application is shutting down. - /// Return false to cancel the shutdown in case an important process is in progress. - /// - /// - public virtual Task OnShutdownRequest() - { - return Task.FromResult(true); - } - - /// - /// Called when application is shutting down. - /// - public virtual void OnShuttingDown() - { - - } + /// The view. + protected abstract void OnViewAttached(TView view); } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index 8b251074d..09678b515 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -106,6 +106,9 @@ + + + @@ -115,6 +118,7 @@ + @@ -292,13 +296,11 @@ True - - - + - + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Threading/IDispatcherProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Threading/IDispatcherProvider.cs new file mode 100644 index 000000000..1c960ed3a --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Threading/IDispatcherProvider.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.Common.Threading +{ + /// + /// Represents a mechanism for invoking actions on the main application thread. + /// + public interface IDispatcherProvider + { + /// + /// Invokes the specified action asynchronously. + /// + /// The action. + void Invoke(Action action); + + /// + /// Invokes the specified action synchronously. + /// + /// The action. + void InvokeSync(Action action); + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml index b8a6cd1c0..44b2ed401 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml @@ -17,7 +17,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs index 092b958cc..899ba846e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs @@ -3,8 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core; +using Tango.Core.Commands; using Tango.MachineStudio.Common; +using Tango.MachineStudio.Common.Modules; using Tango.MachineStudio.Common.Navigation; +using Tango.MachineStudio.Common.Threading; +using Tango.SharedUI.Controls; namespace Tango.MachineStudio.UI.Navigation { @@ -12,18 +17,372 @@ namespace Tango.MachineStudio.UI.Navigation /// Represents the Machine Studio default Navigation Manager. /// /// - public class DefaultNavigationManager : INavigationManager + public class DefaultNavigationManager : ExtendedObject, INavigationManager { + private event Action NavigationCycleCompleted; + + private IDispatcherProvider _dispatcherProvider; + private IStudioModuleLoader _moduleLoader; + private Object _currentVM; + private String _lastFullPath; + private bool _preventHistory; + private bool _navigating_back; + + private Stack _navigationHistory; + + /// + /// Gets the current view model. + /// + public StudioViewModel CurrentVM + { + get { return _currentVM as StudioViewModel; } + } + + private IStudioModule _currentModule; + /// + /// Gets or sets the current module. + /// + public IStudioModule CurrentModule + { + get { return _currentModule; } + private set { _currentModule = value; RaisePropertyChangedAuto(); } + } + + /// + /// Navigates to the previous view. + /// + public RelayCommand NavigateBackCommand { get; private set; } + + /// + /// Navigates to the specified full path in command parameter. + /// + public RelayCommand NavigateToCommand { get; private set; } + + /// + /// Initializes a new instance of the class. + /// + /// The module loader. + public DefaultNavigationManager(IStudioModuleLoader moduleLoader, IDispatcherProvider dispatcherProvider) + { + _navigationHistory = new Stack(); + _moduleLoader = moduleLoader; + + NavigateToCommand = new RelayCommand(async (x) => await NavigateTo(x)); + NavigateBackCommand = new RelayCommand(async () => await NavigateBack()); + + _dispatcherProvider = dispatcherProvider; + } + /// - /// Navigates to the specified view. + /// Navigates to the specified PPC view. /// /// The view. - public void NavigateTo(NavigationView view) + public Task NavigateTo(NavigationView view, bool pushToHistory = true) { - MainWindow.Instance.Dispatcher.Invoke(() => + LogManager.Log($"Navigating to: {view.ToString()}..."); + + _dispatcherProvider.Invoke(() => { - MainWindow.Instance.TransitionControl.NavigateTo(view.ToString()); + MainWindow.Instance.NavigationControl.NavigateTo(view.ToString()); }); + + return Task.FromResult(true); + } + + /// + /// Navigates to the specified PPC view with the specified receive object. + /// + /// The view. + /// + /// + /// + public Task NavigateWithObject(NavigationView view, TPass obj, bool pushToHistory = true) + { + LogManager.Log($"Navigating to: {view.ToString()}, with object {typeof(TPass).Name}..."); + MainWindow.Instance.NavigationControl.NavigateTo(view.ToString()); + INavigationObjectReceiver receiver = MainWindow.Instance.NavigationControl.Elements.FirstOrDefault(x => (x.GetType().Name == view.ToString() || NavigationControl.GetNavigationName(x) == view.ToString()) && x.DataContext is INavigationObjectReceiver).DataContext as INavigationObjectReceiver; + + if (receiver != null) + { + receiver.OnNavigatedToWithObject(obj); + } + + return Task.FromResult(true); + } + + /// + /// Navigates to the specified module. + /// + /// + public Task NavigateTo(bool pushToHistory = true) where T : IStudioModule + { + return NavigateTo(typeof(T)); + } + + /// + /// Navigates to the specified module using the view path (e.g MainView.JobsView). + /// + /// + /// The view path. + public Task NavigateTo(string viewPath, bool pushToHistory = true) where T : IStudioModule + { + return NavigateTo(pushToHistory, viewPath.Split('.')); + } + + /// + /// Navigates to the specified module using the view path (e.g MainView,JobsView). + /// This method makes it easy to do stuff like NavigateTo(nameof(MainView),nameof(JobsView)); + /// + /// + /// The view path. + public Task NavigateTo(bool pushToHistory = true, params String[] viewPath) where T : IStudioModule + { + return NavigateTo(typeof(T), pushToHistory, viewPath); + } + + /// + /// Navigates to the specified module and view by full path (e.g Jobs.JobsView). + /// + /// The full path. + public async Task NavigateTo(String fullPath, bool pushToHistory = true) + { + String[] path = fullPath.Split('.'); + var module = _moduleLoader.UserModules.SingleOrDefault(x => x.GetType().Name == path[0] || x.Name == path[0]); + + if (path.Length == 1 && path[0] == CurrentModule.Name) return true; + + LogManager.Log($"Navigating to: {fullPath}..."); + + var fromVM = _currentVM; + + if (_currentVM != null && _currentVM is INavigationBlocker) + { + if (_navigating_back) + { + if (!await (_currentVM as INavigationBlocker).OnNavigateBackRequest()) + { + return false; + } + } + else + { + if (!await (_currentVM as INavigationBlocker).OnNavigateOutRequest()) + { + return false; + } + } + } + + if (pushToHistory && _lastFullPath != null && !_preventHistory) + { + _navigationHistory.Push(_lastFullPath); + RaisePropertyChanged(nameof(CanNavigateBack)); + } + + _lastFullPath = fullPath; + + MainWindow.Instance.NavigationControl.NavigateTo(NavigationView.MainView.ToString()); + var navigationControl = MachineStudio.UI.Views.MainView.Instance.NavigationControl; + CurrentModule = module; + var moduleView = navigationControl.NavigateTo(module.Name); + + _currentVM = moduleView.DataContext; + + if (path.Length > 1) + { + var moduleNavigation = moduleView.FindChildOffline(); + + moduleNavigation.RegisterForLoadedOrNow(async (x, e) => + { + foreach (var view in path.Skip(1)) + { + await Task.Delay(100); + var v = moduleNavigation.NavigateTo(view); + + if (v != null) + { + _currentVM = v.DataContext; + + if (view != path.Last()) + { + moduleNavigation = v.FindChildOffline(); + } + } + else + { + throw LogManager.Log(new ArgumentNullException("Could not navigate to " + fullPath)); + } + } + + NavigationCycleCompleted?.Invoke(fromVM, _currentVM); + }); + } + + return true; + } + + /// + /// Navigates for result. + /// + /// The type of the module. + /// The type of the view. + /// The type of the result. + /// The type of the object. + /// The object. + /// if set to true [push to history]. + /// + public Task NavigateForResult(TObject obj, bool pushToHistory = true) + where TModule : IStudioModule + { + TaskCompletionSource source = new TaskCompletionSource(); + + var fromVM = _currentVM; + Object toVM = null; + + + Action handler = null; + + handler = (from, to) => + { + if (toVM == null) + { + toVM = to; + if (toVM is INavigationResultProvider) + { + (toVM as INavigationResultProvider).OnNavigationObjectReceived(obj); + } + } + else + { + if (to == fromVM && from == toVM) + { + if (from is INavigationResultProvider) + { + source.SetResult((from as INavigationResultProvider).GetNavigationResult()); + } + } + + NavigationCycleCompleted -= handler; + } + }; + + NavigationCycleCompleted += handler; + + NavigateTo(typeof(TView).Name, pushToHistory); + + return source.Task; + } + + /// + /// Navigates to the specified module and view with the specified object. + /// + /// The type of the module. + /// The type of the view. + /// The type of the pass. + /// The object. + /// if set to true [push to history]. + /// + public Task NavigateWithObject(TPass obj, bool pushToHistory = true) where TModule : IStudioModule + { + TaskCompletionSource source = new TaskCompletionSource(); + + Action handler = null; + + handler = (from, to) => + { + if (to is INavigationObjectReceiver) + { + (to as INavigationObjectReceiver).OnNavigatedToWithObject(obj); + } + + NavigationCycleCompleted -= handler; + }; + + NavigationCycleCompleted += handler; + + NavigateTo(typeof(TView).Name, pushToHistory); + + return source.Task; + } + + private Task NavigateTo(Type moduleType, bool pushToHistory = true, params String[] viewPath) + { + if (viewPath != null && viewPath.Length > 0) + { + return NavigateTo(moduleType.Name + "." + String.Join(".", viewPath), pushToHistory); + } + else + { + return NavigateTo(moduleType.Name, pushToHistory); + } + } + + /// + /// Gets a value indicating whether the navigation system is able to navigate to the previous view. + /// + public bool CanNavigateBack + { + get { return _navigationHistory.Count > 0; } + } + + /// + /// Navigates to the previous view if is true. + /// + public async Task NavigateBack() + { + LogManager.Log("Navigating back..."); + + _navigating_back = true; + + String first = _navigationHistory.Pop(); + _preventHistory = true; + + + if (await NavigateTo(first)) + { + RaisePropertyChanged(nameof(CanNavigateBack)); + _preventHistory = false; + _navigating_back = false; + return true; + } + else + { + _navigationHistory.Push(first); + _preventHistory = false; + _navigating_back = false; + RaisePropertyChanged(nameof(CanNavigateBack)); + return false; + } + } + + /// + /// Clears the navigation back history. + /// + public void ClearHistory() + { + LogManager.Log("Navigation history cleared."); + _navigationHistory.Clear(); + RaisePropertyChanged(nameof(CanNavigateBack)); + } + + /// + /// Clears the navigation back history except the specified view type. + /// + /// + public void ClearHistoryExcept() + { + LogManager.Log($"Navigation history cleared except for {typeof(T).Name}."); + + var history_list = _navigationHistory.ToList(); + history_list = history_list.Where(x => x.Contains(typeof(T).Name)).Distinct().ToList(); + _navigationHistory.Clear(); + + foreach (var item in history_list) + { + _navigationHistory.Push(item); + } + + RaisePropertyChanged(nameof(CanNavigateBack)); } } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs index b8e6e1670..7c7e18276 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -225,31 +225,6 @@ namespace Tango.MachineStudio.UI.StudioApplication } } - /// - /// Loads the specified module if permitted. - /// - /// Name of the module. - /// The arguments. - public void RequestModule(string moduleName, params object[] args) - { - IStudioModule module = _moduleLoader.UserModules.SingleOrDefault(x => x.Name == moduleName); - - if (module != null) - { - TangoIOC.Default.GetInstance().StartModule(module); - - //Notify request listeners. - foreach (var vm in TangoIOC.Default.GetAllInstancesByBase()) - { - vm.OnModuleRequest(module, args); - } - } - else - { - throw new InvalidOperationException("The module was not found or you do not have sufficient privileges."); - } - } - /// /// Notify the application manager about an external opened window. /// When application exists. All registered windows will be closed. diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index 4ded3b300..1bbabb0af 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -168,6 +168,7 @@ + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Threading/DefaultDispatcherProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Threading/DefaultDispatcherProvider.cs new file mode 100644 index 000000000..611dca6b9 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Threading/DefaultDispatcherProvider.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Threading; +using Tango.MachineStudio.Common.Threading; + +namespace Tango.MachineStudio.UI.Threading +{ + /// + /// Represents the default PPC which will invoke action on the current application dispatcher. + /// + /// + public class DefaultDispatcherProvider : IDispatcherProvider + { + private Dispatcher _dispatcher; + + /// + /// Initializes a new instance of the class. + /// + /// The dispatcher. + public DefaultDispatcherProvider(Dispatcher dispatcher) + { + _dispatcher = dispatcher; + } + + /// + /// Invokes the specified action asynchronously. + /// + /// The action. + public void Invoke(Action action) + { + _dispatcher.BeginInvoke(action); + } + + /// + /// Invokes the specified action synchronously. + /// + /// The action. + public void InvokeSync(Action action) + { + _dispatcher.Invoke(action); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs index 2c816eb6c..10aa86ad1 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs @@ -1,4 +1,5 @@ using System; +using System.Windows; using Tango.Core.DI; using Tango.Integration.ExternalBridge; using Tango.Logging; @@ -11,6 +12,7 @@ using Tango.MachineStudio.Common.Navigation; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.Common.Speech; using Tango.MachineStudio.Common.StudioApplication; +using Tango.MachineStudio.Common.Threading; using Tango.MachineStudio.Common.Video; using Tango.MachineStudio.UI.Authentication; using Tango.MachineStudio.UI.Console; @@ -21,6 +23,7 @@ using Tango.MachineStudio.UI.Notifications; using Tango.MachineStudio.UI.StudioApplication; using Tango.MachineStudio.UI.SupervisingController; using Tango.MachineStudio.UI.TFS; +using Tango.MachineStudio.UI.Threading; using Tango.MachineStudio.UI.ViewModels; using Tango.MachineStudio.UI.Views; using Tango.Settings; @@ -64,7 +67,10 @@ namespace Tango.MachineStudio.UI TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); + TangoIOC.Default.Unregister(); + + TangoIOC.Default.Register(new DefaultDispatcherProvider(Application.Current.Dispatcher)); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs index eacc8a4cb..215f7afb5 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs @@ -28,7 +28,7 @@ namespace Tango.MachineStudio.UI.ViewModels /// Represents the Machine Studio loading view, view model. /// /// - public class LoadingViewVM : StudioViewModelInternal + public class LoadingViewVM : StudioViewModel { private INotificationProvider _notificationProvider; private TeamFoundationServiceExtendedClient _tfs; @@ -172,5 +172,10 @@ namespace Tango.MachineStudio.UI.ViewModels } }); } + + public override void OnApplicationReady() + { + + } } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index 23dd4ecd7..36ce62897 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -629,20 +629,19 @@ namespace Tango.MachineStudio.UI.ViewModels { LogManager.Log(String.Format("Starting module '{0}'...", module.Name)); - if (!(MainView.Self as MainView).TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType)) + if (!(MainView.Self as MainView).NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType)) { LogManager.Log("Module was not initialized. Initializing..."); FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement; NavigationControl.SetNavigationName(view, module.Name); - (MainView.Self as MainView).TransitionControl.Elements.Add(view); + (MainView.Self as MainView).NavigationControl.Elements.Add(view); } } foreach (var m in StudioModuleLoader.AllModules.Where(x => x != module && !x.InNewWindow)) { m.IsLoaded = false; - TangoIOC.Default.GetModuleViewModels(m).ToList().ForEach(x => x.OnNavigatedFrom()); } if (module != null) @@ -652,15 +651,13 @@ namespace Tango.MachineStudio.UI.ViewModels IsModuleLoaded = true; LogManager.Log(String.Format("Navigating to module '{0}'...", module.Name)); - (MainView.Self as MainView).TransitionControl.NavigateTo(module.Name); - - TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(x => x.OnNavigatedTo()); + (MainView.Self as MainView).NavigationControl.NavigateTo(module.Name); } else { IsModuleLoaded = false; LogManager.Log(String.Format("Navigating to Home...")); - (MainView.Self as MainView).TransitionControl.NavigateTo("Home"); + (MainView.Self as MainView).NavigationControl.NavigateTo("Home"); } } @@ -680,16 +677,16 @@ namespace Tango.MachineStudio.UI.ViewModels LogManager.Log(String.Format("Starting module '{0}' in new window...", module.Name)); - if (!(MainView.Self as MainView).TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType)) + if (!(MainView.Self as MainView).NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType)) { LogManager.Log("Module was not initialized. Initializing..."); FrameworkElement v = Activator.CreateInstance(module.MainViewType) as FrameworkElement; NavigationControl.SetNavigationName(v, module.Name); - (MainView.Self as MainView).TransitionControl.Elements.Add(v); + (MainView.Self as MainView).NavigationControl.Elements.Add(v); } LogManager.Log("Detaching module view..."); - var view = (MainView.Self as MainView).TransitionControl.GetAndDetach(module.Name); + var view = (MainView.Self as MainView).NavigationControl.GetAndDetach(module.Name); ModuleWindowVM vm = new ModuleWindowVM(module); ModuleWindow window = new ModuleWindow(this, vm, view); @@ -700,7 +697,6 @@ namespace Tango.MachineStudio.UI.ViewModels window.grid.Children.Remove(view); module.InNewWindow = false; - TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(v => v.OnNavigatedFrom()); }; window.Owner = MainWindow.Instance; @@ -708,8 +704,6 @@ namespace Tango.MachineStudio.UI.ViewModels LogManager.Log("Opening new window..."); window.Show(); - TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(x => x.OnNavigatedTo()); - (_applicationManager as DefaultStudioApplicationManager).RegisterOpenedWindow(window); } catch (Exception ex) diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml index bb5c6458b..9a494f862 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml @@ -397,7 +397,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs index 7ed119abd..ca8d7066c 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs @@ -38,10 +38,14 @@ namespace Tango.MachineStudio.UI.Views { private DefaultStudioModuleLoader _loader; + public static MainView Instance { get; set; } + public MainView() : base() { InitializeComponent(); + Instance = this; + _loader = TangoIOC.Default.GetInstance() as DefaultStudioModuleLoader; _loader.ModulesLoaded += Loader_ModulesLoaded; } @@ -69,11 +73,11 @@ namespace Tango.MachineStudio.UI.Views ThreadsHelper.InvokeUI(() => { - if (!TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType)) + if (!NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType)) { FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement; NavigationControl.SetNavigationName(view, module.Name); - TransitionControl.Elements.Add(view); + NavigationControl.Elements.Add(view); } _loader.UserModules.Add(module); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index fdaf37c09..2b2752a24 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -126,7 +126,7 @@ - + @@ -421,7 +421,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(TargetDir)" - + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispatcherProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispatcherProvider.cs new file mode 100644 index 000000000..940c13052 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispatcherProvider.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Threading; +using Tango.PPC.Common.Threading; + +namespace Tango.PPC.UI.Threading +{ + /// + /// Represents the default PPC which will invoke action on the current application dispatcher. + /// + /// + public class DefaultDispatcherProvider : IDispatcherProvider + { + private Dispatcher _dispatcher; + + /// + /// Initializes a new instance of the class. + /// + /// The dispatcher. + public DefaultDispatcherProvider(Dispatcher dispatcher) + { + _dispatcher = dispatcher; + } + + /// + /// Invokes the specified action asynchronously. + /// + /// The action. + public void Invoke(Action action) + { + _dispatcher.BeginInvoke(action); + } + + /// + /// Invokes the specified action synchronously. + /// + /// The action. + public void InvokeSync(Action action) + { + _dispatcher.Invoke(action); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispetcherProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispetcherProvider.cs deleted file mode 100644 index 0051ca329..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispetcherProvider.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Threading; -using Tango.PPC.Common.Threading; - -namespace Tango.PPC.UI.Threading -{ - /// - /// Represents the default PPC which will invoke action on the current application dispatcher. - /// - /// - public class DefaultDispetcherProvider : IDispatcherProvider - { - private Dispatcher _dispatcher; - - /// - /// Initializes a new instance of the class. - /// - /// The dispatcher. - public DefaultDispetcherProvider(Dispatcher dispatcher) - { - _dispatcher = dispatcher; - } - - /// - /// Invokes the specified action asynchronously. - /// - /// The action. - public void Invoke(Action action) - { - _dispatcher.BeginInvoke(action); - } - - /// - /// Invokes the specified action synchronously. - /// - /// The action. - public void InvokeSync(Action action) - { - _dispatcher.Invoke(action); - } - } -} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs index 5c416a289..bec1d2b48 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs @@ -58,7 +58,7 @@ namespace Tango.PPC.UI TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); - TangoIOC.Default.Register(new DefaultDispetcherProvider(Application.Current.Dispatcher)); + TangoIOC.Default.Register(new DefaultDispatcherProvider(Application.Current.Dispatcher)); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); diff --git a/Software/Visual_Studio/Tango.Editors/ElementsEditor.xaml.cs b/Software/Visual_Studio/Tango.Editors/ElementsEditor.xaml.cs index 4d2eabbb8..e32ae6dd3 100644 --- a/Software/Visual_Studio/Tango.Editors/ElementsEditor.xaml.cs +++ b/Software/Visual_Studio/Tango.Editors/ElementsEditor.xaml.cs @@ -723,7 +723,7 @@ namespace Tango.Editors /// The instance containing the event data. private void Element_PreviewMouseDown(object sender, MouseButtonEventArgs e) { - if (e.ChangedButton == MouseButton.Left && !Keyboard.IsKeyDown(Key.LeftShift) && IsEditable) + if (e.ChangedButton == MouseButton.Left && !Keyboard.IsKeyDown(Key.LeftShift)) { SelectedElement = sender as IElementEditor; } -- cgit v1.3.1 From ea97f593f82a1176125901c257c8e81c45c23b67 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 23 Aug 2018 11:17:23 +0300 Subject: ObservablesContext is now LazyLoading = 'false' by default. --- .../ViewModels/MainViewVM.cs | 1 - .../ViewModels/MainViewVM.cs | 2 -- .../ViewModels/MainViewVM.cs | 3 --- .../ViewModels/EventsViewVM.cs | 1 - .../ViewModels/MainViewVM.cs | 1 - .../ViewModels/MainViewVM.cs | 3 --- .../EventLogging/DefaultEventLogger.cs | 1 - .../Authentication/DefaultAuthenticationProvider.cs | 1 - .../EventLogging/DefaultEventLogger.cs | 1 - Software/Visual_Studio/Tango.BL/ObservableEntity.cs | 21 ++++++++++++++++++++- .../Tango.BL/ObservablesContextExtension.cs | 1 + .../Tango.BL/ObservablesEntitiesAdapter.cs | 1 + .../Tango.BL/ObservablesStaticCollections.cs | 2 -- 13 files changed, 22 insertions(+), 17 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs index 1811ea7c7..02f496b1f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs @@ -281,7 +281,6 @@ namespace Tango.MachineStudio.ColorLab.ViewModels Task.Factory.StartNew(() => { _dbContext = ObservablesContext.CreateDefault(); - _dbContext.Configuration.LazyLoadingEnabled = false; Machines = _dbContext.Machines.ToObservableCollection(); ColorSpaces = _dbContext.ColorSpaces.ToObservableCollection(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 6178ae30a..60c2e65f9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -732,7 +732,6 @@ namespace Tango.MachineStudio.Developer.ViewModels LogManager.Log("Initializing machine Db context..."); _machineDbContext = ObservablesContext.CreateDefault(); - _machineDbContext.Configuration.LazyLoadingEnabled = false; if (_settings.LastSelectedMachineGuid != null) { @@ -1498,7 +1497,6 @@ namespace Tango.MachineStudio.Developer.ViewModels LogManager.Log("Creating active job DB context..."); _activeJobDbContext = ObservablesContext.CreateDefault(); - _activeJobDbContext.Configuration.LazyLoadingEnabled = false; LogManager.Log("Initializing available color spaces, RMLs & Winding methods..."); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs index 54b954745..6ba28cb72 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs @@ -102,7 +102,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels if (_db != null) _db.Dispose(); _db = ObservablesContext.CreateDefault(); - _db.Configuration.LazyLoadingEnabled = false; CurrentVersion.HardwareMotors = _db.HardwareMotorTypes.ToList().Select(x => new HardwareMotor() { HardwareMotorType = x }).ToObservableCollection(); CurrentVersion.HardwareDancers = _db.HardwareDancerTypes.ToList().Select(x => new HardwareDancer() { HardwareDancerType = x }).ToObservableCollection(); @@ -117,7 +116,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels { using (var db = ObservablesContext.CreateDefault()) { - db.Configuration.LazyLoadingEnabled = false; _hardwareVersions = db.HardwareVersions.ToObservableCollection(); InvokeUI(() => { @@ -131,7 +129,6 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels if (_db != null) _db.Dispose(); _db = ObservablesContext.CreateDefault(); - _db.Configuration.LazyLoadingEnabled = false; CurrentVersion = _db.Adapter.GetHardwareVersion(x => x.Guid == selectedVersion.Guid); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs index 20eba4b8e..68094d91f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs @@ -138,7 +138,6 @@ namespace Tango.MachineStudio.Logging.ViewModels await Task.Factory.StartNew(() => { _db = ObservablesContext.CreateDefault(); - _db.Configuration.LazyLoadingEnabled = false; _db.EventTypes.Load(); _db.EventTypesCategories.Load(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index 183cdb247..de9a8de4a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -218,7 +218,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels CanWork = false; _db = ObservablesContext.CreateDefault(); - _db.Configuration.LazyLoadingEnabled = false; Adapter = new ObservablesStaticCollections(); Adapter.ApplicationDisplayPanelVersions = _db.ApplicationDisplayPanelVersions.ToObservableCollection(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs index 0def388d3..db312b78f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs @@ -199,7 +199,6 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels await Task.Factory.StartNew(() => { _userContext = ObservablesContext.CreateDefault(); - _userContext.Configuration.LazyLoadingEnabled = false; Roles = _userContext.Roles.ToObservableCollection(); ManagedUser = _userContext.Adapter.GetUser(SelectedUser.Guid); @@ -256,7 +255,6 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels await Task.Factory.StartNew(() => { _manageContext = ObservablesContext.CreateDefault(); - _manageContext.Configuration.LazyLoadingEnabled = false; ManagedOrganization = _manageContext.Adapter.GetOrganizationAndUsers(SelectedOrganization.Guid); }); @@ -270,7 +268,6 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels Task.Factory.StartNew(() => { _organizationsContext = ObservablesContext.CreateDefault(); - _organizationsContext.Configuration.LazyLoadingEnabled = false; Organizations = _organizationsContext.Organizations .Include(x => x.Machines) diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs index c5b9c63cb..cb4611cad 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs @@ -81,7 +81,6 @@ namespace Tango.MachineStudio.Common.EventLogging try { _db = ObservablesContext.CreateDefault(); - _db.Configuration.LazyLoadingEnabled = false; _db.ActionTypes.ToList(); _db.EventTypesActions.ToList(); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs index de84e43e8..c16f76449 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs @@ -51,7 +51,6 @@ namespace Tango.MachineStudio.UI.Authentication { using (ObservablesContext db = ObservablesContext.CreateDefault()) { - db.Configuration.LazyLoadingEnabled = false; String hash = User.GetPasswordHash(password); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs index d981723be..adf99e3a3 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs @@ -80,7 +80,6 @@ namespace Tango.PPC.Common.EventLogging try { _db = ObservablesContext.CreateDefault(); - _db.Configuration.LazyLoadingEnabled = false; _db.ActionTypes.ToList(); _db.EventTypesActions.ToList(); diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs index d6cdcfb16..1b69a8bdb 100644 --- a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs +++ b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs @@ -157,7 +157,26 @@ namespace Tango.BL /// public virtual void Save(ObservablesContext context) { - context.SaveChanges(); + if (context == ObservablesEntitiesAdapter.Instance.Context) + { + var tableName = this.GetType().GetCustomAttribute().Name; + + String propName = tableName.FromDalNameToTitleCase(); + + DbSet set = ObservablesEntitiesAdapter.Instance.Context.GetType().GetProperty(propName, BindingFlags.Instance | BindingFlags.Public).GetValue(context) as DbSet; + ObservableCollection obs = ObservablesEntitiesAdapter.Instance.GetType().GetProperty(propName, BindingFlags.Instance | BindingFlags.Public).GetValue(ObservablesEntitiesAdapter.Instance) as ObservableCollection; + + if (!obs.Contains(this as T)) + { + set.Add(this as T); + } + + ObservablesEntitiesAdapter.Instance.SaveChanges(); + } + else + { + context.SaveChanges(); + } } /// diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs index 49c80695f..f387bd1e1 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs @@ -34,6 +34,7 @@ namespace Tango.BL public ObservablesContext(DataSource dataSource) : base(dataSource.ToConnection(), true) { Database.SetInitializer(null); + Configuration.LazyLoadingEnabled = false; _adapter = new ObservablesContextAdapter(this); } diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs index fdc359da0..4fdaf9071 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs @@ -69,6 +69,7 @@ namespace Tango.BL private ObservablesEntitiesAdapter() { Context = ObservablesContext.CreateDefault(); + Context.Configuration.LazyLoadingEnabled = true; } /// diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs index db5faef4b..4820c784b 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs @@ -42,8 +42,6 @@ namespace Tango.BL { db = ObservablesContext.CreateDefault(); - db.Configuration.LazyLoadingEnabled = false; - WindingMethods = db.WindingMethods.ToObservableCollection(); ColorSpaces = db.ColorSpaces.ToObservableCollection(); SpoolTypes = db.SpoolTypes.ToObservableCollection(); -- cgit v1.3.1 From 9f4fa3e0a6bafe27dd1e584838e45d61864a70fd Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 23 Aug 2018 11:38:51 +0300 Subject: Machine Studio v3.0 --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 15400960 -> 15400960 bytes .../Build/Shortcuts/Machine Emulator.lnk | Bin 1455 -> 1471 bytes .../Build/Shortcuts/Machine Studio.lnk | Bin 1516 -> 1532 bytes .../Build/Shortcuts/Proto Compiler GUI.lnk | Bin 1448 -> 1464 bytes .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.PPC.Jobs/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.PPC.Common/Properties/AssemblyInfo.cs | 2 +- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../RealTimeGraphEx/Properties/AssemblyInfo.cs | 2 +- .../Tango.AutoComplete/Properties/AssemblyInfo.cs | 2 +- .../Tango.BL/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.Core/Properties/AssemblyInfo.cs | 2 +- .../Tango.DAL.Remote/Properties/AssemblyInfo.cs | 2 +- .../Tango.EmbroideryUI/Properties/AssemblyInfo.cs | 2 +- .../Tango.Emulations/Properties/AssemblyInfo.cs | 2 +- .../Tango.Integration/Properties/AssemblyInfo.cs | 2 +- .../Tango.Logging/Properties/AssemblyInfo.cs | 2 +- .../Tango.PMR/Properties/AssemblyInfo.cs | 2 +- .../Tango.Scripting/Properties/AssemblyInfo.cs | 2 +- .../Tango.SharedUI/Properties/AssemblyInfo.cs | 2 +- .../Tango.Stubs/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.TFS/Properties/AssemblyInfo.cs | 2 +- .../Tango.Touch/Properties/AssemblyInfo.cs | 2 +- .../Tango.Transport/Properties/AssemblyInfo.cs | 2 +- .../Tango.UnitTesting/Properties/AssemblyInfo.cs | 2 +- .../Tango.BugReporter/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.ILMerge.UI/Properties/AssemblyInfo.cs | 2 +- .../Tango.MachineEM.UI/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.Protobuf.UI/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.Stubs.CLI/Properties/AssemblyInfo.cs | 2 +- .../Tango.Stubs.UI/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.UITests/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- 55 files changed, 50 insertions(+), 50 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 373bd11ba..61bf2d50f 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index b747c8b4e..b6156a8f0 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk index aff43b505..732068ec9 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk index f336b54f1..3afe81fc5 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk index 482e642bf..42a1600c9 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk and b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs index bda64c925..7af9df838 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Color Lab Module")] -[assembly: AssemblyVersion("2.0.8.1633")] +[assembly: AssemblyVersion("2.0.9.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs index 3b589e28b..212d21202 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio DB Module")] -[assembly: AssemblyVersion("2.0.7.1633")] +[assembly: AssemblyVersion("2.0.8.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs index 51246a5d1..24afc84e3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Data Capturing Module")] -[assembly: AssemblyVersion("2.0.8.1633")] +[assembly: AssemblyVersion("2.0.9.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs index 66e36649b..333ca0b2e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")] -[assembly: AssemblyVersion("2.0.15.1633")] +[assembly: AssemblyVersion("2.0.16.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs index 54e27ec27..45b3007fb 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")] -[assembly: AssemblyVersion("2.0.8.1633")] +[assembly: AssemblyVersion("2.0.9.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs index 8f69fb919..533137e97 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")] -[assembly: AssemblyVersion("2.0.15.1633")] +[assembly: AssemblyVersion("2.0.16.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs index 832feca43..8ada843d2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")] -[assembly: AssemblyVersion("2.0.8.1633")] +[assembly: AssemblyVersion("2.0.9.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs index bf0680366..4e35f871c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Stubs Module")] -[assembly: AssemblyVersion("2.0.7.1633")] +[assembly: AssemblyVersion("2.0.8.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs index 18f0bd7c0..43291f4e5 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")] -[assembly: AssemblyVersion("2.0.12.1633")] +[assembly: AssemblyVersion("2.0.13.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs index 45b3ef1ce..995336499 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")] -[assembly: AssemblyVersion("2.0.7.1633")] +[assembly: AssemblyVersion("2.0.8.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs index 4b671e2e1..ccb580abf 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Common Components")] -[assembly: AssemblyVersion("2.0.24.1647")] +[assembly: AssemblyVersion("2.0.25.1119")] [assembly: ComVisible(false)] [assembly:ThemeInfo( 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 358775686..3e03d33f8 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("2.9.23.18231")] +[assembly: AssemblyVersion("3.0.25.18235")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs index be2f6cb93..657d58fa3 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango Panel PC Jobs Module")] -[assembly: AssemblyVersion("2.0.6.1657")] +[assembly: AssemblyVersion("2.0.7.1119")] [assembly:ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Properties/AssemblyInfo.cs index 0c386b603..8e6777b64 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango Module")] -[assembly: AssemblyVersion("2.0.3.1657")] +[assembly: AssemblyVersion("2.0.4.1119")] [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs index 52774bee8..0f2c9f8c4 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango Module")] -[assembly: AssemblyVersion("2.0.1.1407")] +[assembly: AssemblyVersion("2.0.2.1119")] [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs index 20ad516c0..02006054f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango Panel PC Common Library")] -[assembly: AssemblyVersion("2.0.9.1657")] +[assembly: AssemblyVersion("2.0.11.1119")] [assembly:ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 1dbe7785d..648ddbb59 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.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 Panel PC Application")] -[assembly: AssemblyVersion("2.0.6.1657")] +[assembly: AssemblyVersion("2.0.7.1119")] diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs index bde9c6f09..7c5ff58ed 100644 --- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.18.1647")] +[assembly: AssemblyVersion("1.0.19.1119")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs index 6bc66ca75..fe55fc94f 100644 --- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows.Markup; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.18.1647")] +[assembly: AssemblyVersion("1.0.19.1119")] [assembly: AssemblyFileVersion("1.0.0.8")] diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs index 7443b6538..61f03b23b 100644 --- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Business logic components")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.0.30.1647")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.31.1119")] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs index 3aa9e6fbd..0af1368ea 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Code Generation Components")] -[assembly: AssemblyVersion("2.0.14.1633")] +[assembly: AssemblyVersion("2.0.15.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs index 9d26b436f..317a279c1 100644 --- a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Core Components")] -[assembly: AssemblyVersion("2.0.27.1647")] +[assembly: AssemblyVersion("2.0.28.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs index c2935e60d..3e0ab9b2a 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Remote Data Access Layer")] -[assembly: AssemblyVersion("2.0.26.1647")] +[assembly: AssemblyVersion("2.0.27.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs index 352105b64..c9257949f 100644 --- a/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs @@ -44,5 +44,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.5.1633")] +[assembly: AssemblyVersion("1.0.6.1119")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs index b2bd0b458..9b5c07f0c 100644 --- a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Emulation Components")] -[assembly: AssemblyVersion("2.0.9.1633")] +[assembly: AssemblyVersion("2.0.10.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs index 26a247d72..8aa4a48a5 100644 --- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.26.1647")] +[assembly: AssemblyVersion("2.0.27.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs index e31de5a02..66407c1bd 100644 --- a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.31.1647")] +[assembly: AssemblyVersion("2.0.32.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs index 48d625525..ece92e475 100644 --- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Message Repository")] -[assembly: AssemblyVersion("2.0.34.1647")] +[assembly: AssemblyVersion("2.0.35.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs index d35ece44d..c57f365f8 100644 --- a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Roslyn Scripting Components")] -[assembly: AssemblyVersion("2.0.24.1647")] +[assembly: AssemblyVersion("2.0.25.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs index 22751be2f..53327e27f 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Shared UI Components")] -[assembly: AssemblyVersion("2.0.25.1647")] +[assembly: AssemblyVersion("2.0.26.1119")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs index 983208128..5abb6dfae 100644 --- a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Stubs Collection")] -[assembly: AssemblyVersion("2.0.7.1633")] +[assembly: AssemblyVersion("2.0.8.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs index f798e9167..6a3285308 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - DataBase Synchronization Components")] -[assembly: AssemblyVersion("2.0.14.1633")] +[assembly: AssemblyVersion("2.0.15.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs index 734806851..c9d4e6264 100644 --- a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - VSTS API Library")] -[assembly: AssemblyVersion("2.0.17.1633")] +[assembly: AssemblyVersion("2.0.18.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs index 061fe0c09..1fba0f954 100644 --- a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Touch Components")] -[assembly: AssemblyVersion("2.0.7.1657")] +[assembly: AssemblyVersion("2.0.8.1119")] [assembly: ComVisible(false)] [assembly:ThemeInfo( diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs index 5b0835ed8..111b194c1 100644 --- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Transport Components")] -[assembly: AssemblyVersion("2.0.26.1647")] +[assembly: AssemblyVersion("2.0.27.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs index ec0be482c..b9f6f9990 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Unit Testing")] -[assembly: AssemblyVersion("2.0.11.1645")] +[assembly: AssemblyVersion("2.0.12.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs index 6f3bbcd4d..7954580d6 100644 --- a/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs @@ -25,4 +25,4 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.1407")] +[assembly: AssemblyVersion("2.0.2.1119")] diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Properties/AssemblyInfo.cs index 5c2705f1e..3ae79eed6 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - DAL Observables Generator")] -[assembly: AssemblyVersion("2.0.7.1645")] +[assembly: AssemblyVersion("2.0.8.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Properties/AssemblyInfo.cs index 71301e99d..07a31ed80 100644 --- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Machine Emulator")] -[assembly: AssemblyVersion("2.0.1.1645")] +[assembly: AssemblyVersion("2.0.2.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs index fccb6a4b0..60718aab8 100644 --- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs @@ -44,4 +44,4 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.15.1645")] +[assembly: AssemblyVersion("2.0.16.1119")] diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Properties/AssemblyInfo.cs index 26b665bb0..2a4178cfd 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Machine Emulator")] -[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyVersion("2.0.1.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Properties/AssemblyInfo.cs index ecc68e48a..6df893942 100644 --- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Ports List DB table generator.")] -[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyVersion("2.0.1.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Properties/AssemblyInfo.cs index 29c9baee9..00f78cc3d 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Compilation Utility")] -[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyVersion("2.0.1.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs index e732e97c6..021fa61a2 100644 --- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs @@ -44,4 +44,4 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.3.1608")] +[assembly: AssemblyVersion("2.0.4.1119")] diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Properties/AssemblyInfo.cs index bb44569e7..3ba9fde0d 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Properties/AssemblyInfo.cs @@ -25,4 +25,4 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.1645")] +[assembly: AssemblyVersion("2.0.2.1119")] diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs index ed2a326d9..97ebcc772 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Stubs execution command prompt utility")] -[assembly: AssemblyVersion("2.0.1.1407")] +[assembly: AssemblyVersion("2.0.2.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs index 4251bcef5..dbd169b02 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Stubs execution GUI utility")] -[assembly: AssemblyVersion("3.2.4.1347")] +[assembly: AssemblyVersion("3.2.5.1119")] diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs index 159a803f0..bebe7e316 100644 --- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Transport Routing Utility")] -[assembly: AssemblyVersion("2.0.1.1407")] +[assembly: AssemblyVersion("2.0.2.1119")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs index 686d8056f..0cceda897 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.16.1645")] +[assembly: AssemblyVersion("1.0.17.1119")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/AssemblyInfo.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/AssemblyInfo.cs index e1969199b..80eec3400 100644 --- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.1119")] [assembly: AssemblyFileVersion("1.0.0.0")] -- cgit v1.3.1 From 658d3d07ed46c6fdb7276b614a93b78c3e02060f Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 23 Aug 2018 13:25:37 +0300 Subject: Fixed some issues with MS 3.0 --- .../Build/Shortcuts/Machine Studio.lnk | Bin 1532 -> 1532 bytes .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.MachineStudio.Installer.vdproj | 6000 +++++--------------- .../Properties/AssemblyInfo.cs | 2 +- .../ViewModels/UpdateViewVM.cs | 7 +- .../Tango.MachineStudio.Updater/MainWindow.xaml.cs | 25 +- .../Properties/AssemblyInfo.cs | 2 +- .../RealTimeGraphEx/Properties/AssemblyInfo.cs | 2 +- .../Tango.AutoComplete/Properties/AssemblyInfo.cs | 2 +- .../Tango.BL/Properties/AssemblyInfo.cs | 2 +- .../Tango.BrushPicker/Properties/AssemblyInfo.cs | 2 +- .../Tango.CircularGauge/CircularGaugeControl.cs | 216 +- .../Tango.CircularGauge/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.ColorPicker/Properties/AssemblyInfo.cs | 2 +- .../Tango.Core/Properties/AssemblyInfo.cs | 2 +- .../Tango.DAL.Local/Properties/AssemblyInfo.cs | 2 +- .../Tango.DAL.Remote/Properties/AssemblyInfo.cs | 2 +- .../Tango.DragAndDrop/Properties/AssemblyInfo.cs | 2 +- .../Tango.Editors/Properties/AssemblyInfo.cs | 2 +- .../Tango.EmbroideryUI/Properties/AssemblyInfo.cs | 2 +- .../Tango.Emulations/Properties/AssemblyInfo.cs | 2 +- .../Tango.Hive/Properties/AssemblyInfo.cs | 2 +- .../Tango.Integration/Properties/AssemblyInfo.cs | 2 +- .../Tango.Logging/Properties/AssemblyInfo.cs | 2 +- .../Tango.PMR/Properties/AssemblyInfo.cs | 2 +- .../Tango.Protobuf/Properties/AssemblyInfo.cs | 2 +- .../Tango.Scripting/Properties/AssemblyInfo.cs | 2 +- .../Tango.Serialization/Properties/AssemblyInfo.cs | 2 +- .../Tango.Settings/Properties/AssemblyInfo.cs | 2 +- .../Tango.SharedUI/Properties/AssemblyInfo.cs | 2 +- .../Tango.Stubs/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.TFS/Properties/AssemblyInfo.cs | 2 +- .../Tango.Transport/Properties/AssemblyInfo.cs | 2 +- .../Tango.Video/Properties/AssemblyInfo.cs | 2 +- .../Tango.Visuals/Properties/AssemblyInfo.cs | 2 +- .../Tango.Protobuf.CLI/Properties/AssemblyInfo.cs | 2 +- 48 files changed, 1678 insertions(+), 4656 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk index 3afe81fc5..e3d9683d4 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs index 7af9df838..77d9cc0d8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Color Lab Module")] -[assembly: AssemblyVersion("2.0.9.1119")] +[assembly: AssemblyVersion("2.0.10.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs index 212d21202..fe6b7a013 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio DB Module")] -[assembly: AssemblyVersion("2.0.8.1119")] +[assembly: AssemblyVersion("2.0.9.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs index 24afc84e3..01b5df038 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Data Capturing Module")] -[assembly: AssemblyVersion("2.0.9.1119")] +[assembly: AssemblyVersion("2.0.10.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs index 333ca0b2e..c29c487ae 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")] -[assembly: AssemblyVersion("2.0.16.1119")] +[assembly: AssemblyVersion("2.0.17.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs index 45b3007fb..6807ed5c8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")] -[assembly: AssemblyVersion("2.0.9.1119")] +[assembly: AssemblyVersion("2.0.10.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs index 533137e97..f0713376c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")] -[assembly: AssemblyVersion("2.0.16.1119")] +[assembly: AssemblyVersion("2.0.17.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs index 8ada843d2..a5e99504c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")] -[assembly: AssemblyVersion("2.0.9.1119")] +[assembly: AssemblyVersion("2.0.10.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs index 4e35f871c..220526a23 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Stubs Module")] -[assembly: AssemblyVersion("2.0.8.1119")] +[assembly: AssemblyVersion("2.0.9.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs index 43291f4e5..b66227b98 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")] -[assembly: AssemblyVersion("2.0.13.1119")] +[assembly: AssemblyVersion("2.0.14.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs index 995336499..b5f0f2d5b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")] -[assembly: AssemblyVersion("2.0.8.1119")] +[assembly: AssemblyVersion("2.0.9.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs index ccb580abf..cd70982d5 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Common Components")] -[assembly: AssemblyVersion("2.0.25.1119")] +[assembly: AssemblyVersion("2.0.26.1159")] [assembly: ComVisible(false)] [assembly:ThemeInfo( diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Installer/Tango.MachineStudio.Installer.vdproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Installer/Tango.MachineStudio.Installer.vdproj index 3d8330858..a79853910 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Installer/Tango.MachineStudio.Installer.vdproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Installer/Tango.MachineStudio.Installer.vdproj @@ -15,5809 +15,2807 @@ { "Entry" { - "MsmKey" = "8:_00AB5F4CB0B9DCC466359F8589533B68" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_00AB5F4CB0B9DCC466359F8589533B68" - "OwnerKey" = "8:_94B0EAFC6BCADB7C6DC2EF31467C8C24" + "MsmKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_018A2A1E8555CACB14EEBBCFE003E82A" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" + "OwnerKey" = "8:_CAE724B9A481E2BAEC967AC01E7440FC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_023CEE1263BC2659C4302E37A4F8A946" + "MsmKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_032C05575B795D1CAEDD5105F1520FBB" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_0D36BD88AEF84A1CA7AC32F4687643FD" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_1CB515C82F6904C632717D23A858B116" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_1EC9EA112C92712F7DD0290C02F8F1EB" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_1EC9EA112C92712F7DD0290C02F8F1EB" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" + "MsmKey" = "8:_21E475E8F9DBB207476AD595250634BF" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmKey" = "8:_21E475E8F9DBB207476AD595250634BF" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_21E475E8F9DBB207476AD595250634BF" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_269E1BD3A1EBC31895AD3845529D3A9A" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_08C7D6D7EF105161BD48E61BBEBBF002" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_269E1BD3A1EBC31895AD3845529D3A9A" + "OwnerKey" = "8:_CAE724B9A481E2BAEC967AC01E7440FC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0B4B393563808E508848ED965CF47AEE" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_269E1BD3A1EBC31895AD3845529D3A9A" + "OwnerKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_269E1BD3A1EBC31895AD3845529D3A9A" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_269E1BD3A1EBC31895AD3845529D3A9A" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_269E1BD3A1EBC31895AD3845529D3A9A" + "OwnerKey" = "8:_386D8E25E67F7711289168ABA40EEA5D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_4A177C28F7864675BCA7A0910494A760" + "MsmKey" = "8:_2797CFFB7DAA734F75BFE8FB845163D3" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_2797CFFB7DAA734F75BFE8FB845163D3" + "OwnerKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" + "MsmKey" = "8:_2A67839C006307363A784C0284DC07B0" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_2A67839C006307363A784C0284DC07B0" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_30FDB43A5EE9C1E3839D05F6363080D6" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" + "MsmKey" = "8:_30FDB43A5EE9C1E3839D05F6363080D6" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_88E760F600D2E195D8119F6014AB651E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_B706D77ACF741812BE0E0A94728413E8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_FB49CF72492394629C7D629F6FAB4446" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_5731AEC46C736AD3549A441125EE75F9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_D6A37AFBBBDA445164B68F2E7D5B3E80" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" + "MsmKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" + "OwnerKey" = "8:_422EDE425080BE992A7471DEF2AB1103" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" + "MsmKey" = "8:_386D8E25E67F7711289168ABA40EEA5D" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "MsmKey" = "8:_386D8E25E67F7711289168ABA40EEA5D" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" + "MsmKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "OwnerKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" + "MsmKey" = "8:_419E2BE26037D1DF36751EB628D51EBC" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "MsmKey" = "8:_419E2BE26037D1DF36751EB628D51EBC" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0E196D84800B9656BC318F85626EFE05" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_136196DD2763419D959721C2BA143498" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_13803D82858878E2D3953D4742A1A596" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_14CF2DBBA5462C65F94A9137DCE014F9" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_173C4B05CE04BA34E920DC64B25A8670" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1910D5B276479C48B4F7762A638405F5" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_8F71C11DA0BAD2C98087755DC7A25AD3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1AC47588060EAA9F2B7A13EC07359D10" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1BDA3B7B2EF85A48708A41568E05F63F" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" + "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" + "OwnerKey" = "8:_76136B423153FD040335B97D71CF6A3E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" + "MsmKey" = "8:_422EDE425080BE992A7471DEF2AB1103" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_422EDE425080BE992A7471DEF2AB1103" + "OwnerKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_201B65B789181625CAF1E7D925466231" - "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" + "MsmKey" = "8:_422EDE425080BE992A7471DEF2AB1103" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2423100AF29217C4332A90074E54D4D0" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_422EDE425080BE992A7471DEF2AB1103" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2444D22B50272EAE03F2B5D2457335EC" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_422EDE425080BE992A7471DEF2AB1103" + "OwnerKey" = "8:_DB4BF3BCEC4456BC4D94E6F732E82803" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_244F067B77DB6F9852E2286427480A18" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_437F8E654D5A08B1CA3EA7BCC8B911F9" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2589A08E4AC51C4B69842E948EFC87DB" + "MsmKey" = "8:_437F8E654D5A08B1CA3EA7BCC8B911F9" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_4936236609673FB3A97D4EA723B1A767" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "MsmKey" = "8:_4936236609673FB3A97D4EA723B1A767" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "MsmKey" = "8:_4936236609673FB3A97D4EA723B1A767" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "MsmKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "OwnerKey" = "8:_BA22D23CB5304B5389C531581B1D5C63" + "MsmKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" + "OwnerKey" = "8:_8533A0FC046C1B311644EB6565AADCF4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_26BF1219019A4367BA3497A5899C05B1" + "MsmKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_283F49175556E95BE98A7C8600F4030B" + "MsmKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2EB48F8299C56A3911017460C55FDA43" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_516016F1B93156015497DAD5F7FBE9A1" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2EB48F8299C56A3911017460C55FDA43" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" + "MsmKey" = "8:_516016F1B93156015497DAD5F7FBE9A1" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_516016F1B93156015497DAD5F7FBE9A1" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_709D007D7E89A10E63C141E3A08311FD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2FA2B573783C66016BCED4EA9D33E5B6" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_359F09B8EC59D6FC1859EFF3D2274920" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_382ADCBEA6FF11871606FD406333761E" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" - "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_39C2ACA7C5003F7A39323635C3B4B924" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" + "OwnerKey" = "8:_C28A9B0313A578C409D1E57773FB001E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_39DD938A5F3E194F296D11EA2F72EB3E" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" + "MsmKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" + "OwnerKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_39DD938A5F3E194F296D11EA2F72EB3E" + "MsmKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3B351F730871D9CC74A40D74B6C6E61A" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" + "OwnerKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3C71904C35BED6686835B5A1C74768BE" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3E6534AA37C9012ED3BDF4DCB02EFDB6" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "MsmKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_269E1BD3A1EBC31895AD3845529D3A9A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_CAE724B9A481E2BAEC967AC01E7440FC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_7F2A242EE11515CC12A6793521574B9B" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_5731AEC46C736AD3549A441125EE75F9" + "OwnerKey" = "8:_FB49CF72492394629C7D629F6FAB4446" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42250239B4791E8133657256CCE3506C" - "OwnerKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "MsmKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4446241C89A5162FB80809A05F581472" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4446241C89A5162FB80809A05F581472" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_448950FC944968D96107991185C22806" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_448950FC944968D96107991185C22806" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" + "OwnerKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_448EC30219E98C0B91ABF43C7D4F223F" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_448EC30219E98C0B91ABF43C7D4F223F" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" + "OwnerKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4672E56FCA5A7523E491A1DF92B58426" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_6362DA873243657F5F1FD41C1A4E104A" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_47ECF1DA52157B12F544FB237D85F564" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_6362DA873243657F5F1FD41C1A4E104A" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_47ECF1DA52157B12F544FB237D85F564" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_6362DA873243657F5F1FD41C1A4E104A" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_47ECF1DA52157B12F544FB237D85F564" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4A177C28F7864675BCA7A0910494A760" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4A177C28F7864675BCA7A0910494A760" + "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" + "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" + "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" + "MsmKey" = "8:_705F2A9700A0B6F6A5308537C5F876EA" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" + "MsmKey" = "8:_709D007D7E89A10E63C141E3A08311FD" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" + "OwnerKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" + "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" + "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" + "MsmKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "OwnerKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "MsmKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4E399A139695EBD13928A80C850A7E9D" + "MsmKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4F605B43B6D1B3804C25477D671A9101" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4FC5C727C21C7B57C1E2B8E55A9E8748" + "MsmKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4FC5C727C21C7B57C1E2B8E55A9E8748" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" + "OwnerKey" = "8:_CAE724B9A481E2BAEC967AC01E7440FC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" + "MsmKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" + "OwnerKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_709D007D7E89A10E63C141E3A08311FD" + "MsmKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_8F71C11DA0BAD2C98087755DC7A25AD3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_EA4D0354739F3915FC03731153325AA5" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "OwnerKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" - "OwnerKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" + "MsmKey" = "8:_76136B423153FD040335B97D71CF6A3E" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_55D25B13F818972AA7BF22C7264EBB19" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_8533A0FC046C1B311644EB6565AADCF4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5747A410B7984793A0F6D9121679C6F3" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" + "MsmKey" = "8:_7A69315CD79099E601F096562C7406DF" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_8533A0FC046C1B311644EB6565AADCF4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5BB4E116AC988395D2A72901433A7CB9" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5BB4E116AC988395D2A72901433A7CB9" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5BB4E116AC988395D2A72901433A7CB9" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5C5582DB321E2CC26F8F1FBF8B4866F0" + "MsmKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_7E765F76FDFC3DCF4EAEB59B5546B063" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_437F8E654D5A08B1CA3EA7BCC8B911F9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_8533A0FC046C1B311644EB6565AADCF4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "OwnerKey" = "8:_4DE31F37261519B6E72F89F737E10A45" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5DAE745CD40555B469B53E8DB8A5D7DA" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_516016F1B93156015497DAD5F7FBE9A1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_62EC6F0F04E5435ABCC0479D48BEBE1B" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_633F9949B09BE13FCEC5B9CE99D81421" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_1EC9EA112C92712F7DD0290C02F8F1EB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_633F9949B09BE13FCEC5B9CE99D81421" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_633F9949B09BE13FCEC5B9CE99D81421" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_99DFCB38D3C7E1A7AC6AE6E2397D5EAE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_C28A9B0313A578C409D1E57773FB001E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" + "MsmKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_FB49CF72492394629C7D629F6FAB4446" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" - "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" - "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" - "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" + "OwnerKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" + "MsmKey" = "8:_847DE93907D7F6B17C0694F74120086B" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6AE2958999F8B1E88D8475CB3E791CF2" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_8533A0FC046C1B311644EB6565AADCF4" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6AE2958999F8B1E88D8475CB3E791CF2" + "MsmKey" = "8:_88E760F600D2E195D8119F6014AB651E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6D9156D5DBF08959BE20FE18FA09E71A" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_88E760F600D2E195D8119F6014AB651E" + "OwnerKey" = "8:_5731AEC46C736AD3549A441125EE75F9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_705F2A9700A0B6F6A5308537C5F876EA" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_8533A0FC046C1B311644EB6565AADCF4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_709D007D7E89A10E63C141E3A08311FD" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" - "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" - "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_712AAF71834640D10C755D415AF2200C" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_73674B32069839371DC47411D1B7EBE0" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_8939008A4B57155156AE83AACC008030" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "MsmKey" = "8:_89CF13C29028D3D7E6E68C097A72CB90" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_8F71C11DA0BAD2C98087755DC7A25AD3" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_8F71C11DA0BAD2C98087755DC7A25AD3" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" + "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "MsmKey" = "8:_949EF578C14CE0D93133060EF66C018F" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "MsmKey" = "8:_95EBE8B225CEEAD24E06F44863ABAECB" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_95EBE8B225CEEAD24E06F44863ABAECB" + "OwnerKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" + "MsmKey" = "8:_98D5175644A3BC174BCA498A1B20FF84" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "OwnerKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "MsmKey" = "8:_99DFCB38D3C7E1A7AC6AE6E2397D5EAE" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" + "MsmKey" = "8:_99DFCB38D3C7E1A7AC6AE6E2397D5EAE" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_99DFCB38D3C7E1A7AC6AE6E2397D5EAE" + "OwnerKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7A0D754929705CC64EF84E26BD75D642" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7A0D754929705CC64EF84E26BD75D642" + "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7A0D754929705CC64EF84E26BD75D642" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7E765F76FDFC3DCF4EAEB59B5546B063" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7F2A242EE11515CC12A6793521574B9B" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7F2A242EE11515CC12A6793521574B9B" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_847DE93907D7F6B17C0694F74120086B" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_877DF22E1E92563A6F4E77209D76B185" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_896E731F0FFC039A04E0A4482B3FED1F" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_90C6EB30636F05FB3DFD7C943DC16EAC" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_9A98137A42052685F51607892D00B8A0" + "OwnerKey" = "8:_8939008A4B57155156AE83AACC008030" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_94B0EAFC6BCADB7C6DC2EF31467C8C24" + "MsmKey" = "8:_9C822EC8B208111C8872DC2C929B4F49" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_95A39C4C0476DF1F27B60A43C00DEAB7" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" + "OwnerKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_95A39C4C0476DF1F27B60A43C00DEAB7" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_967E9E20CB6B9C494DFC2637B6384B13" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_967E9E20CB6B9C494DFC2637B6384B13" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" + "OwnerKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_A17D8A4EDE1F489FABA27DB45F1A3F56" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" + "MsmKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "MsmKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_983D79DC449AD65746DD38E6468BD886" + "MsmKey" = "8:_AC9A178FF920FC61BC39E1F955343BF2" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_98D5175644A3BC174BCA498A1B20FF84" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_AC9A178FF920FC61BC39E1F955343BF2" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_4DE31F37261519B6E72F89F737E10A45" + "MsmKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "MsmKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "MsmKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "OwnerKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" + "MsmKey" = "8:_B0A07289218E6EFD42CF3518073813D6" + "OwnerKey" = "8:_1CB515C82F6904C632717D23A858B116" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9CCA52D51EEDBFE9F9794A8ACD30D5D9" + "MsmKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A0C8023CFDF8E1966A878020945346CF" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_8533A0FC046C1B311644EB6565AADCF4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A2659FED3E8DE537BFD1EE3E6A429175" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A35B706F66B9C77B3D87D7B0FF53D652" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A7976B20CB4BFC0F5C8BE15430B6005E" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AB0E0C1990036EFBAC9C728A9902D668" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AC22B81E0F8A0CB4C79C8B878F2D1BCF" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AED50036F562B75035A039EECFC7BA07" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AF79FC974C2F42D24D74E5313E475E87" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B12544C6B013F48780D190EB513A3B82" + "MsmKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B12544C6B013F48780D190EB513A3B82" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B12544C6B013F48780D190EB513A3B82" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B20313AE68F1E5D38CDE24036C32E69B" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B20313AE68F1E5D38CDE24036C32E69B" - "OwnerKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" + "MsmKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B78AD04F5CD695E22F6F139EAC69B5A5" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B78AD04F5CD695E22F6F139EAC69B5A5" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B78AD04F5CD695E22F6F139EAC69B5A5" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "MsmKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B8EE1FC78F28FD0B62389E8796D603FB" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BA22D23CB5304B5389C531581B1D5C63" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_B706D77ACF741812BE0E0A94728413E8" + "OwnerKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BA22D23CB5304B5389C531581B1D5C63" + "MsmKey" = "8:_B706D77ACF741812BE0E0A94728413E8" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_B706D77ACF741812BE0E0A94728413E8" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_B706D77ACF741812BE0E0A94728413E8" + "OwnerKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_B706D77ACF741812BE0E0A94728413E8" + "OwnerKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_B706D77ACF741812BE0E0A94728413E8" + "OwnerKey" = "8:_FB49CF72492394629C7D629F6FAB4446" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" - "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" + "MsmKey" = "8:_BA75D5EAA8F428D075548128CE91FDD3" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BF01A029E83A968C697506DFA469C90B" + "MsmKey" = "8:_BA75D5EAA8F428D075548128CE91FDD3" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BF01A029E83A968C697506DFA469C90B" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BF01A029E83A968C697506DFA469C90B" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_BA75D5EAA8F428D075548128CE91FDD3" + "OwnerKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C179B63E2F5A58786B70FADA6C8496A5" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_BD559C5264D2EB8DB2F96C7F161ECCFE" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_BD559C5264D2EB8DB2F96C7F161ECCFE" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C658BF7DEB725E94A2BAF4FD48BAD3FA" + "MsmKey" = "8:_C28A9B0313A578C409D1E57773FB001E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C658BF7DEB725E94A2BAF4FD48BAD3FA" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C6BFB4DAD78C1798616508141EF1234E" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CC07BBC3C44CE424AA0EF90844590E4E" + "MsmKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CC7BD04781686DE3403908303698199D" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_C78640287566584857304B60C7E09D2E" + "OwnerKey" = "8:_E0B7DFF98B1B17C9E2E2BD3B6DBBFF8A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CCD49B330E05F963B5AE73E3D04F5762" + "MsmKey" = "8:_C78640287566584857304B60C7E09D2E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" + "MsmKey" = "8:_C79F4B145CE2D951C3E342053EC26159" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D0CFB25F1239503E9FE3881A033B3110" - "OwnerKey" = "8:_00AB5F4CB0B9DCC466359F8589533B68" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D0CFB25F1239503E9FE3881A033B3110" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_CAE724B9A481E2BAEC967AC01E7440FC" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D1CB239DDD65E78A28094BC854772AFF" + "MsmKey" = "8:_CAE724B9A481E2BAEC967AC01E7440FC" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D3EF38D40E0CBE1BD391303952B0493E" + "MsmKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D48D475C8BD232C2AC87A2A7C6CCA53D" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_5731AEC46C736AD3549A441125EE75F9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" - "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_4936236609673FB3A97D4EA723B1A767" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_8939008A4B57155156AE83AACC008030" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D6A37AFBBBDA445164B68F2E7D5B3E80" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D6A37AFBBBDA445164B68F2E7D5B3E80" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D8A84B2F626300DA2E9147709713E9CB" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D947550594E2BF53BED76C7D7F9747D7" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_B706D77ACF741812BE0E0A94728413E8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" + "OwnerKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "MsmKey" = "8:_DB4BF3BCEC4456BC4D94E6F732E82803" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_DB4BF3BCEC4456BC4D94E6F732E82803" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_DB4BF3BCEC4456BC4D94E6F732E82803" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_E0B7DFF98B1B17C9E2E2BD3B6DBBFF8A" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_E0B7DFF98B1B17C9E2E2BD3B6DBBFF8A" + "OwnerKey" = "8:_C79F4B145CE2D951C3E342053EC26159" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" + "MsmKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" + "MsmKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "OwnerKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" + "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DB4A94107FB1929721E56ED40844F276" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" + "OwnerKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DC627D829804D2AC4A3984133840F2D5" + "MsmKey" = "8:_ECDF8B3BECC1C92F35C36C2743D8E99E" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DCD0D71251FAABFB20D57E60AC3DEFA3" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_ECDF8B3BECC1C92F35C36C2743D8E99E" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DD10CB022785FD0CE997E8C7BC1D0FE6" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_ECDF8B3BECC1C92F35C36C2743D8E99E" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DD77D7B58FFDC37F83D85D632BEC9DC4" + "MsmKey" = "8:_EF2898B0C9AAB2E33674325B9F86943B" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DE3FACD5F197D2E261A0C6B32E0D1CAC" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_FB49CF72492394629C7D629F6FAB4446" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" + "MsmKey" = "8:_FB49CF72492394629C7D629F6FAB4446" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_FB49CF72492394629C7D629F6FAB4446" + "OwnerKey" = "8:_CAE724B9A481E2BAEC967AC01E7440FC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_FB49CF72492394629C7D629F6FAB4446" + "OwnerKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_FB49CF72492394629C7D629F6FAB4446" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_FB49CF72492394629C7D629F6FAB4446" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmKey" = "8:_FB49CF72492394629C7D629F6FAB4446" + "OwnerKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_FB49CF72492394629C7D629F6FAB4446" + "OwnerKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_FF26B2424D1F2EB451FE2EDE8CD8D7CD" + "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_FF26B2424D1F2EB451FE2EDE8CD8D7CD" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_7F2A242EE11515CC12A6793521574B9B" + "MsmKey" = "8:_FF26B2424D1F2EB451FE2EDE8CD8D7CD" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "MsmKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E0573A6D7543083D0A5654271DF50643" + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E0FCEE9366306B5A88DC7CF29E913A4B" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_262CDE6547BE15C0065FC563C76194D2" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7E765F76FDFC3DCF4EAEB59B5546B063" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_705F2A9700A0B6F6A5308537C5F876EA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_847DE93907D7F6B17C0694F74120086B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_EF2898B0C9AAB2E33674325B9F86943B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_709D007D7E89A10E63C141E3A08311FD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_98D5175644A3BC174BCA498A1B20FF84" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_3737DF68C5D4F9EEA98383147C09217D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_4DE31F37261519B6E72F89F737E10A45" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_89CF13C29028D3D7E6E68C097A72CB90" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "OwnerKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_401029CD43B9D1C7D6B8A91580C72246" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E9B6634643306242F65E192204E9C56A" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BD559C5264D2EB8DB2F96C7F161ECCFE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EA4D0354739F3915FC03731153325AA5" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_437F8E654D5A08B1CA3EA7BCC8B911F9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EA4D0354739F3915FC03731153325AA5" - "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8533A0FC046C1B311644EB6565AADCF4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EA4D0354739F3915FC03731153325AA5" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_509008BF7DDF652EFD30748DF7B623AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_949EF578C14CE0D93133060EF66C018F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_B0DC463AFB084472BA1EA9F43F930940" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7E089FB0FAFDC91358668C33586665F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" - "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5147DA93AA30302C252F810D0809D8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EB90C5C498BD80F4675C07A364C45E3D" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_FF9B3021994C6FE507A9C7BE198B6C03" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EBFEF6DABA658232EC82197A8E01F66E" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_ACA4B81C7B67E4C6FD57C20AD15BF952" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ED524252AD28281FAE5468349D0E5797" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_38750CCB0CB6E026D5D88F129FB1013A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ED524252AD28281FAE5468349D0E5797" - "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7A925C02110B1D4B95987D2EEEFE6FDE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EF2623DE67EDC70B584821A055B86302" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_9A234F7FB4239AC3DB0DBE9415BDE695" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EF2898B0C9AAB2E33674325B9F86943B" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_21E475E8F9DBB207476AD595250634BF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_516016F1B93156015497DAD5F7FBE9A1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" - "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8F71C11DA0BAD2C98087755DC7A25AD3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F3898C4F454B4D1481E055F2AB2B217B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1EC9EA112C92712F7DD0290C02F8F1EB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F3D3908BF1850F33CACA8DC41CB6869E" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_30FDB43A5EE9C1E3839D05F6363080D6" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F46F8B020857673C983D66FE2F41B983" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_6362DA873243657F5F1FD41C1A4E104A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F78136CC822CCB014A68583A48E41B1C" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_FF26B2424D1F2EB451FE2EDE8CD8D7CD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_DF9470C286C095EB5289BC0A57E7AA2C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_B0F63EB1426CCC22506AFCB6C5809138" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_99DFCB38D3C7E1A7AC6AE6E2397D5EAE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" - "OwnerKey" = "8:_633F9949B09BE13FCEC5B9CE99D81421" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_B363FB7BD2F44E6C8573500668C2C9D1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A9A74798DD330F41ADBD32DBB9480F5C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4936236609673FB3A97D4EA723B1A767" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5F07DDA90732658EC4A03117CF7DD774" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_4DE31F37261519B6E72F89F737E10A45" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C28A9B0313A578C409D1E57773FB001E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C79F4B145CE2D951C3E342053EC26159" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7A69315CD79099E601F096562C7406DF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_51C4508525FA0604A9CD727897EBD530" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_76136B423153FD040335B97D71CF6A3E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA58218115CCED35D22896A731510356" - "OwnerKey" = "8:_B20313AE68F1E5D38CDE24036C32E69B" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7EBA1AC1C70BAC60E9165BB0A3640C98" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FA997D5286D6E9EC1A80EB888D9FDA72" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_201B65B789181625CAF1E7D925466231" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A1336C0121F3132E09400329ACD12B30" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_42250239B4791E8133657256CCE3506C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8939008A4B57155156AE83AACC008030" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_9A98137A42052685F51607892D00B8A0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E0B7DFF98B1B17C9E2E2BD3B6DBBFF8A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C78640287566584857304B60C7E09D2E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_74A44143E117110ECBFD7D981E9D6D99" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CAE724B9A481E2BAEC967AC01E7440FC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0B42804156762B4BDCC3EF894CED60AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BA75D5EAA8F428D075548128CE91FDD3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_AC9A178FF920FC61BC39E1F955343BF2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_75673BFBCF71A9463483B9C1DE022EAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E521ECFD6C000298EBF2C298D2E4376B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_419E2BE26037D1DF36751EB628D51EBC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_53C4681D5305DDF26BFC8A4775CAF16E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" + "OwnerKey" = "8:_386D8E25E67F7711289168ABA40EEA5D" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_90D408142B1F2A9F72CBF42FC38348F0" + "OwnerKey" = "8:_FB49CF72492394629C7D629F6FAB4446" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0BF8133A6082FDD658EA3570802D86DE" + "OwnerKey" = "8:_80A5A4D5BE60BC865B4C5F64B5A09D47" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D09F278664B0560653FAC1AD0BCAE93F" + "OwnerKey" = "8:_B706D77ACF741812BE0E0A94728413E8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7E765F76FDFC3DCF4EAEB59B5546B063" + "OwnerKey" = "8:_269E1BD3A1EBC31895AD3845529D3A9A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_705F2A9700A0B6F6A5308537C5F876EA" + "OwnerKey" = "8:_5731AEC46C736AD3549A441125EE75F9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_847DE93907D7F6B17C0694F74120086B" + "OwnerKey" = "8:_D7FBEFA3359B5E4558E45316AF3159B0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EF2898B0C9AAB2E33674325B9F86943B" + "OwnerKey" = "8:_2A67839C006307363A784C0284DC07B0" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_709D007D7E89A10E63C141E3A08311FD" + "OwnerKey" = "8:_DB4BF3BCEC4456BC4D94E6F732E82803" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_98D5175644A3BC174BCA498A1B20FF84" + "OwnerKey" = "8:_422EDE425080BE992A7471DEF2AB1103" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_13428C81458C52275C0A41D014521151" + "OwnerKey" = "8:_95EBE8B225CEEAD24E06F44863ABAECB" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_382ADCBEA6FF11871606FD406333761E" + "OwnerKey" = "8:_ECDF8B3BECC1C92F35C36C2743D8E99E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C5718F2557E2B4CE76D02A14D19B0F00" + "OwnerKey" = "8:_9C822EC8B208111C8872DC2C929B4F49" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6AE2958999F8B1E88D8475CB3E791CF2" + "OwnerKey" = "8:_88E760F600D2E195D8119F6014AB651E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4A177C28F7864675BCA7A0910494A760" + "OwnerKey" = "8:_36D30082439E3E9B7F5AAF6701F0C22F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1AB2D4983FA9742736ECF3B7F206F2F2" + "OwnerKey" = "8:_2797CFFB7DAA734F75BFE8FB845163D3" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5C9E5FF7D356A4422B8968FB61BDF478" + "OwnerKey" = "8:_1CB515C82F6904C632717D23A858B116" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7745EEBA3C6F32DA91434BF623E143C5" + "OwnerKey" = "8:_B0A07289218E6EFD42CF3518073813D6" "MsmSig" = "8:_UNDEFINED" } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D528F21311ECF12D91A0EFF0F8DCA468" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4A5E77F2FEA9C4080C8FD63B968FBE6C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5267D1EC981D54EC20D1B42EDAB938D2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0E196D84800B9656BC318F85626EFE05" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2423100AF29217C4332A90074E54D4D0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2ED45DA7AF8B8894A38769DFF94F274F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FAAE7C62982AB9171B3FF838FB304946" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4446241C89A5162FB80809A05F581472" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_47ECF1DA52157B12F544FB237D85F564" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_61ACBC61C06E40FB3AE4346599718EB4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_059A6746A8576493957C8E5AF3CEB9D9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7A0D754929705CC64EF84E26BD75D642" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EB38C1BD04FDFE44579B9868D6D1E139" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EB16994750C856659A7BE41BD02F8ABE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_7F2A242EE11515CC12A6793521574B9B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D6A37AFBBBDA445164B68F2E7D5B3E80" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EA4D0354739F3915FC03731153325AA5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C658BF7DEB725E94A2BAF4FD48BAD3FA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B12544C6B013F48780D190EB513A3B82" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5BB4E116AC988395D2A72901433A7CB9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E9B6634643306242F65E192204E9C56A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5A8B326A4A0607AFC366F8FD9657A87A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F1DFFB8E50BAD2529B0C859268ED8956" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_75D29198D3E03B5554EF1C7382CF5B14" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_73674B32069839371DC47411D1B7EBE0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2F23291F311EE9576449E5628A5702AE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_712AAF71834640D10C755D415AF2200C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_92EADCA3313D55CFE2BB3BBA193941F3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_64AD2A918B16AA625B839A6A2D4288AB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_69CC8DD07F81DD7EA883434F53157FBC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_67EAE4B6E14417FC2BF4F4EBF4473A1E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_38A402C026B59AE31D2CBB0235AF3368" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_94B0EAFC6BCADB7C6DC2EF31467C8C24" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FC7C3735446215F02CF0C477948EAAFC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_201B65B789181625CAF1E7D925466231" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_51C4508525FA0604A9CD727897EBD530" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DF6FFF88157E7FBCFB7E188431AAF4CF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0D2EC478B8B5A060121B647E6BA3DE05" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A1336C0121F3132E09400329ACD12B30" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_42250239B4791E8133657256CCE3506C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9758638AABE50C72FFA87E6544F6D70F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DB4941BAFA45E5921E7072990000621E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_00AB5F4CB0B9DCC466359F8589533B68" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D0CFB25F1239503E9FE3881A033B3110" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_922DFCAF3DE2758155669B16C5E04B95" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D949D70DDDDCF94CDCAD9B76A400C3D3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B78AD04F5CD695E22F6F139EAC69B5A5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_95A39C4C0476DF1F27B60A43C00DEAB7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_56D463E782DDBEB9880013C0D31F3C99" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_17BFDCA42AB1DE7706418C4C953F856E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_39DD938A5F3E194F296D11EA2F72EB3E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_448950FC944968D96107991185C22806" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BA22D23CB5304B5389C531581B1D5C63" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_75EE66E420D1D88C8A6F9FAC15995211" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4DE31F37261519B6E72F89F737E10A45" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_99DE0EEEA77B1C8F35CBE84DD3C935C4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_262CDE6547BE15C0065FC563C76194D2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E97069A1CAEDE89621181DEE3B97B547" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5D31D40A55F64C363A1DE193E24D604B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2EB48F8299C56A3911017460C55FDA43" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_633F9949B09BE13FCEC5B9CE99D81421" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_877DF22E1E92563A6F4E77209D76B185" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1AC47588060EAA9F2B7A13EC07359D10" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C6BFB4DAD78C1798616508141EF1234E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_032C05575B795D1CAEDD5105F1520FBB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3B351F730871D9CC74A40D74B6C6E61A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2FA2B573783C66016BCED4EA9D33E5B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1910D5B276479C48B4F7762A638405F5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1BDA3B7B2EF85A48708A41568E05F63F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DB4A94107FB1929721E56ED40844F276" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4672E56FCA5A7523E491A1DF92B58426" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2444D22B50272EAE03F2B5D2457335EC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4F605B43B6D1B3804C25477D671A9101" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3E6534AA37C9012ED3BDF4DCB02EFDB6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3C71904C35BED6686835B5A1C74768BE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AF79FC974C2F42D24D74E5313E475E87" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E0FCEE9366306B5A88DC7CF29E913A4B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F78136CC822CCB014A68583A48E41B1C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F93FF260A2F031FD129C02F9FB2A6E9D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_ED524252AD28281FAE5468349D0E5797" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BF01A029E83A968C697506DFA469C90B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_55D25B13F818972AA7BF22C7264EBB19" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B20313AE68F1E5D38CDE24036C32E69B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FA58218115CCED35D22896A731510356" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D947550594E2BF53BED76C7D7F9747D7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B8EE1FC78F28FD0B62389E8796D603FB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D3EF38D40E0CBE1BD391303952B0493E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_136196DD2763419D959721C2BA143498" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4E399A139695EBD13928A80C850A7E9D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_359F09B8EC59D6FC1859EFF3D2274920" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EBFEF6DABA658232EC82197A8E01F66E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DD10CB022785FD0CE997E8C7BC1D0FE6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9CCA52D51EEDBFE9F9794A8ACD30D5D9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A7976B20CB4BFC0F5C8BE15430B6005E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A2659FED3E8DE537BFD1EE3E6A429175" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_983D79DC449AD65746DD38E6468BD886" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_26BF1219019A4367BA3497A5899C05B1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DC627D829804D2AC4A3984133840F2D5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_90C6EB30636F05FB3DFD7C943DC16EAC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D8A84B2F626300DA2E9147709713E9CB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D48D475C8BD232C2AC87A2A7C6CCA53D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_14CF2DBBA5462C65F94A9137DCE014F9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DE3FACD5F197D2E261A0C6B32E0D1CAC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_448EC30219E98C0B91ABF43C7D4F223F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DD77D7B58FFDC37F83D85D632BEC9DC4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A35B706F66B9C77B3D87D7B0FF53D652" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AED50036F562B75035A039EECFC7BA07" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5DAE745CD40555B469B53E8DB8A5D7DA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6D9156D5DBF08959BE20FE18FA09E71A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D1CB239DDD65E78A28094BC854772AFF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CC07BBC3C44CE424AA0EF90844590E4E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2589A08E4AC51C4B69842E948EFC87DB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_967E9E20CB6B9C494DFC2637B6384B13" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_62EC6F0F04E5435ABCC0479D48BEBE1B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_39C2ACA7C5003F7A39323635C3B4B924" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0B4B393563808E508848ED965CF47AEE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_08C7D6D7EF105161BD48E61BBEBBF002" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A0C8023CFDF8E1966A878020945346CF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_896E731F0FFC039A04E0A4482B3FED1F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EF2623DE67EDC70B584821A055B86302" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CCD49B330E05F963B5AE73E3D04F5762" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_244F067B77DB6F9852E2286427480A18" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AC22B81E0F8A0CB4C79C8B878F2D1BCF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CC7BD04781686DE3403908303698199D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F46F8B020857673C983D66FE2F41B983" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4FC5C727C21C7B57C1E2B8E55A9E8748" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5C5582DB321E2CC26F8F1FBF8B4866F0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DCD0D71251FAABFB20D57E60AC3DEFA3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C179B63E2F5A58786B70FADA6C8496A5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FA997D5286D6E9EC1A80EB888D9FDA72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_023CEE1263BC2659C4302E37A4F8A946" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EB90C5C498BD80F4675C07A364C45E3D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_283F49175556E95BE98A7C8600F4030B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E0573A6D7543083D0A5654271DF50643" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F3D3908BF1850F33CACA8DC41CB6869E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AB0E0C1990036EFBAC9C728A9902D668" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_018A2A1E8555CACB14EEBBCFE003E82A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_13803D82858878E2D3953D4742A1A596" - "MsmSig" = "8:_UNDEFINED" - } - } - "Configurations" - { - "Debug" - { - "DisplayName" = "8:Debug" - "IsDebugOnly" = "11:TRUE" - "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\..\\Build\\Installers\\Machine Studio\\Debug\\Machine Studio Installer v1.0.0.5.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:2" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" - { - "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.6.1" - } - } - } - } - "Release" - { - "DisplayName" = "8:Release" - "IsDebugOnly" = "11:FALSE" - "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:..\\..\\Build\\Installers\\Machine Studio\\Release\\Machine Studio Installer v1.0.0.5.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:2" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" - { - "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.6.1" - } - } - } - } - } - "Deployable" - { - "CustomAction" - { - } - "DefaultFeature" - { - "Name" = "8:DefaultFeature" - "Title" = "8:" - "Description" = "8:" - } - "ExternalPersistence" - { - "LaunchCondition" - { - "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_57416B062DDF4C7D949EE93B8783A324" - { - "Name" = "8:.NET Framework" - "Message" = "8:[VSDNETMSG]" - "FrameworkVersion" = "8:.NETFramework,Version=v4.6.1" - "AllowLaterVersions" = "11:FALSE" - "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" - } - } - } - "File" - { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_00AB5F4CB0B9DCC466359F8589533B68" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:RazorEngine, Version=3.10.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:RazorEngine.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_018A2A1E8555CACB14EEBBCFE003E82A" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Collections, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_018A2A1E8555CACB14EEBBCFE003E82A" - { - "Name" = "8:System.Collections.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Collections.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_023CEE1263BC2659C4302E37A4F8A946" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Diagnostics.Tools, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_023CEE1263BC2659C4302E37A4F8A946" - { - "Name" = "8:System.Diagnostics.Tools.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Diagnostics.Tools.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_032C05575B795D1CAEDD5105F1520FBB" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Text.RegularExpressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_032C05575B795D1CAEDD5105F1520FBB" - { - "Name" = "8:System.Text.RegularExpressions.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Text.RegularExpressions.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_059A6746A8576493957C8E5AF3CEB9D9" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Common, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_059A6746A8576493957C8E5AF3CEB9D9" - { - "Name" = "8:Tango.MachineStudio.Common.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.Common.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_08C7D6D7EF105161BD48E61BBEBBF002" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reflection, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_08C7D6D7EF105161BD48E61BBEBBF002" - { - "Name" = "8:System.Reflection.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Reflection.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0B4B393563808E508848ED965CF47AEE" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reflection.Emit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_0B4B393563808E508848ED965CF47AEE" - { - "Name" = "8:System.Reflection.Emit.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Reflection.Emit.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0BF8133A6082FDD658EA3570802D86DE" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite.Linq, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_0BF8133A6082FDD658EA3570802D86DE" - { - "Name" = "8:System.Data.SQLite.Linq.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Data.SQLite.Linq.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0D2EC478B8B5A060121B647E6BA3DE05" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Core, Version=2.0.26.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Tango.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0E196D84800B9656BC318F85626EFE05" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.MachineDesigner, Version=2.0.8.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_0E196D84800B9656BC318F85626EFE05" - { - "Name" = "8:Tango.MachineStudio.MachineDesigner.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.MachineDesigner.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_13428C81458C52275C0A41D014521151" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.UsersAndRoles, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_13428C81458C52275C0A41D014521151" - { - "Name" = "8:Tango.MachineStudio.UsersAndRoles.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.UsersAndRoles.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_13803D82858878E2D3953D4742A1A596" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Collections.Concurrent, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_13803D82858878E2D3953D4742A1A596" - { - "Name" = "8:System.Collections.Concurrent.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Collections.Concurrent.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_14CF2DBBA5462C65F94A9137DCE014F9" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Xml, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_14CF2DBBA5462C65F94A9137DCE014F9" - { - "Name" = "8:System.Runtime.Serialization.Xml.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Runtime.Serialization.Xml.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_173C4B05CE04BA34E920DC64B25A8670" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Xml.ReaderWriter, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - } - "SourcePath" = "8:System.Xml.ReaderWriter.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_17BFDCA42AB1DE7706418C4C953F856E" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.Client.Interactive, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.VisualStudio.Services.Client.Interactive.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1910D5B276479C48B4F7762A638405F5" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_1910D5B276479C48B4F7762A638405F5" - { - "Name" = "8:System.Runtime.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Runtime.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1AB2D4983FA9742736ECF3B7F206F2F2" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Synchronization, Version=2.0.9.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_1AB2D4983FA9742736ECF3B7F206F2F2" - { - "Name" = "8:Tango.MachineStudio.Synchronization.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.Synchronization.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1AC47588060EAA9F2B7A13EC07359D10" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_1AC47588060EAA9F2B7A13EC07359D10" - { - "Name" = "8:System.Threading.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Threading.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1BDA3B7B2EF85A48708A41568E05F63F" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_1BDA3B7B2EF85A48708A41568E05F63F" - { - "Name" = "8:System.Runtime.Serialization.Primitives.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Runtime.Serialization.Primitives.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_201B65B789181625CAF1E7D925466231" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_201B65B789181625CAF1E7D925466231" - { - "Name" = "8:System.Data.SQLite.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Data.SQLite.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2423100AF29217C4332A90074E54D4D0" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.HardwareDesigner, Version=2.0.8.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2423100AF29217C4332A90074E54D4D0" - { - "Name" = "8:Tango.MachineStudio.HardwareDesigner.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.HardwareDesigner.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2444D22B50272EAE03F2B5D2457335EC" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Reflection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2444D22B50272EAE03F2B5D2457335EC" - { - "Name" = "8:System.Reflection.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Reflection.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_244F067B77DB6F9852E2286427480A18" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.NetworkInformation, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_244F067B77DB6F9852E2286427480A18" - { - "Name" = "8:System.Net.NetworkInformation.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Net.NetworkInformation.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2589A08E4AC51C4B69842E948EFC87DB" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_2589A08E4AC51C4B69842E948EFC87DB" - { - "Name" = "8:System.Reflection.Primitives.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Reflection.Primitives.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_262CDE6547BE15C0065FC563C76194D2" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.TeamFoundation.Common.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_26BF1219019A4367BA3497A5899C05B1" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ServiceModel.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_26BF1219019A4367BA3497A5899C05B1" - { - "Name" = "8:System.ServiceModel.Primitives.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.ServiceModel.Primitives.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_283F49175556E95BE98A7C8600F4030B" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Diagnostics.Contracts, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_283F49175556E95BE98A7C8600F4030B" - { - "Name" = "8:System.Diagnostics.Contracts.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Diagnostics.Contracts.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2EB48F8299C56A3911017460C55FDA43" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.ServiceBus, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.ServiceBus.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2ED45DA7AF8B8894A38769DFF94F274F" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Developer, Version=2.0.15.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2ED45DA7AF8B8894A38769DFF94F274F" - { - "Name" = "8:Tango.MachineStudio.Developer.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.Developer.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2F23291F311EE9576449E5628A5702AE" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Transport, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Tango.Transport.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2FA2B573783C66016BCED4EA9D33E5B6" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Text.Encoding.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_2FA2B573783C66016BCED4EA9D33E5B6" - { - "Name" = "8:System.Text.Encoding.Extensions.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Text.Encoding.Extensions.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_359F09B8EC59D6FC1859EFF3D2274920" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_359F09B8EC59D6FC1859EFF3D2274920" - { - "Name" = "8:System.Threading.Tasks.Parallel.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Threading.Tasks.Parallel.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_382ADCBEA6FF11871606FD406333761E" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Updater, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_382ADCBEA6FF11871606FD406333761E" - { - "Name" = "8:Tango.MachineStudio.Updater.exe" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.Updater.exe" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_38A402C026B59AE31D2CBB0235AF3368" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.DAL.Remote, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Tango.DAL.Remote.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_39C2ACA7C5003F7A39323635C3B4B924" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reflection.Emit.ILGeneration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_39C2ACA7C5003F7A39323635C3B4B924" - { - "Name" = "8:System.Reflection.Emit.ILGeneration.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Reflection.Emit.ILGeneration.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_39DD938A5F3E194F296D11EA2F72EB3E" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.IdentityModel.Tokens.Jwt, Version=4.0.20622.1351, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:System.IdentityModel.Tokens.Jwt.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3B351F730871D9CC74A40D74B6C6E61A" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Text.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_3B351F730871D9CC74A40D74B6C6E61A" - { - "Name" = "8:System.Text.Encoding.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Text.Encoding.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3C71904C35BED6686835B5A1C74768BE" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Globalization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_3C71904C35BED6686835B5A1C74768BE" - { - "Name" = "8:System.Globalization.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Globalization.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3E6534AA37C9012ED3BDF4DCB02EFDB6" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_3E6534AA37C9012ED3BDF4DCB02EFDB6" - { - "Name" = "8:System.IO.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.IO.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_42250239B4791E8133657256CCE3506C" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_42250239B4791E8133657256CCE3506C" - { - "Name" = "8:Google.Protobuf.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Google.Protobuf.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4446241C89A5162FB80809A05F581472" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.DataCapture, Version=2.0.8.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_4446241C89A5162FB80809A05F581472" - { - "Name" = "8:Tango.MachineStudio.DataCapture.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.DataCapture.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_448950FC944968D96107991185C22806" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Work.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.TeamFoundation.Work.WebApi.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_448EC30219E98C0B91ABF43C7D4F223F" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_448EC30219E98C0B91ABF43C7D4F223F" - { - "Name" = "8:System.Runtime.Serialization.Json.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Runtime.Serialization.Json.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4672E56FCA5A7523E491A1DF92B58426" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_4672E56FCA5A7523E491A1DF92B58426" - { - "Name" = "8:System.Runtime.Extensions.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Runtime.Extensions.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_47ECF1DA52157B12F544FB237D85F564" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Logging, Version=2.0.15.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_47ECF1DA52157B12F544FB237D85F564" - { - "Name" = "8:Tango.MachineStudio.Logging.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.Logging.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4A177C28F7864675BCA7A0910494A760" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Visuals, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_4A177C28F7864675BCA7A0910494A760" - { - "Name" = "8:Tango.Visuals.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.Visuals.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4A5E77F2FEA9C4080C8FD63B968FBE6C" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_4A5E77F2FEA9C4080C8FD63B968FBE6C" - { - "Name" = "8:MahApps.Metro.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:MahApps.Metro.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4DE31F37261519B6E72F89F737E10A45" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.VisualStudio.Services.WebApi.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4E399A139695EBD13928A80C850A7E9D" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading.Timer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_4E399A139695EBD13928A80C850A7E9D" - { - "Name" = "8:System.Threading.Timer.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Threading.Timer.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4F605B43B6D1B3804C25477D671A9101" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Net.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_4F605B43B6D1B3804C25477D671A9101" - { - "Name" = "8:System.Net.Primitives.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Net.Primitives.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4FC5C727C21C7B57C1E2B8E55A9E8748" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_4FC5C727C21C7B57C1E2B8E55A9E8748" - { - "Name" = "8:System.Linq.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Linq.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_51C4508525FA0604A9CD727897EBD530" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_51C4508525FA0604A9CD727897EBD530" - { - "Name" = "8:EntityFramework.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:EntityFramework.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5267D1EC981D54EC20D1B42EDAB938D2" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5267D1EC981D54EC20D1B42EDAB938D2" - { - "Name" = "8:System.Windows.Interactivity.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Windows.Interactivity.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_55D25B13F818972AA7BF22C7264EBB19" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_55D25B13F818972AA7BF22C7264EBB19" - { - "Name" = "8:System.Windows.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Windows.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_56D463E782DDBEB9880013C0D31F3C99" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Client, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.TeamFoundation.Client.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5747A410B7984793A0F6D9121679C6F3" - { - "SourcePath" = "8:..\\..\\Build\\Debug\\x86\\SQLite.Interop.dll" - "TargetName" = "8:SQLite.Interop.dll" - "Tag" = "8:" - "Folder" = "8:_137C662BA6B24073AC58ED6C67DA7951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5A8B326A4A0607AFC366F8FD9657A87A" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.SharedUI, Version=2.0.24.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Tango.SharedUI.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5BB4E116AC988395D2A72901433A7CB9" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.BrushPicker, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5BB4E116AC988395D2A72901433A7CB9" - { - "Name" = "8:Tango.BrushPicker.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.BrushPicker.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5C5582DB321E2CC26F8F1FBF8B4866F0" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.IO, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_5C5582DB321E2CC26F8F1FBF8B4866F0" - { - "Name" = "8:System.IO.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.IO.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5C9E5FF7D356A4422B8968FB61BDF478" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Synchronization, Version=2.0.14.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5C9E5FF7D356A4422B8968FB61BDF478" - { - "Name" = "8:Tango.Synchronization.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.Synchronization.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5D31D40A55F64C363A1DE193E24D604B" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Newtonsoft.Json.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5DAE745CD40555B469B53E8DB8A5D7DA" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Handles, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_5DAE745CD40555B469B53E8DB8A5D7DA" - { - "Name" = "8:System.Runtime.Handles.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Runtime.Handles.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_61ACBC61C06E40FB3AE4346599718EB4" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.ColorLab, Version=2.0.8.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_61ACBC61C06E40FB3AE4346599718EB4" - { - "Name" = "8:Tango.MachineStudio.ColorLab.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Tango.MachineStudio.ColorLab.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_62EC6F0F04E5435ABCC0479D48BEBE1B" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reflection.Emit.Lightweight, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_62EC6F0F04E5435ABCC0479D48BEBE1B" - { - "Name" = "8:System.Reflection.Emit.Lightweight.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.Reflection.Emit.Lightweight.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_633F9949B09BE13FCEC5B9CE99D81421" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.13.5.907, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_64AD2A918B16AA625B839A6A2D4288AB" + } + "Configurations" + { + "Debug" + { + "DisplayName" = "8:Debug" + "IsDebugOnly" = "11:TRUE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:..\\..\\Build\\Installers\\Machine Studio\\Debug\\Machine Studio Installer v3.0.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" - "ScatterAssemblies" + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" { - "_64AD2A918B16AA625B839A6A2D4288AB" + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" { - "Name" = "8:System.Reactive.Interfaces.dll" - "Attributes" = "3:512" + "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.6.1" } } - "SourcePath" = "8:System.Reactive.Interfaces.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_67EAE4B6E14417FC2BF4F4EBF4473A1E" + } + "Release" + { + "DisplayName" = "8:Release" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:TRUE" + "OutputFilename" = "8:..\\..\\Build\\Installers\\Machine Studio\\Release\\Machine Studio Installer v3.0.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.DragAndDrop, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" + { + "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.6.1" + } } - "SourcePath" = "8:Tango.DragAndDrop.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_69CC8DD07F81DD7EA883434F53157FBC" + } + } + "Deployable" + { + "CustomAction" + { + } + "DefaultFeature" + { + "Name" = "8:DefaultFeature" + "Title" = "8:" + "Description" = "8:" + } + "ExternalPersistence" + { + "LaunchCondition" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Serialization, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" + "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_57416B062DDF4C7D949EE93B8783A324" { + "Name" = "8:.NET Framework" + "Message" = "8:[VSDNETMSG]" + "FrameworkVersion" = "8:.NETFramework,Version=v4.6.1" + "AllowLaterVersions" = "11:FALSE" + "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" } - "SourcePath" = "8:Tango.Serialization.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6AE2958999F8B1E88D8475CB3E791CF2" + } + "File" + { + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0B42804156762B4BDCC3EF894CED60AC" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:WpfAnimatedGif, Version=1.4.14.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_6AE2958999F8B1E88D8475CB3E791CF2" + "_0B42804156762B4BDCC3EF894CED60AC" { - "Name" = "8:WpfAnimatedGif.dll" + "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:WpfAnimatedGif.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5835,46 +2833,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6D9156D5DBF08959BE20FE18FA09E71A" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0BF8133A6082FDD658EA3570802D86DE" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Extensions, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Data.SQLite.Linq, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" "ScatterAssemblies" { - "_6D9156D5DBF08959BE20FE18FA09E71A" + "_0BF8133A6082FDD658EA3570802D86DE" { - "Name" = "8:System.Runtime.Extensions.dll" + "Name" = "8:System.Data.SQLite.Linq.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.Extensions.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6E2E48228E9ADAD05ABEFB8E7A69DCCC" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Common.dll" + "SourcePath" = "8:System.Data.SQLite.Linq.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5892,23 +2864,12 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_705F2A9700A0B6F6A5308537C5F876EA" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D36BD88AEF84A1CA7AC32F4687643FD" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_705F2A9700A0B6F6A5308537C5F876EA" - { - "Name" = "8:Ionic.Zip.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Ionic.Zip.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\..\\Build\\Core\\Debug\\x86\\SQLite.Interop.dll" + "TargetName" = "8:SQLite.Interop.dll" "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Folder" = "8:_137C662BA6B24073AC58ED6C67DA7951" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -5920,23 +2881,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_709D007D7E89A10E63C141E3A08311FD" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1CB515C82F6904C632717D23A858B116" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" "ScatterAssemblies" { - "_709D007D7E89A10E63C141E3A08311FD" + "_1CB515C82F6904C632717D23A858B116" { - "Name" = "8:EntityFramework.SqlServer.dll" + "Name" = "8:System.IO.Compression.FileSystem.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:EntityFramework.SqlServer.dll" + "SourcePath" = "8:System.IO.Compression.FileSystem.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5954,20 +2915,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_712AAF71834640D10C755D415AF2200C" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1EC9EA112C92712F7DD0290C02F8F1EB" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Editors, Version=2.0.19.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_712AAF71834640D10C755D415AF2200C" + "_1EC9EA112C92712F7DD0290C02F8F1EB" { - "Name" = "8:System.Reactive.Linq.dll" + "Name" = "8:Tango.Editors.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Reactive.Linq.dll" + "SourcePath" = "8:Tango.Editors.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -5985,72 +2946,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_73674B32069839371DC47411D1B7EBE0" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_201B65B789181625CAF1E7D925466231" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" "ScatterAssemblies" { - "_73674B32069839371DC47411D1B7EBE0" + "_201B65B789181625CAF1E7D925466231" { - "Name" = "8:System.Reactive.PlatformServices.dll" + "Name" = "8:System.Data.SQLite.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Reactive.PlatformServices.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_75D29198D3E03B5554EF1C7382CF5B14" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Integration, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Tango.Integration.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_75EE66E420D1D88C8A6F9FAC15995211" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Core.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Microsoft.TeamFoundation.Core.WebApi.dll" + "SourcePath" = "8:System.Data.SQLite.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6068,20 +2977,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7745EEBA3C6F32DA91434BF623E143C5" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_21E475E8F9DBB207476AD595250634BF" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Stubs, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:RealTimeGraphEx, Version=1.0.20.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_7745EEBA3C6F32DA91434BF623E143C5" + "_21E475E8F9DBB207476AD595250634BF" { - "Name" = "8:Tango.MachineStudio.Stubs.dll" + "Name" = "8:RealTimeGraphEx.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.Stubs.dll" + "SourcePath" = "8:RealTimeGraphEx.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6099,20 +3008,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7A0D754929705CC64EF84E26BD75D642" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_269E1BD3A1EBC31895AD3845529D3A9A" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:RealTimeGraphEx, Version=1.0.17.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_7A0D754929705CC64EF84E26BD75D642" + "_269E1BD3A1EBC31895AD3845529D3A9A" { - "Name" = "8:RealTimeGraphEx.dll" + "Name" = "8:Microsoft.TeamFoundation.Common.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:RealTimeGraphEx.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.Common.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6130,20 +3039,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7E765F76FDFC3DCF4EAEB59B5546B063" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2797CFFB7DAA734F75BFE8FB845163D3" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_7E765F76FDFC3DCF4EAEB59B5546B063" + "_2797CFFB7DAA734F75BFE8FB845163D3" { - "Name" = "8:MaterialDesignColors.dll" + "Name" = "8:System.Net.Http.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MaterialDesignColors.dll" + "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6161,20 +3070,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7F2A242EE11515CC12A6793521574B9B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A67839C006307363A784C0284DC07B0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.EmbroideryUI, Version=1.0.5.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.ServiceBus, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_7F2A242EE11515CC12A6793521574B9B" + "_2A67839C006307363A784C0284DC07B0" { - "Name" = "8:Tango.EmbroideryUI.dll" + "Name" = "8:Microsoft.ServiceBus.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.EmbroideryUI.dll" + "SourcePath" = "8:Microsoft.ServiceBus.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6192,20 +3101,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_847DE93907D7F6B17C0694F74120086B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_30FDB43A5EE9C1E3839D05F6363080D6" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.CSV, Version=2.0.17.1657, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_847DE93907D7F6B17C0694F74120086B" + "_30FDB43A5EE9C1E3839D05F6363080D6" { - "Name" = "8:FontAwesome.WPF.dll" + "Name" = "8:Tango.CSV.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:FontAwesome.WPF.dll" + "SourcePath" = "8:Tango.CSV.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6223,20 +3132,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_877DF22E1E92563A6F4E77209D76B185" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_36D30082439E3E9B7F5AAF6701F0C22F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_877DF22E1E92563A6F4E77209D76B185" + "_36D30082439E3E9B7F5AAF6701F0C22F" { - "Name" = "8:System.Xml.XDocument.dll" + "Name" = "8:System.Net.Http.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Xml.XDocument.dll" + "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6254,26 +3163,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_896E731F0FFC039A04E0A4482B3FED1F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3737DF68C5D4F9EEA98383147C09217D" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.WebHeaderCollection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.UsersAndRoles, Version=2.0.9.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_896E731F0FFC039A04E0A4482B3FED1F" + "_3737DF68C5D4F9EEA98383147C09217D" { - "Name" = "8:System.Net.WebHeaderCollection.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.MachineStudio.UsersAndRoles.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Net.WebHeaderCollection.dll" + "SourcePath" = "8:Tango.MachineStudio.UsersAndRoles.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6281,30 +3190,30 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_90C6EB30636F05FB3DFD7C943DC16EAC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_386D8E25E67F7711289168ABA40EEA5D" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ServiceModel.Http, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Diff, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_90C6EB30636F05FB3DFD7C943DC16EAC" + "_386D8E25E67F7711289168ABA40EEA5D" { - "Name" = "8:System.ServiceModel.Http.dll" - "Attributes" = "3:0" + "Name" = "8:Microsoft.TeamFoundation.Diff.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.ServiceModel.Http.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.Diff.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6312,24 +3221,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_90D408142B1F2A9F72CBF42FC38348F0" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_38750CCB0CB6E026D5D88F129FB1013A" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.ColorLab, Version=2.0.10.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_90D408142B1F2A9F72CBF42FC38348F0" + "_38750CCB0CB6E026D5D88F129FB1013A" { - "Name" = "8:System.Reactive.Windows.Threading.dll" + "Name" = "8:Tango.MachineStudio.ColorLab.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Reactive.Windows.Threading.dll" + "SourcePath" = "8:Tango.MachineStudio.ColorLab.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6347,15 +3256,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_922DFCAF3DE2758155669B16C5E04B95" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_401029CD43B9D1C7D6B8A91580C72246" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Technician, Version=2.0.14.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_401029CD43B9D1C7D6B8A91580C72246" + { + "Name" = "8:Tango.MachineStudio.Technician.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.dll" + "SourcePath" = "8:Tango.MachineStudio.Technician.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6373,20 +3287,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_92EADCA3313D55CFE2BB3BBA193941F3" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_419E2BE26037D1DF36751EB628D51EBC" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.IdentityModel.Tokens.Jwt, Version=4.0.20622.1351, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_92EADCA3313D55CFE2BB3BBA193941F3" + "_419E2BE26037D1DF36751EB628D51EBC" { - "Name" = "8:System.Reactive.Core.dll" + "Name" = "8:System.IdentityModel.Tokens.Jwt.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Reactive.Core.dll" + "SourcePath" = "8:System.IdentityModel.Tokens.Jwt.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6404,15 +3318,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_94B0EAFC6BCADB7C6DC2EF31467C8C24" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_42250239B4791E8133657256CCE3506C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.CodeGeneration, Version=2.0.14.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL" "ScatterAssemblies" { + "_42250239B4791E8133657256CCE3506C" + { + "Name" = "8:Google.Protobuf.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Tango.CodeGeneration.dll" + "SourcePath" = "8:Google.Protobuf.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6430,15 +3349,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_95A39C4C0476DF1F27B60A43C00DEAB7" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_422EDE425080BE992A7471DEF2AB1103" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.19.8.16603, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { + "_422EDE425080BE992A7471DEF2AB1103" + { + "Name" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" + "SourcePath" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6456,26 +3380,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_967E9E20CB6B9C494DFC2637B6384B13" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_437F8E654D5A08B1CA3EA7BCC8B911F9" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.Visuals, Version=2.0.8.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_967E9E20CB6B9C494DFC2637B6384B13" + "_437F8E654D5A08B1CA3EA7BCC8B911F9" { - "Name" = "8:System.Reflection.Extensions.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.Visuals.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Reflection.Extensions.dll" + "SourcePath" = "8:Tango.Visuals.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6483,19 +3407,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9758638AABE50C72FFA87E6544F6D70F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4936236609673FB3A97D4EA723B1A767" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Settings, Version=2.0.25.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Serialization, Version=2.0.27.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_4936236609673FB3A97D4EA723B1A767" + { + "Name" = "8:Tango.Serialization.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Tango.Settings.dll" + "SourcePath" = "8:Tango.Serialization.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6513,26 +3442,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_983D79DC449AD65746DD38E6468BD886" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4A5E77F2FEA9C4080C8FD63B968FBE6C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ServiceModel.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL" "ScatterAssemblies" { - "_983D79DC449AD65746DD38E6468BD886" + "_4A5E77F2FEA9C4080C8FD63B968FBE6C" { - "Name" = "8:System.ServiceModel.Security.dll" - "Attributes" = "3:0" + "Name" = "8:MahApps.Metro.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.ServiceModel.Security.dll" + "SourcePath" = "8:MahApps.Metro.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6540,24 +3469,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_98D5175644A3BC174BCA498A1B20FF84" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_509008BF7DDF652EFD30748DF7B623AC" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Dragablz, Version=0.0.3.197, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Stubs, Version=2.0.9.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_98D5175644A3BC174BCA498A1B20FF84" + "_509008BF7DDF652EFD30748DF7B623AC" { - "Name" = "8:Dragablz.dll" + "Name" = "8:Tango.Stubs.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Dragablz.dll" + "SourcePath" = "8:Tango.Stubs.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6575,15 +3504,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_99DE0EEEA77B1C8F35CBE84DD3C935C4" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5147DA93AA30302C252F810D0809D8FB" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.DB, Version=2.0.9.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_5147DA93AA30302C252F810D0809D8FB" + { + "Name" = "8:Tango.MachineStudio.DB.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:System.Net.Http.Formatting.dll" + "SourcePath" = "8:Tango.MachineStudio.DB.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6601,20 +3535,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9CCA52D51EEDBFE9F9794A8ACD30D5D9" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_516016F1B93156015497DAD5F7FBE9A1" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Text.RegularExpressions, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.Video, Version=2.0.19.1159, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { - "_9CCA52D51EEDBFE9F9794A8ACD30D5D9" + "_516016F1B93156015497DAD5F7FBE9A1" { - "Name" = "8:System.Text.RegularExpressions.dll" + "Name" = "8:Tango.Video.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Text.RegularExpressions.dll" + "SourcePath" = "8:Tango.Video.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6632,20 +3566,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A0C8023CFDF8E1966A878020945346CF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_51C4508525FA0604A9CD727897EBD530" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ObjectModel, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A0C8023CFDF8E1966A878020945346CF" + "_51C4508525FA0604A9CD727897EBD530" { - "Name" = "8:System.ObjectModel.dll" + "Name" = "8:EntityFramework.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.ObjectModel.dll" + "SourcePath" = "8:EntityFramework.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6663,20 +3597,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A1336C0121F3132E09400329ACD12B30" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5267D1EC981D54EC20D1B42EDAB938D2" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:SimpleValidator, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A1336C0121F3132E09400329ACD12B30" + "_5267D1EC981D54EC20D1B42EDAB938D2" { - "Name" = "8:SimpleValidator.dll" + "Name" = "8:System.Windows.Interactivity.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:SimpleValidator.dll" + "SourcePath" = "8:System.Windows.Interactivity.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6694,20 +3628,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2659FED3E8DE537BFD1EE3E6A429175" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_53C4681D5305DDF26BFC8A4775CAF16E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Text.Encoding, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A2659FED3E8DE537BFD1EE3E6A429175" + "_53C4681D5305DDF26BFC8A4775CAF16E" { - "Name" = "8:System.Text.Encoding.dll" + "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Text.Encoding.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6725,26 +3659,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A35B706F66B9C77B3D87D7B0FF53D652" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5731AEC46C736AD3549A441125EE75F9" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.InteropServices.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A35B706F66B9C77B3D87D7B0FF53D652" + "_5731AEC46C736AD3549A441125EE75F9" { - "Name" = "8:System.Runtime.InteropServices.WindowsRuntime.dll" - "Attributes" = "3:0" + "Name" = "8:Microsoft.VisualStudio.Services.Common.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.InteropServices.WindowsRuntime.dll" + "SourcePath" = "8:Microsoft.VisualStudio.Services.Common.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6752,24 +3686,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A7976B20CB4BFC0F5C8BE15430B6005E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5F07DDA90732658EC4A03117CF7DD774" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Text.Encoding.Extensions, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.DragAndDrop, Version=2.0.25.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A7976B20CB4BFC0F5C8BE15430B6005E" + "_5F07DDA90732658EC4A03117CF7DD774" { - "Name" = "8:System.Text.Encoding.Extensions.dll" + "Name" = "8:Tango.DragAndDrop.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Text.Encoding.Extensions.dll" + "SourcePath" = "8:Tango.DragAndDrop.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6787,26 +3721,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AB0E0C1990036EFBAC9C728A9902D668" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6362DA873243657F5F1FD41C1A4E104A" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ComponentModel.Annotations, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.ColorPicker, Version=2.0.19.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_AB0E0C1990036EFBAC9C728A9902D668" + "_6362DA873243657F5F1FD41C1A4E104A" { - "Name" = "8:System.ComponentModel.Annotations.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.ColorPicker.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.ComponentModel.Annotations.dll" + "SourcePath" = "8:Tango.ColorPicker.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6814,30 +3748,30 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AC22B81E0F8A0CB4C79C8B878F2D1BCF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_64AD2A918B16AA625B839A6A2D4288AB" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Linq.Queryable, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_AC22B81E0F8A0CB4C79C8B878F2D1BCF" + "_64AD2A918B16AA625B839A6A2D4288AB" { - "Name" = "8:System.Linq.Queryable.dll" - "Attributes" = "3:0" + "Name" = "8:System.Reactive.Interfaces.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Linq.Queryable.dll" + "SourcePath" = "8:System.Reactive.Interfaces.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -6845,24 +3779,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AED50036F562B75035A039EECFC7BA07" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_705F2A9700A0B6F6A5308537C5F876EA" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.InteropServices, Version=4.0.20.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL" "ScatterAssemblies" { - "_AED50036F562B75035A039EECFC7BA07" + "_705F2A9700A0B6F6A5308537C5F876EA" { - "Name" = "8:System.Runtime.InteropServices.dll" + "Name" = "8:Ionic.Zip.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.InteropServices.dll" + "SourcePath" = "8:Ionic.Zip.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6880,20 +3814,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AF79FC974C2F42D24D74E5313E475E87" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_709D007D7E89A10E63C141E3A08311FD" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Diagnostics.Debug, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" "ScatterAssemblies" { - "_AF79FC974C2F42D24D74E5313E475E87" + "_709D007D7E89A10E63C141E3A08311FD" { - "Name" = "8:System.Diagnostics.Debug.dll" + "Name" = "8:EntityFramework.SqlServer.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Diagnostics.Debug.dll" + "SourcePath" = "8:EntityFramework.SqlServer.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6911,20 +3845,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B12544C6B013F48780D190EB513A3B82" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_712AAF71834640D10C755D415AF2200C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.ColorPicker, Version=2.0.17.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B12544C6B013F48780D190EB513A3B82" + "_712AAF71834640D10C755D415AF2200C" { - "Name" = "8:Tango.ColorPicker.dll" + "Name" = "8:System.Reactive.Linq.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.ColorPicker.dll" + "SourcePath" = "8:System.Reactive.Linq.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6942,20 +3876,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B20313AE68F1E5D38CDE24036C32E69B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_73674B32069839371DC47411D1B7EBE0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B20313AE68F1E5D38CDE24036C32E69B" + "_73674B32069839371DC47411D1B7EBE0" { - "Name" = "8:System.Net.Http.WebRequest.dll" + "Name" = "8:System.Reactive.PlatformServices.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Net.Http.WebRequest.dll" + "SourcePath" = "8:System.Reactive.PlatformServices.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6973,15 +3907,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B78AD04F5CD695E22F6F139EAC69B5A5" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_74A44143E117110ECBFD7D981E9D6D99" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { + "_74A44143E117110ECBFD7D981E9D6D99" + { + "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -6999,26 +3938,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B8EE1FC78F28FD0B62389E8796D603FB" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_75673BFBCF71A9463483B9C1DE022EAB" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Xml.XmlSerializer, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Client, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B8EE1FC78F28FD0B62389E8796D603FB" + "_75673BFBCF71A9463483B9C1DE022EAB" { - "Name" = "8:System.Xml.XmlSerializer.dll" - "Attributes" = "3:0" + "Name" = "8:Microsoft.TeamFoundation.Client.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Xml.XmlSerializer.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.Client.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7026,19 +3965,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BA22D23CB5304B5389C531581B1D5C63" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_76136B423153FD040335B97D71CF6A3E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Diff, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.PMR, Version=2.0.36.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_76136B423153FD040335B97D71CF6A3E" + { + "Name" = "8:Tango.PMR.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Microsoft.TeamFoundation.Diff.dll" + "SourcePath" = "8:Tango.PMR.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7056,20 +4000,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BDEEC0B558BD7D7AF03CB6049BCEBDAC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7A69315CD79099E601F096562C7406DF" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.AutoComplete, Version=1.0.17.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.BL, Version=2.0.32.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_BDEEC0B558BD7D7AF03CB6049BCEBDAC" + "_7A69315CD79099E601F096562C7406DF" { - "Name" = "8:Tango.AutoComplete.dll" + "Name" = "8:Tango.BL.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.AutoComplete.dll" + "SourcePath" = "8:Tango.BL.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7087,15 +4031,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF01A029E83A968C697506DFA469C90B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7A925C02110B1D4B95987D2EEEFE6FDE" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ColorMine, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Common, Version=2.0.26.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_7A925C02110B1D4B95987D2EEEFE6FDE" + { + "Name" = "8:Tango.MachineStudio.Common.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:ColorMine.dll" + "SourcePath" = "8:Tango.MachineStudio.Common.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7113,26 +4062,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C179B63E2F5A58786B70FADA6C8496A5" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7E089FB0FAFDC91358668C33586665F3" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Dynamic.Runtime, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Developer, Version=2.0.17.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_C179B63E2F5A58786B70FADA6C8496A5" + "_7E089FB0FAFDC91358668C33586665F3" { - "Name" = "8:System.Dynamic.Runtime.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.MachineStudio.Developer.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Dynamic.Runtime.dll" + "SourcePath" = "8:Tango.MachineStudio.Developer.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7140,24 +4089,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C5718F2557E2B4CE76D02A14D19B0F00" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7E765F76FDFC3DCF4EAEB59B5546B063" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Technician, Version=2.0.12.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_C5718F2557E2B4CE76D02A14D19B0F00" + "_7E765F76FDFC3DCF4EAEB59B5546B063" { - "Name" = "8:Tango.MachineStudio.Technician.dll" + "Name" = "8:MaterialDesignColors.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.Technician.dll" + "SourcePath" = "8:MaterialDesignColors.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7175,20 +4124,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C658BF7DEB725E94A2BAF4FD48BAD3FA" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7EBA1AC1C70BAC60E9165BB0A3640C98" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.CSV, Version=2.0.17.1657, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Core, Version=2.0.29.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_C658BF7DEB725E94A2BAF4FD48BAD3FA" + "_7EBA1AC1C70BAC60E9165BB0A3640C98" { - "Name" = "8:Tango.CSV.dll" + "Name" = "8:Tango.Core.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.CSV.dll" + "SourcePath" = "8:Tango.Core.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7206,20 +4155,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C6BFB4DAD78C1798616508141EF1234E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_80A5A4D5BE60BC865B4C5F64B5A09D47" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_C6BFB4DAD78C1798616508141EF1234E" + "_80A5A4D5BE60BC865B4C5F64B5A09D47" { - "Name" = "8:System.Threading.Tasks.dll" + "Name" = "8:Microsoft.VisualStudio.Services.WebApi.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Threading.Tasks.dll" + "SourcePath" = "8:Microsoft.VisualStudio.Services.WebApi.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7237,26 +4186,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC07BBC3C44CE424AA0EF90844590E4E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_847DE93907D7F6B17C0694F74120086B" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL" "ScatterAssemblies" { - "_CC07BBC3C44CE424AA0EF90844590E4E" + "_847DE93907D7F6B17C0694F74120086B" { - "Name" = "8:System.Resources.ResourceManager.dll" - "Attributes" = "3:0" + "Name" = "8:FontAwesome.WPF.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Resources.ResourceManager.dll" + "SourcePath" = "8:FontAwesome.WPF.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7264,30 +4213,30 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC7BD04781686DE3403908303698199D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8533A0FC046C1B311644EB6565AADCF4" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Stubs, Version=2.0.9.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_CC7BD04781686DE3403908303698199D" + "_8533A0FC046C1B311644EB6565AADCF4" { - "Name" = "8:System.Linq.Parallel.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.MachineStudio.Stubs.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Linq.Parallel.dll" + "SourcePath" = "8:Tango.MachineStudio.Stubs.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7295,24 +4244,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CCD49B330E05F963B5AE73E3D04F5762" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_88E760F600D2E195D8119F6014AB651E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Primitives, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_CCD49B330E05F963B5AE73E3D04F5762" + "_88E760F600D2E195D8119F6014AB651E" { - "Name" = "8:System.Net.Primitives.dll" + "Name" = "8:System.Net.Http.WebRequest.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Net.Primitives.dll" + "SourcePath" = "8:System.Net.Http.WebRequest.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7330,20 +4279,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D09F278664B0560653FAC1AD0BCAE93F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8939008A4B57155156AE83AACC008030" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite.EF6, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Settings, Version=2.0.27.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D09F278664B0560653FAC1AD0BCAE93F" + "_8939008A4B57155156AE83AACC008030" { - "Name" = "8:System.Data.SQLite.EF6.dll" + "Name" = "8:Tango.Settings.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Data.SQLite.EF6.dll" + "SourcePath" = "8:Tango.Settings.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7361,15 +4310,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D0CFB25F1239503E9FE3881A033B3110" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_89CF13C29028D3D7E6E68C097A72CB90" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Updater, Version=2.0.8.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_89CF13C29028D3D7E6E68C097A72CB90" + { + "Name" = "8:Tango.MachineStudio.Updater.exe" + "Attributes" = "3:512" + } } - "SourcePath" = "8:System.Web.Razor.dll" + "SourcePath" = "8:Tango.MachineStudio.Updater.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7387,20 +4341,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D1CB239DDD65E78A28094BC854772AFF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8F71C11DA0BAD2C98087755DC7A25AD3" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime, Version=4.0.20.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.EmbroideryUI, Version=1.0.7.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D1CB239DDD65E78A28094BC854772AFF" + "_8F71C11DA0BAD2C98087755DC7A25AD3" { - "Name" = "8:System.Runtime.dll" + "Name" = "8:Tango.EmbroideryUI.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.dll" + "SourcePath" = "8:Tango.EmbroideryUI.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7418,20 +4372,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D3EF38D40E0CBE1BD391303952B0493E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_90D408142B1F2A9F72CBF42FC38348F0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Xml.XDocument, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D3EF38D40E0CBE1BD391303952B0493E" + "_90D408142B1F2A9F72CBF42FC38348F0" { - "Name" = "8:System.Xml.XDocument.dll" + "Name" = "8:System.Reactive.Windows.Threading.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Xml.XDocument.dll" + "SourcePath" = "8:System.Reactive.Windows.Threading.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7449,26 +4403,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D48D475C8BD232C2AC87A2A7C6CCA53D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_92EADCA3313D55CFE2BB3BBA193941F3" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D48D475C8BD232C2AC87A2A7C6CCA53D" + "_92EADCA3313D55CFE2BB3BBA193941F3" { - "Name" = "8:System.Security.Principal.dll" - "Attributes" = "3:0" + "Name" = "8:System.Reactive.Core.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Security.Principal.dll" + "SourcePath" = "8:System.Reactive.Core.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7476,24 +4430,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D528F21311ECF12D91A0EFF0F8DCA468" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_949EF578C14CE0D93133060EF66C018F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Stubs, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.MachineDesigner, Version=2.0.10.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D528F21311ECF12D91A0EFF0F8DCA468" + "_949EF578C14CE0D93133060EF66C018F" { - "Name" = "8:Tango.Stubs.dll" + "Name" = "8:Tango.MachineStudio.MachineDesigner.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.Stubs.dll" + "SourcePath" = "8:Tango.MachineStudio.MachineDesigner.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7511,15 +4465,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D66A3A6B6E4CBDAA1D6A1FD30FFAB6F2" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_95EBE8B225CEEAD24E06F44863ABAECB" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ICSharpCode.AvalonEdit, Version=1.0.18.1933, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_95EBE8B225CEEAD24E06F44863ABAECB" + { + "Name" = "8:ICSharpCode.AvalonEdit.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" + "SourcePath" = "8:ICSharpCode.AvalonEdit.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7537,20 +4496,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D6A37AFBBBDA445164B68F2E7D5B3E80" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_98D5175644A3BC174BCA498A1B20FF84" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Editors, Version=2.0.17.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Dragablz, Version=0.0.3.197, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D6A37AFBBBDA445164B68F2E7D5B3E80" + "_98D5175644A3BC174BCA498A1B20FF84" { - "Name" = "8:Tango.Editors.dll" + "Name" = "8:Dragablz.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.Editors.dll" + "SourcePath" = "8:Dragablz.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7568,26 +4527,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D8A84B2F626300DA2E9147709713E9CB" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_99DFCB38D3C7E1A7AC6AE6E2397D5EAE" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ServiceModel.Duplex, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.Scripting, Version=2.0.26.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D8A84B2F626300DA2E9147709713E9CB" + "_99DFCB38D3C7E1A7AC6AE6E2397D5EAE" { - "Name" = "8:System.ServiceModel.Duplex.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.Scripting.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.ServiceModel.Duplex.dll" + "SourcePath" = "8:Tango.Scripting.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7595,24 +4554,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D947550594E2BF53BED76C7D7F9747D7" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9A234F7FB4239AC3DB0DBE9415BDE695" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + "AssemblyAsmDisplayName" = "8:Tango.AutoComplete, Version=1.0.20.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D947550594E2BF53BED76C7D7F9747D7" + "_9A234F7FB4239AC3DB0DBE9415BDE695" { - "Name" = "8:System.IO.Compression.FileSystem.dll" + "Name" = "8:Tango.AutoComplete.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.IO.Compression.FileSystem.dll" + "SourcePath" = "8:Tango.AutoComplete.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7630,15 +4589,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D949D70DDDDCF94CDCAD9B76A400C3D3" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9A98137A42052685F51607892D00B8A0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Proxy, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.Logging, Version=2.0.33.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_9A98137A42052685F51607892D00B8A0" + { + "Name" = "8:Tango.Logging.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" + "SourcePath" = "8:Tango.Logging.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7656,21 +4620,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DB4941BAFA45E5921E7072990000621E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9C822EC8B208111C8872DC2C929B4F49" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Logging, Version=2.0.30.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { + "_9C822EC8B208111C8872DC2C929B4F49" + { + "Name" = "8:System.Windows.dll" + "Attributes" = "3:0" + } } - "SourcePath" = "8:Tango.Logging.dll" + "SourcePath" = "8:System.Windows.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" + "Vital" = "11:FALSE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7678,24 +4647,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DB4A94107FB1929721E56ED40844F276" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A1336C0121F3132E09400329ACD12B30" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Runtime.InteropServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:SimpleValidator, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DB4A94107FB1929721E56ED40844F276" + "_A1336C0121F3132E09400329ACD12B30" { - "Name" = "8:System.Runtime.InteropServices.dll" + "Name" = "8:SimpleValidator.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.InteropServices.dll" + "SourcePath" = "8:SimpleValidator.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7713,26 +4682,15 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DC627D829804D2AC4A3984133840F2D5" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A17D8A4EDE1F489FABA27DB45F1A3F56" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_DC627D829804D2AC4A3984133840F2D5" - { - "Name" = "8:System.ServiceModel.NetTcp.dll" - "Attributes" = "3:0" - } - } - "SourcePath" = "8:System.ServiceModel.NetTcp.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\..\\Build\\Core\\Debug\\x64\\SQLite.Interop.dll" + "TargetName" = "8:SQLite.Interop.dll" "Tag" = "8:" - "Folder" = "8:_C15E39669002469F98F297C08D55903C" + "Folder" = "8:_37D35F637FDD433095D8A36CAA7424C8" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7740,24 +4698,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DCD0D71251FAABFB20D57E60AC3DEFA3" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A9A74798DD330F41ADBD32DBB9480F5C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Globalization, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.Transport, Version=2.0.28.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DCD0D71251FAABFB20D57E60AC3DEFA3" + "_A9A74798DD330F41ADBD32DBB9480F5C" { - "Name" = "8:System.Globalization.dll" + "Name" = "8:Tango.Transport.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Globalization.dll" + "SourcePath" = "8:Tango.Transport.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7775,20 +4733,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD10CB022785FD0CE997E8C7BC1D0FE6" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AC9A178FF920FC61BC39E1F955343BF2" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DD10CB022785FD0CE997E8C7BC1D0FE6" + "_AC9A178FF920FC61BC39E1F955343BF2" { - "Name" = "8:System.Threading.dll" + "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Threading.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7806,26 +4764,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD77D7B58FFDC37F83D85D632BEC9DC4" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ACA4B81C7B67E4C6FD57C20AD15BF952" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.Logging, Version=2.0.17.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DD77D7B58FFDC37F83D85D632BEC9DC4" + "_ACA4B81C7B67E4C6FD57C20AD15BF952" { - "Name" = "8:System.Runtime.Numerics.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.MachineStudio.Logging.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.Numerics.dll" + "SourcePath" = "8:Tango.MachineStudio.Logging.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7833,24 +4791,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DE3FACD5F197D2E261A0C6B32E0D1CAC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B0A07289218E6EFD42CF3518073813D6" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Primitives, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DE3FACD5F197D2E261A0C6B32E0D1CAC" + "_B0A07289218E6EFD42CF3518073813D6" { - "Name" = "8:System.Runtime.Serialization.Primitives.dll" + "Name" = "8:System.IO.Compression.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Runtime.Serialization.Primitives.dll" + "SourcePath" = "8:System.IO.Compression.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7868,15 +4826,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DF6FFF88157E7FBCFB7E188431AAF4CF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B0DC463AFB084472BA1EA9F43F930940" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.PMR, Version=2.0.33.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.HardwareDesigner, Version=2.0.10.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_B0DC463AFB084472BA1EA9F43F930940" + { + "Name" = "8:Tango.MachineStudio.HardwareDesigner.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Tango.PMR.dll" + "SourcePath" = "8:Tango.MachineStudio.HardwareDesigner.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7894,26 +4857,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0573A6D7543083D0A5654271DF50643" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B0F63EB1426CCC22506AFCB6C5809138" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ComponentModel.EventBasedAsync, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.SharedUI, Version=2.0.27.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E0573A6D7543083D0A5654271DF50643" + "_B0F63EB1426CCC22506AFCB6C5809138" { - "Name" = "8:System.ComponentModel.EventBasedAsync.dll" - "Attributes" = "3:0" + "Name" = "8:Tango.SharedUI.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.ComponentModel.EventBasedAsync.dll" + "SourcePath" = "8:Tango.SharedUI.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -7921,24 +4884,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0FCEE9366306B5A88DC7CF29E913A4B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B363FB7BD2F44E6C8573500668C2C9D1" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.Integration, Version=2.0.28.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E0FCEE9366306B5A88DC7CF29E913A4B" + "_B363FB7BD2F44E6C8573500668C2C9D1" { - "Name" = "8:System.Collections.dll" + "Name" = "8:Tango.Integration.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Collections.dll" + "SourcePath" = "8:Tango.Integration.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7956,15 +4919,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E97069A1CAEDE89621181DEE3B97B547" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B706D77ACF741812BE0E0A94728413E8" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.Common, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { + "_B706D77ACF741812BE0E0A94728413E8" + { + "Name" = "8:System.Net.Http.Formatting.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Microsoft.VisualStudio.Services.Common.dll" + "SourcePath" = "8:System.Net.Http.Formatting.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -7982,15 +4950,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E9B6634643306242F65E192204E9C56A" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BA75D5EAA8F428D075548128CE91FDD3" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.TFS, Version=2.0.17.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { + "_BA75D5EAA8F428D075548128CE91FDD3" + { + "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Tango.TFS.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8008,20 +4981,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EA4D0354739F3915FC03731153325AA5" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BD559C5264D2EB8DB2F96C7F161ECCFE" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.DAL.Local, Version=2.0.14.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:WpfAnimatedGif, Version=1.4.14.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EA4D0354739F3915FC03731153325AA5" + "_BD559C5264D2EB8DB2F96C7F161ECCFE" { - "Name" = "8:Tango.DAL.Local.dll" + "Name" = "8:WpfAnimatedGif.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.DAL.Local.dll" + "SourcePath" = "8:WpfAnimatedGif.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8039,20 +5012,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EB16994750C856659A7BE41BD02F8ABE" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C28A9B0313A578C409D1E57773FB001E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Video, Version=2.0.17.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.DAL.Remote, Version=2.0.28.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EB16994750C856659A7BE41BD02F8ABE" + "_C28A9B0313A578C409D1E57773FB001E" { - "Name" = "8:Tango.Video.dll" + "Name" = "8:Tango.DAL.Remote.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.Video.dll" + "SourcePath" = "8:Tango.DAL.Remote.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8070,20 +5043,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EB38C1BD04FDFE44579B9868D6D1E139" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C5F581AD9F0D1DCAB6E2DE32A49DCD96" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Work.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EB38C1BD04FDFE44579B9868D6D1E139" + "_C5F581AD9F0D1DCAB6E2DE32A49DCD96" { - "Name" = "8:MaterialDesignThemes.Wpf.dll" + "Name" = "8:Microsoft.TeamFoundation.Work.WebApi.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MaterialDesignThemes.Wpf.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.Work.WebApi.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8101,20 +5074,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EB90C5C498BD80F4675C07A364C45E3D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C78640287566584857304B60C7E09D2E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Diagnostics.Debug, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EB90C5C498BD80F4675C07A364C45E3D" + "_C78640287566584857304B60C7E09D2E" { - "Name" = "8:System.Diagnostics.Debug.dll" + "Name" = "8:System.Web.Razor.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Diagnostics.Debug.dll" + "SourcePath" = "8:System.Web.Razor.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8132,20 +5105,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EBFEF6DABA658232EC82197A8E01F66E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C79F4B145CE2D951C3E342053EC26159" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading.Tasks, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Tango.CodeGeneration, Version=2.0.16.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EBFEF6DABA658232EC82197A8E01F66E" + "_C79F4B145CE2D951C3E342053EC26159" { - "Name" = "8:System.Threading.Tasks.dll" + "Name" = "8:Tango.CodeGeneration.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Threading.Tasks.dll" + "SourcePath" = "8:Tango.CodeGeneration.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8163,15 +5136,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ED524252AD28281FAE5468349D0E5797" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CAE724B9A481E2BAEC967AC01E7440FC" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ICSharpCode.AvalonEdit, Version=1.0.18.1933, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.WorkItemTracking.Proxy, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { + "_CAE724B9A481E2BAEC967AC01E7440FC" + { + "Name" = "8:Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:ICSharpCode.AvalonEdit.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8189,26 +5167,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EF2623DE67EDC70B584821A055B86302" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D09F278664B0560653FAC1AD0BCAE93F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Requests, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:System.Data.SQLite.EF6, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EF2623DE67EDC70B584821A055B86302" + "_D09F278664B0560653FAC1AD0BCAE93F" { - "Name" = "8:System.Net.Requests.dll" - "Attributes" = "3:0" + "Name" = "8:System.Data.SQLite.EF6.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Net.Requests.dll" + "SourcePath" = "8:System.Data.SQLite.EF6.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -8216,24 +5194,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EF2898B0C9AAB2E33674325B9F86943B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D7FBEFA3359B5E4558E45316AF3159B0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:FluentFTP, Version=19.1.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EF2898B0C9AAB2E33674325B9F86943B" + "_D7FBEFA3359B5E4558E45316AF3159B0" { - "Name" = "8:FluentFTP.dll" + "Name" = "8:Newtonsoft.Json.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:FluentFTP.dll" + "SourcePath" = "8:Newtonsoft.Json.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8251,15 +5229,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F1DFFB8E50BAD2529B0C859268ED8956" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DB4BF3BCEC4456BC4D94E6F732E82803" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.Scripting, Version=2.0.23.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.19.8.16603, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" "ScatterAssemblies" { + "_DB4BF3BCEC4456BC4D94E6F732E82803" + { + "Name" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Tango.Scripting.dll" + "SourcePath" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8277,12 +5260,23 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F3898C4F454B4D1481E055F2AB2B217B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DF9470C286C095EB5289BC0A57E7AA2C" { - "SourcePath" = "8:..\\..\\Build\\Debug\\x64\\SQLite.Interop.dll" - "TargetName" = "8:SQLite.Interop.dll" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Tango.TFS, Version=2.0.19.1159, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_DF9470C286C095EB5289BC0A57E7AA2C" + { + "Name" = "8:Tango.TFS.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Tango.TFS.dll" + "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_37D35F637FDD433095D8A36CAA7424C8" + "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -8294,29 +5288,29 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F3D3908BF1850F33CACA8DC41CB6869E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0B7DFF98B1B17C9E2E2BD3B6DBBFF8A" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:RazorEngine, Version=3.10.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_F3D3908BF1850F33CACA8DC41CB6869E" + "_E0B7DFF98B1B17C9E2E2BD3B6DBBFF8A" { - "Name" = "8:System.ComponentModel.dll" - "Attributes" = "3:0" + "Name" = "8:RazorEngine.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.ComponentModel.dll" + "SourcePath" = "8:RazorEngine.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -8324,24 +5318,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F46F8B020857673C983D66FE2F41B983" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E521ECFD6C000298EBF2C298D2E4376B" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Linq.Expressions, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Services.Client.Interactive, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_F46F8B020857673C983D66FE2F41B983" + "_E521ECFD6C000298EBF2C298D2E4376B" { - "Name" = "8:System.Linq.Expressions.dll" + "Name" = "8:Microsoft.VisualStudio.Services.Client.Interactive.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Linq.Expressions.dll" + "SourcePath" = "8:Microsoft.VisualStudio.Services.Client.Interactive.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8359,20 +5353,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F78136CC822CCB014A68583A48E41B1C" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EB38C1BD04FDFE44579B9868D6D1E139" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.Collections.Concurrent, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_F78136CC822CCB014A68583A48E41B1C" + "_EB38C1BD04FDFE44579B9868D6D1E139" { - "Name" = "8:System.Collections.Concurrent.dll" + "Name" = "8:MaterialDesignThemes.Wpf.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Collections.Concurrent.dll" + "SourcePath" = "8:MaterialDesignThemes.Wpf.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8390,15 +5384,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F93FF260A2F031FD129C02F9FB2A6E9D" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ECDF8B3BECC1C92F35C36C2743D8E99E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.13.5.907, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ColorMine, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_ECDF8B3BECC1C92F35C36C2743D8E99E" + { + "Name" = "8:ColorMine.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Microsoft.IdentityModel.Clients.ActiveDirectory.dll" + "SourcePath" = "8:ColorMine.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8416,26 +5415,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FA58218115CCED35D22896A731510356" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EF2898B0C9AAB2E33674325B9F86943B" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:FluentFTP, Version=19.1.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FA58218115CCED35D22896A731510356" + "_EF2898B0C9AAB2E33674325B9F86943B" { - "Name" = "8:System.Net.Http.dll" - "Attributes" = "3:0" + "Name" = "8:FluentFTP.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Net.Http.dll" + "SourcePath" = "8:FluentFTP.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -8443,30 +5442,30 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FA997D5286D6E9EC1A80EB888D9FDA72" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FB49CF72492394629C7D629F6FAB4446" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Diagnostics.Tracing, Version=4.0.20.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:Microsoft.TeamFoundation.Core.WebApi, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FA997D5286D6E9EC1A80EB888D9FDA72" + "_FB49CF72492394629C7D629F6FAB4446" { - "Name" = "8:System.Diagnostics.Tracing.dll" - "Attributes" = "3:0" + "Name" = "8:Microsoft.TeamFoundation.Core.WebApi.dll" + "Attributes" = "3:512" } } - "SourcePath" = "8:System.Diagnostics.Tracing.dll" + "SourcePath" = "8:Microsoft.TeamFoundation.Core.WebApi.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" "Condition" = "8:" "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" + "Vital" = "11:TRUE" "ReadOnly" = "11:FALSE" "Hidden" = "11:FALSE" "System" = "11:FALSE" @@ -8474,24 +5473,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FAAE7C62982AB9171B3FF838FB304946" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FF26B2424D1F2EB451FE2EDE8CD8D7CD" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.DB, Version=2.0.7.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.BrushPicker, Version=2.0.8.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FAAE7C62982AB9171B3FF838FB304946" + "_FF26B2424D1F2EB451FE2EDE8CD8D7CD" { - "Name" = "8:Tango.MachineStudio.DB.dll" + "Name" = "8:Tango.BrushPicker.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Tango.MachineStudio.DB.dll" + "SourcePath" = "8:Tango.BrushPicker.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8509,15 +5508,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FC7C3735446215F02CF0C477948EAAFC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FF9B3021994C6FE507A9C7BE198B6C03" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Tango.BL, Version=2.0.29.1633, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Tango.MachineStudio.DataCapture, Version=2.0.10.1159, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_FF9B3021994C6FE507A9C7BE198B6C03" + { + "Name" = "8:Tango.MachineStudio.DataCapture.dll" + "Attributes" = "3:512" + } } - "SourcePath" = "8:Tango.BL.dll" + "SourcePath" = "8:Tango.MachineStudio.DataCapture.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" @@ -8613,15 +5617,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Machine Studio" - "ProductCode" = "8:{2CDA6309-5459-4D45-A1FC-EB5CBBC52831}" - "PackageCode" = "8:{C18A9C7E-6284-435F-A456-2A82C19193FC}" + "ProductCode" = "8:{2E4CACCC-2148-47D2-BAFC-0043F43606F1}" + "PackageCode" = "8:{E5879A51-DF44-466E-8E92-5D6168C66522}" "UpgradeCode" = "8:{EDD5BF5D-A0F0-4016-AE0A-5C008DD66BB6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.5" + "ProductVersion" = "8:3.2.0" "Manufacturer" = "8:Twine" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -9163,7 +6167,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_136196DD2763419D959721C2BA143498" { - "SourcePath" = "8:..\\Tango.MachineStudio.UI\\obj\\Debug\\Tango.MachineStudio.UI.exe" + "SourcePath" = "8:..\\Tango.MachineStudio.UI\\obj\\Release\\Tango.MachineStudio.UI.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C15E39669002469F98F297C08D55903C" 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 3e03d33f8..9599dd8cf 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("3.0.25.18235")] +[assembly: AssemblyVersion("3.0.30.18235")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs index 6dbc99591..c5831f701 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs @@ -294,9 +294,6 @@ namespace Tango.MachineStudio.UI.ViewModels } } - //Copy new updater utility to app path. - File.Copy(Path.Combine(_newPackageTempFolder, "Tango.MachineStudio.Updater.exe"), Path.Combine(_appPath, "Tango.MachineStudio.Updater.exe"), true); - TangoIOC.Default.GetInstance().DisableCheckForUpdates = true; Status = UpdateStatus.UpdateCompleted; } @@ -322,9 +319,9 @@ namespace Tango.MachineStudio.UI.ViewModels try { Process p = new Process(); - p.StartInfo.FileName = _appPath + "\\Tango.MachineStudio.Updater.exe"; + p.StartInfo.FileName = _newPackageTempFolder + "\\Tango.MachineStudio.Updater.exe"; p.StartInfo.UseShellExecute = true; - p.StartInfo.Arguments = _newPackageTempFolder; + p.StartInfo.Arguments = _appPath; p.Start(); } catch (Exception ex) diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs index 4e6a8ad63..759f5d8d1 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs @@ -23,13 +23,13 @@ namespace Tango.MachineStudio.Updater /// public partial class MainWindow : Window { - private String _appPath = AppDomain.CurrentDomain.BaseDirectory; + private String _sourceFolder = AppDomain.CurrentDomain.BaseDirectory; private String _msProcessName = "Tango.MachineStudio.UI"; - private String _sourceFolder = App.StartupArgs.FirstOrDefault(); + private String _appPath = String.Join(" ", App.StartupArgs); public MainWindow() { - if (!Directory.Exists(_sourceFolder)) + if (!Directory.Exists(_appPath)) { ShowError("This update utility can only be executed by Machine Studio."); Environment.Exit(0); @@ -74,7 +74,12 @@ namespace Tango.MachineStudio.Updater { File.Delete(dll); } - catch { } + catch + { + ShowError($"The file '{Path.GetFileName(dll)}' could not be removed. Please close all instances of Machine Studio and press OK."); + RemoveOldDLLFiles(); + return; + } } } @@ -129,11 +134,23 @@ namespace Tango.MachineStudio.Updater do { appProcess = Process.GetProcessesByName(_msProcessName).FirstOrDefault(); + Process p = new Process(); + p.StartInfo.CreateNoWindow = true; + p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + p.StartInfo.FileName = "wmic"; + p.StartInfo.Arguments = String.Format("process where name='{0}' delete", _msProcessName); if (appProcess != null) { tries++; appProcess.Kill(); + + try + { + p.Start(); + } + catch { } + Thread.Sleep(1000); } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs index e9a89a0ee..10e0e252e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Updater Utility")] -[assembly: AssemblyVersion("2.0.7.1633")] +[assembly: AssemblyVersion("2.0.8.1159")] [assembly: ComVisible(false)] [assembly:ThemeInfo( diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs index 7c5ff58ed..7e97f99ed 100644 --- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.19.1119")] +[assembly: AssemblyVersion("1.0.20.1159")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs index fe55fc94f..f45705ea0 100644 --- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows.Markup; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.19.1119")] +[assembly: AssemblyVersion("1.0.20.1159")] [assembly: AssemblyFileVersion("1.0.0.8")] diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs index 61f03b23b..25e54b896 100644 --- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Business logic components")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.0.31.1119")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.32.1159")] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs index 7f08c02ac..1a30d2c82 100644 --- a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ using System.Windows; using System.Windows.Markup; [assembly: AssemblyTitle("Tango - Brush Picker Control")] -[assembly: AssemblyVersion("2.0.7.1633")] +[assembly: AssemblyVersion("2.0.8.1159")] [assembly: ThemeInfo(ResourceDictionaryLocation.SourceAssembly, ResourceDictionaryLocation.SourceAssembly)] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/Software/Visual_Studio/Tango.CircularGauge/CircularGaugeControl.cs b/Software/Visual_Studio/Tango.CircularGauge/CircularGaugeControl.cs index f2068d713..344308dac 100644 --- a/Software/Visual_Studio/Tango.CircularGauge/CircularGaugeControl.cs +++ b/Software/Visual_Studio/Tango.CircularGauge/CircularGaugeControl.cs @@ -1141,132 +1141,136 @@ namespace Tango.CircularGauge //Drawing the scale with the Scale Radius private void DrawScale() { - foreach (var item in _toClear) + try { - rootGrid.Children.Remove(item); - } - - _toClear.Clear(); - - //Calculate one major tick angle - Double majorTickUnitAngle = ScaleSweepAngle / MajorDivisionsCount; - - //Obtaining One minor tick angle - Double minorTickUnitAngle = ScaleSweepAngle / MinorDivisionsCount; - - //Obtaining One major ticks value - Double majorTicksUnitValue = (MaxValue - MinValue) / MajorDivisionsCount; - majorTicksUnitValue = Math.Round(majorTicksUnitValue, ScaleValuePrecision); - - Double minvalue = MinValue; ; - - // Drawing Major scale ticks - for (Double i = ScaleStartAngle; i <= (ScaleStartAngle + ScaleSweepAngle); i = i + majorTickUnitAngle) - { - - //Majortick is drawn as a rectangle - Rectangle majortickrect = new Rectangle(); - majortickrect.Height = MajorTickSize.Height; - majortickrect.Width = MajorTickSize.Width; - majortickrect.Fill = new SolidColorBrush(MajorTickColor); - Point p = new Point(0.5, 0.5); - majortickrect.RenderTransformOrigin = p; - majortickrect.HorizontalAlignment = HorizontalAlignment.Center; - majortickrect.VerticalAlignment = VerticalAlignment.Center; - - TransformGroup majortickgp = new TransformGroup(); - RotateTransform majortickrt = new RotateTransform(); - - //Obtaining the angle in radians for calulating the points - Double i_radian = (i * Math.PI) / 180; - majortickrt.Angle = i; - majortickgp.Children.Add(majortickrt); - TranslateTransform majorticktt = new TranslateTransform(); + foreach (var item in _toClear) + { + rootGrid.Children.Remove(item); + } - //Finding the point on the Scale where the major ticks are drawn - //here drawing the points with center as (0,0) - majorticktt.X = (int)((ScaleRadius) * Math.Cos(i_radian)); - majorticktt.Y = (int)((ScaleRadius) * Math.Sin(i_radian)); + _toClear.Clear(); - //Points for the textblock which hold the scale value - TranslateTransform majorscalevaluett = new TranslateTransform(); - //here drawing the points with center as (0,0) - majorscalevaluett.X = (int)((ScaleLabelRadius) * Math.Cos(i_radian)); - majorscalevaluett.Y = (int)((ScaleLabelRadius) * Math.Sin(i_radian)); + //Calculate one major tick angle + Double majorTickUnitAngle = ScaleSweepAngle / MajorDivisionsCount; - //Defining the properties of the scale value textbox - TextBlock tb = new TextBlock(); + //Obtaining One minor tick angle + Double minorTickUnitAngle = ScaleSweepAngle / MinorDivisionsCount; - tb.Height = ScaleLabelSize.Height; - tb.Width = ScaleLabelSize.Width; - tb.FontSize = ScaleLabelFontSize; - tb.Foreground = new SolidColorBrush(ScaleLabelForeground); - tb.TextAlignment = TextAlignment.Center; - tb.VerticalAlignment = VerticalAlignment.Center; - tb.HorizontalAlignment = HorizontalAlignment.Center; + //Obtaining One major ticks value + Double majorTicksUnitValue = (MaxValue - MinValue) / MajorDivisionsCount; + majorTicksUnitValue = Math.Round(majorTicksUnitValue, ScaleValuePrecision); - //Writing and appending the scale value + Double minvalue = MinValue; ; - //checking minvalue < maxvalue w.r.t scale precion value - if (Math.Round(minvalue, ScaleValuePrecision) <= Math.Round(MaxValue, ScaleValuePrecision)) + // Drawing Major scale ticks + for (Double i = ScaleStartAngle; i <= (ScaleStartAngle + ScaleSweepAngle); i = i + majorTickUnitAngle) { - minvalue = Math.Round(minvalue, ScaleValuePrecision); - tb.Text = minvalue.ToString(); - minvalue = minvalue + majorTicksUnitValue; - } - else - { - break; - } - majortickgp.Children.Add(majorticktt); - majortickrect.RenderTransform = majortickgp; - tb.RenderTransform = majorscalevaluett; + //Majortick is drawn as a rectangle + Rectangle majortickrect = new Rectangle(); + majortickrect.Height = MajorTickSize.Height; + majortickrect.Width = MajorTickSize.Width; + majortickrect.Fill = new SolidColorBrush(MajorTickColor); + Point p = new Point(0.5, 0.5); + majortickrect.RenderTransformOrigin = p; + majortickrect.HorizontalAlignment = HorizontalAlignment.Center; + majortickrect.VerticalAlignment = VerticalAlignment.Center; + + TransformGroup majortickgp = new TransformGroup(); + RotateTransform majortickrt = new RotateTransform(); + + //Obtaining the angle in radians for calulating the points + Double i_radian = (i * Math.PI) / 180; + majortickrt.Angle = i; + majortickgp.Children.Add(majortickrt); + TranslateTransform majorticktt = new TranslateTransform(); + + //Finding the point on the Scale where the major ticks are drawn + //here drawing the points with center as (0,0) + majorticktt.X = (int)((ScaleRadius) * Math.Cos(i_radian)); + majorticktt.Y = (int)((ScaleRadius) * Math.Sin(i_radian)); + + //Points for the textblock which hold the scale value + TranslateTransform majorscalevaluett = new TranslateTransform(); + //here drawing the points with center as (0,0) + majorscalevaluett.X = (int)((ScaleLabelRadius) * Math.Cos(i_radian)); + majorscalevaluett.Y = (int)((ScaleLabelRadius) * Math.Sin(i_radian)); + + //Defining the properties of the scale value textbox + TextBlock tb = new TextBlock(); + + tb.Height = ScaleLabelSize.Height; + tb.Width = ScaleLabelSize.Width; + tb.FontSize = ScaleLabelFontSize; + tb.Foreground = new SolidColorBrush(ScaleLabelForeground); + tb.TextAlignment = TextAlignment.Center; + tb.VerticalAlignment = VerticalAlignment.Center; + tb.HorizontalAlignment = HorizontalAlignment.Center; + + //Writing and appending the scale value + + //checking minvalue < maxvalue w.r.t scale precion value + if (Math.Round(minvalue, ScaleValuePrecision) <= Math.Round(MaxValue, ScaleValuePrecision)) + { + minvalue = Math.Round(minvalue, ScaleValuePrecision); + tb.Text = minvalue.ToString(); + minvalue = minvalue + majorTicksUnitValue; - AddToRootGrid(majortickrect); - AddToRootGrid(tb); + } + else + { + break; + } + majortickgp.Children.Add(majorticktt); + majortickrect.RenderTransform = majortickgp; + tb.RenderTransform = majorscalevaluett; + AddToRootGrid(majortickrect); + AddToRootGrid(tb); - //Drawing the minor axis ticks - Double onedegree = ((i + majorTickUnitAngle) - i) / (MinorDivisionsCount); - if ((i < (ScaleStartAngle + ScaleSweepAngle)) && (Math.Round(minvalue, ScaleValuePrecision) <= Math.Round(MaxValue, ScaleValuePrecision))) - { - //Drawing the minor scale - for (Double mi = i + onedegree; mi < (i + majorTickUnitAngle); mi = mi + onedegree) + //Drawing the minor axis ticks + Double onedegree = ((i + majorTickUnitAngle) - i) / (MinorDivisionsCount); + + if ((i < (ScaleStartAngle + ScaleSweepAngle)) && (Math.Round(minvalue, ScaleValuePrecision) <= Math.Round(MaxValue, ScaleValuePrecision))) { - //here the minortick is drawn as a rectangle - Rectangle mr = new Rectangle(); - mr.Height = MinorTickSize.Height; - mr.Width = MinorTickSize.Width; - mr.Fill = new SolidColorBrush(MinorTickColor); - mr.HorizontalAlignment = HorizontalAlignment.Center; - mr.VerticalAlignment = VerticalAlignment.Center; - Point p1 = new Point(0.5, 0.5); - mr.RenderTransformOrigin = p1; - - TransformGroup minortickgp = new TransformGroup(); - RotateTransform minortickrt = new RotateTransform(); - minortickrt.Angle = mi; - minortickgp.Children.Add(minortickrt); - TranslateTransform minorticktt = new TranslateTransform(); - - //Obtaining the angle in radians for calulating the points - Double mi_radian = (mi * Math.PI) / 180; - //Finding the point on the Scale where the minor ticks are drawn - minorticktt.X = (int)((ScaleRadius) * Math.Cos(mi_radian)); - minorticktt.Y = (int)((ScaleRadius) * Math.Sin(mi_radian)); - - minortickgp.Children.Add(minorticktt); - mr.RenderTransform = minortickgp; - AddToRootGrid(mr); + //Drawing the minor scale + for (Double mi = i + onedegree; mi < (i + majorTickUnitAngle); mi = mi + onedegree) + { + //here the minortick is drawn as a rectangle + Rectangle mr = new Rectangle(); + mr.Height = MinorTickSize.Height; + mr.Width = MinorTickSize.Width; + mr.Fill = new SolidColorBrush(MinorTickColor); + mr.HorizontalAlignment = HorizontalAlignment.Center; + mr.VerticalAlignment = VerticalAlignment.Center; + Point p1 = new Point(0.5, 0.5); + mr.RenderTransformOrigin = p1; + + TransformGroup minortickgp = new TransformGroup(); + RotateTransform minortickrt = new RotateTransform(); + minortickrt.Angle = mi; + minortickgp.Children.Add(minortickrt); + TranslateTransform minorticktt = new TranslateTransform(); + + //Obtaining the angle in radians for calulating the points + Double mi_radian = (mi * Math.PI) / 180; + //Finding the point on the Scale where the minor ticks are drawn + minorticktt.X = (int)((ScaleRadius) * Math.Cos(mi_radian)); + minorticktt.Y = (int)((ScaleRadius) * Math.Sin(mi_radian)); + + minortickgp.Children.Add(minorticktt); + mr.RenderTransform = minortickgp; + AddToRootGrid(mr); + } + } } - } + catch { } } /// diff --git a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs index ad0fae039..774817e96 100644 --- a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Circular Gauge Control")] -[assembly: AssemblyVersion("2.0.8.1633")] +[assembly: AssemblyVersion("2.0.9.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs index 0af1368ea..20dcb4bd3 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Code Generation Components")] -[assembly: AssemblyVersion("2.0.15.1119")] +[assembly: AssemblyVersion("2.0.16.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs index 6e2d78894..197519c5d 100644 --- a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Color Picker Control")] -[assembly: AssemblyVersion("2.0.18.1647")] +[assembly: AssemblyVersion("2.0.19.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs index 317a279c1..5aaa2dc89 100644 --- a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Core Components")] -[assembly: AssemblyVersion("2.0.28.1119")] +[assembly: AssemblyVersion("2.0.29.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs index 7a144f91f..503358e52 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Local Data Access Layer")] -[assembly: AssemblyVersion("2.0.14.1633")] +[assembly: AssemblyVersion("2.0.15.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs index 3e0ab9b2a..0451b40cb 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Remote Data Access Layer")] -[assembly: AssemblyVersion("2.0.27.1119")] +[assembly: AssemblyVersion("2.0.28.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs index 17e5d4ce5..59c4db84b 100644 --- a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Drag & Drop Components")] -[assembly: AssemblyVersion("2.0.24.1647")] +[assembly: AssemblyVersion("2.0.25.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs index a15c6552c..4817edcea 100644 --- a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Visual Diagram Editing Components")] -[assembly: AssemblyVersion("2.0.18.1647")] +[assembly: AssemblyVersion("2.0.19.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs index c9257949f..7e9d1cccb 100644 --- a/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Properties/AssemblyInfo.cs @@ -44,5 +44,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.6.1119")] +[assembly: AssemblyVersion("1.0.7.1159")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs index 9b5c07f0c..4a4e9ba07 100644 --- a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Emulation Components")] -[assembly: AssemblyVersion("2.0.10.1119")] +[assembly: AssemblyVersion("2.0.11.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs index 3794ca0e3..e4f6aa19e 100644 --- a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Hive UI Components")] -[assembly: AssemblyVersion("2.0.12.1633")] +[assembly: AssemblyVersion("2.0.13.1159")] [assembly:ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs index 8aa4a48a5..f48c6c5b6 100644 --- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.27.1119")] +[assembly: AssemblyVersion("2.0.28.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs index 66407c1bd..6ef3fa46f 100644 --- a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.32.1119")] +[assembly: AssemblyVersion("2.0.33.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs index ece92e475..84ebdca0f 100644 --- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Message Repository")] -[assembly: AssemblyVersion("2.0.35.1119")] +[assembly: AssemblyVersion("2.0.36.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs index e36892523..90e96b55c 100644 --- a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Components")] -[assembly: AssemblyVersion("2.0.27.1647")] +[assembly: AssemblyVersion("2.0.28.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs index c57f365f8..509606483 100644 --- a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Roslyn Scripting Components")] -[assembly: AssemblyVersion("2.0.25.1119")] +[assembly: AssemblyVersion("2.0.26.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs index 2eb4338d2..7663cf129 100644 --- a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Serialization Components")] -[assembly: AssemblyVersion("2.0.26.1647")] +[assembly: AssemblyVersion("2.0.27.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs index 7adfd582f..54befdff8 100644 --- a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Global Settings")] -[assembly: AssemblyVersion("2.0.26.1647")] +[assembly: AssemblyVersion("2.0.27.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs index 53327e27f..4d4770aa0 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Shared UI Components")] -[assembly: AssemblyVersion("2.0.26.1119")] +[assembly: AssemblyVersion("2.0.27.1159")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs index 5abb6dfae..2c571b4d3 100644 --- a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Stubs Collection")] -[assembly: AssemblyVersion("2.0.8.1119")] +[assembly: AssemblyVersion("2.0.9.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs index 6a3285308..6d538d5ab 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - DataBase Synchronization Components")] -[assembly: AssemblyVersion("2.0.15.1119")] +[assembly: AssemblyVersion("2.0.16.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs index c9d4e6264..421240036 100644 --- a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - VSTS API Library")] -[assembly: AssemblyVersion("2.0.18.1119")] +[assembly: AssemblyVersion("2.0.19.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs index 111b194c1..37ca91140 100644 --- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Transport Components")] -[assembly: AssemblyVersion("2.0.27.1119")] +[assembly: AssemblyVersion("2.0.28.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs index d19c4fa42..a82036b41 100644 --- a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Video Components")] -[assembly: AssemblyVersion("2.0.18.1647")] +[assembly: AssemblyVersion("2.0.19.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs index 90f2d340d..b3ec2c4f9 100644 --- a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Exotic Visual Elements")] -[assembly: AssemblyVersion("2.0.7.1633")] +[assembly: AssemblyVersion("2.0.8.1159")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs index 36c06ef9d..3693ab6c7 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Compilation CLI")] -[assembly: AssemblyVersion("2.0.23.1647")] +[assembly: AssemblyVersion("2.0.24.1159")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1