From f4c418cced4c6fb25ec5d4cb2bcb4ce0f766efd0 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 17 Aug 2020 01:14:07 +0300 Subject: Working on insights... --- Software/Graphics/FSE/Modules/insights.png | Bin 0 -> 1895 bytes Software/Graphics/FSE/time.png | Bin 0 -> 9091 bytes Software/Graphics/FSE/watch.png | Bin 0 -> 15878 bytes .../FSE/Modules/Tango.FSE.Insights/App.xaml | 16 ++ .../Tango.FSE.Insights/Images/arrow_right.png | Bin 0 -> 827 bytes .../Modules/Tango.FSE.Insights/Images/insights.png | Bin 0 -> 1895 bytes .../FSE/Modules/Tango.FSE.Insights/Images/time.png | Bin 0 -> 9091 bytes .../Modules/Tango.FSE.Insights/InsightsModule.cs | 26 +++ .../Tango.FSE.Insights/Properties/AssemblyInfo.cs | 55 ++++++ .../Properties/Resources.Designer.cs | 71 ++++++++ .../Tango.FSE.Insights/Properties/Resources.resx | 117 +++++++++++++ .../Properties/Settings.Designer.cs | 30 ++++ .../Properties/Settings.settings | 7 + .../Tango.FSE.Insights/Tango.FSE.Insights.csproj | 194 +++++++++++++++++++++ .../Modules/Tango.FSE.Insights/ViewModelLocator.cs | 35 ++++ .../ViewModels/InsightsViewVM.cs | 13 ++ .../Tango.FSE.Insights/ViewModels/MainViewVM.cs | 33 ++++ .../Tango.FSE.Insights/Views/InsightsView.xaml | 61 +++++++ .../Tango.FSE.Insights/Views/InsightsView.xaml.cs | 28 +++ .../Modules/Tango.FSE.Insights/Views/MainView.xaml | 17 ++ .../Tango.FSE.Insights/Views/MainView.xaml.cs | 28 +++ .../FSE/Modules/Tango.FSE.Insights/app.config | 85 +++++++++ .../FSE/Modules/Tango.FSE.Insights/packages.config | 10 ++ .../ViewModels/MainViewVM.cs | 2 +- .../RemoteUpgrade/DefaultRemoteUpgradeManager.cs | 4 +- .../FSE/Tango.FSE.UI/Tango.FSE.UI.csproj | 4 + .../Insights/DefaultInsightsService.cs | 59 ++++++- .../Tango.PPC.Common/Insights/IInsightsService.cs | 2 +- .../PPC/Tango.PPC.Common/PPCSettings.cs | 25 +++ .../Tango.PPC.Shared/Insights/InsightsRequest.cs | 14 ++ .../Tango.PPC.Shared/Insights/InsightsResponse.cs | 14 ++ .../PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj | 2 + .../Visual_Studio/Tango.Insights/InsightsFile.cs | 71 ++++++++ .../Visual_Studio/Tango.Insights/InsightsHelper.cs | 2 +- .../Tango.Insights/InsightsListener.cs | 22 +-- .../Tango.Insights/Tango.Insights.csproj | 4 + Software/Visual_Studio/Tango.sln | 35 +++- 37 files changed, 1058 insertions(+), 28 deletions(-) create mode 100644 Software/Graphics/FSE/Modules/insights.png create mode 100644 Software/Graphics/FSE/time.png create mode 100644 Software/Graphics/FSE/watch.png create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/App.xaml create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/arrow_right.png create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/insights.png create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/time.png create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/InsightsModule.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/AssemblyInfo.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Resources.Designer.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Resources.resx create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Settings.Designer.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Settings.settings create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModelLocator.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModels/InsightsViewVM.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModels/MainViewVM.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/InsightsView.xaml create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/InsightsView.xaml.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/MainView.xaml create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/MainView.xaml.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/app.config create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/packages.config create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Insights/InsightsRequest.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Insights/InsightsResponse.cs create mode 100644 Software/Visual_Studio/Tango.Insights/InsightsFile.cs diff --git a/Software/Graphics/FSE/Modules/insights.png b/Software/Graphics/FSE/Modules/insights.png new file mode 100644 index 000000000..c813dca25 Binary files /dev/null and b/Software/Graphics/FSE/Modules/insights.png differ diff --git a/Software/Graphics/FSE/time.png b/Software/Graphics/FSE/time.png new file mode 100644 index 000000000..1eb9b077f Binary files /dev/null and b/Software/Graphics/FSE/time.png differ diff --git a/Software/Graphics/FSE/watch.png b/Software/Graphics/FSE/watch.png new file mode 100644 index 000000000..bd8de68d6 Binary files /dev/null and b/Software/Graphics/FSE/watch.png differ diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/App.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/App.xaml new file mode 100644 index 000000000..ce3076df6 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/App.xaml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/arrow_right.png b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/arrow_right.png new file mode 100644 index 000000000..cdcc0e7cd Binary files /dev/null and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/arrow_right.png differ diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/insights.png b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/insights.png new file mode 100644 index 000000000..c813dca25 Binary files /dev/null and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/insights.png differ diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/time.png b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/time.png new file mode 100644 index 000000000..1eb9b077f Binary files /dev/null and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Images/time.png differ diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/InsightsModule.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/InsightsModule.cs new file mode 100644 index 000000000..258f0f347 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/InsightsModule.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Media.Imaging; +using Tango.BL.Enumerations; +using Tango.FSE.Common; +using Tango.FSE.Insights.Views; + +namespace Tango.FSE.Insights +{ + [FSEModule(index: 1)] + public class InsightsModule : FSEModuleBase + { + public override string Name { get; } = "Insights"; + public override string Description { get; } = "Insights module"; + public override Type MainViewType { get; } = typeof(MainView); + public override Permissions Permission { get; } = Permissions.FSE_RunFSE; + + public override void Dispose() + { + + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..6d155732d --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Tango.FSE.Insights")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Tango.FSE.Insights")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// 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: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Resources.Designer.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Resources.Designer.cs new file mode 100644 index 000000000..4cbad602d --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.FSE.Insights.Properties +{ + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // 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.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.FSE.Insights.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Resources.resx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Settings.Designer.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Settings.Designer.cs new file mode 100644 index 000000000..720120b67 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.FSE.Insights.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Settings.settings b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Settings.settings new file mode 100644 index 000000000..033d7a5e9 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj new file mode 100644 index 000000000..83cb8cdef --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj @@ -0,0 +1,194 @@ + + + + + Debug + AnyCPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313} + library + Tango.FSE.Insights + Tango.FSE.Insights + v4.6.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + + + true + full + false + ..\..\..\Build\FSE\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\..\Build\FSE\Release\ + TRACE + prompt + 4 + + + + ..\..\..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll + + + ..\..\..\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 + + + ..\..\..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll + + + ..\..\..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll + + + ..\..\..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll + + + ..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + + + + + ..\..\..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll + + + + + + + + + 4.0 + + + + + + + + + + + + InsightsView.xaml + + + MainView.xaml + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + {bb2abb74-ba58-4812-83aa-ec8171f42df4} + Tango.AutoComplete + + + {f441feee-322a-4943-b566-110e12fd3b72} + Tango.BL + + + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} + Tango.Core + + + {4206ac58-3b57-4699-8835-90bf6db01a61} + Tango.Integration + + + {bc932dbd-7cdb-488c-99e4-f02cf441f55e} + Tango.Logging + + + {e4927038-348d-4295-aaf4-861c58cb3943} + Tango.PMR + + + {d8f1ad85-526a-4f50-b6dc-d437af63d8d8} + Tango.Settings + + + {8491d07b-c1f6-4b62-a412-41b9fd2d6538} + Tango.SharedUI + + + {74e700b0-1156-4126-be40-ee450d3c3026} + Tango.Transport + + + {834c81c3-09b5-45d7-be12-e7d1e6655a7c} + Tango.FSE.BL + + + {bc37cccb-7392-4f78-8d1c-e9629e6e046e} + Tango.FSE.Common + + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + + + + + + + + + + + + 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/FSE/Modules/Tango.FSE.Insights/ViewModelLocator.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModelLocator.cs new file mode 100644 index 000000000..4beb2abbc --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModelLocator.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core.DI; +using Tango.FSE.Insights.ViewModels; + +namespace Tango.FSE.Insights +{ + public static class ViewModelLocator + { + static ViewModelLocator() + { + TangoIOC.Default.Register(); + TangoIOC.Default.Register(); + } + + public static MainViewVM MainViewVM + { + get + { + return TangoIOC.Default.GetInstance(); + } + } + + public static InsightsViewVM InsightsViewVM + { + get + { + return TangoIOC.Default.GetInstance(); + } + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModels/InsightsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModels/InsightsViewVM.cs new file mode 100644 index 000000000..40b29c643 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModels/InsightsViewVM.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.FSE.Common; + +namespace Tango.FSE.Insights.ViewModels +{ + public class InsightsViewVM : FSEViewModel + { + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModels/MainViewVM.cs new file mode 100644 index 000000000..0b2cb9091 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/ViewModels/MainViewVM.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.FSE.Common; +using Tango.FSE.Common.Navigation; +using Tango.SharedUI.Helpers; + +namespace Tango.FSE.Insights.ViewModels +{ + [NavigationContainer] + public class MainViewVM : FSEViewModel + { + public override void OnApplicationReady() + { + InvokeUI(() => + { + NavigationManager.MenuItems.Add(new NavigationMenuItem(() => + { + NavigationManager.NavigateTo(); + }) + { + Name = "Insights", + Index = 10, + Description = "Monitor the history of the connected machine telemetry", + Image = ResourceHelper.GetImageFromResources("Images/insights.png"), + }); + }); + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/InsightsView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/InsightsView.xaml new file mode 100644 index 000000000..be3211e78 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/InsightsView.xaml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/InsightsView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/InsightsView.xaml.cs new file mode 100644 index 000000000..3d17caa97 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/InsightsView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.FSE.Insights.Views +{ + /// + /// Interaction logic for InsightsView.xaml + /// + public partial class InsightsView : UserControl + { + public InsightsView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/MainView.xaml new file mode 100644 index 000000000..f36546f1f --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/MainView.xaml @@ -0,0 +1,17 @@ + + + + + + + diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/MainView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/MainView.xaml.cs new file mode 100644 index 000000000..87fa2a5c1 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Views/MainView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.FSE.Insights.Views +{ + /// + /// Interaction logic for MainView.xaml + /// + public partial class MainView : UserControl + { + public MainView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/app.config b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/app.config new file mode 100644 index 000000000..36bc04f85 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/app.config @@ -0,0 +1,85 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/packages.config b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/packages.config new file mode 100644 index 000000000..dd8c723e4 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/MainViewVM.cs index fdc9c2000..36ff823ae 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/MainViewVM.cs @@ -27,7 +27,7 @@ namespace Tango.FSE.UsersAndRoles.ViewModels }) { Name = "Users & Roles", - Index = 10, + Index = 11, Description = "Manage users and their permissions on your organization", Image = ResourceHelper.GetImageFromResources("Images/users_and_roles.png"), }); diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/RemoteUpgrade/DefaultRemoteUpgradeManager.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/RemoteUpgrade/DefaultRemoteUpgradeManager.cs index 0ce74e51e..af732ddcb 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/RemoteUpgrade/DefaultRemoteUpgradeManager.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/RemoteUpgrade/DefaultRemoteUpgradeManager.cs @@ -561,7 +561,7 @@ namespace Tango.FSE.UI.RemoteUpgrade var remoteTempFile = Path.Combine(remoteTempFolder.Path, Path.GetFileName(Path.GetTempFileName())); LogManager.Log("Uploading tup file to remote machine..."); - var uploadHandler = FileSystemProvider.Upload(tupFile, remoteTempFile).Result; + var uploadHandler = FileSystemProvider.Upload(tupFile, remoteTempFile, true).Result; uploadHandler.ProgressChanged += (_, e) => { handler.UpdateProgress("Uploading application package file...", false, e.Progress.Value, e.Progress.Maximum); @@ -684,7 +684,7 @@ namespace Tango.FSE.UI.RemoteUpgrade var remoteTempFile = Path.Combine(remoteTempFolder.Path, Path.GetFileName(Path.GetTempFileName())); LogManager.Log("Uploading tfp file to remote machine..."); - var uploadHandler = FileSystemProvider.Upload(tfpFile, remoteTempFile).Result; + var uploadHandler = FileSystemProvider.Upload(tfpFile, remoteTempFile, true).Result; uploadHandler.ProgressChanged += (_, e) => { handler.UpdateProgress("Uploading firmware package file...", false, e.Progress.Value, e.Progress.Maximum); diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj index 3d5fa6db1..ee1b0bd29 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj @@ -665,6 +665,10 @@ {7cb96d74-8b71-4a81-b4e1-6de7bfca6174} Tango.FSE.Firmware + + {ac5b4be7-d607-4a38-98f8-b87aca468313} + Tango.FSE.Insights + {866b916a-207c-43f0-b403-7c4a820c2e11} Tango.FSE.PPCConsole diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Insights/DefaultInsightsService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Insights/DefaultInsightsService.cs index e5148cfe5..bfbf7114f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Insights/DefaultInsightsService.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Insights/DefaultInsightsService.cs @@ -1,28 +1,33 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core; using Tango.Core.DI; using Tango.Insights; +using Tango.Integration.ExternalBridge; +using Tango.Logging; using Tango.PPC.Common.Application; using Tango.PPC.Common.Connection; +using Tango.PPC.Common.ExternalBridge; +using Tango.PPC.Shared.Insights; +using Tango.Settings; namespace Tango.PPC.Common.Insights { [TangoCreateWhenRegistered] - public class DefaultInsightsService : ExtendedObject, IInsightsService + public class DefaultInsightsService : ExtendedObject, IInsightsService, IExternalBridgeRequestHandler { private InsightsListener _listener; - public bool Enabled { get; set; } private IMachineProvider MachineProvider { get; set; } - public DefaultInsightsService(IMachineProvider machineProvider, IPPCApplicationManager applicationManager) + public DefaultInsightsService(IPPCExternalBridgeService externalBridge, IMachineProvider machineProvider, IPPCApplicationManager applicationManager) { + externalBridge.RegisterRequestHandler(this); MachineProvider = machineProvider; - applicationManager.ApplicationStarted += ApplicationManager_ApplicationStarted; } @@ -32,8 +37,25 @@ namespace Tango.PPC.Common.Insights { try { - _listener = new InsightsListener(MachineProvider.MachineOperator); - _listener.Start(); + var settings = SettingsManager.Default.GetOrCreate(); + + if (settings.InsightsEnabled) + { + LogManager.Log("Starting insights service..."); + + _listener = new InsightsListener(MachineProvider.MachineOperator); + _listener.SamplingInterval = settings.InsightsSamplingInterval; + _listener.StorageCleanupInterval = settings.InsightsStorageCleanupInterval; + _listener.MaxStorageDuration = settings.InsightsMaxStorageDuration; + + LogManager.Log($"Insights configuration:\nSampling Interval: {_listener.SamplingInterval}\nStorage Cleanup Interval: {_listener.StorageCleanupInterval}\nMax Storage Duration: {_listener.MaxStorageDuration}"); + + _listener.Start(); + } + else + { + LogManager.Log("Insights service is disabled.", LogCategory.Warning); + } } catch (Exception ex) { @@ -41,5 +63,30 @@ namespace Tango.PPC.Common.Insights } }); } + + [ExternalBridgeRequestHandlerMethod(typeof(InsightsRequest), RequestHandlerLoggingMode.LogRequestName)] + public async Task OnInsightsRequest(InsightsRequest request, String token, ExternalBridgeReceiver receiver) + { + InsightsFile insightsFile = new InsightsFile(); + var filePath = TemporaryManager.CreateImaginaryFile(); + + await Task.Factory.StartNew(() => + { + var frames = InsightsManager.Default.GetFrames(request.StartDateUTC, request.EndDateUTC); + insightsFile.Frames = frames; + insightsFile.ToFile(filePath); + }); + + await receiver.SendGenericResponse(new InsightsResponse() + { + InisightsFilePath = filePath, + InsightsFileLength = new FileInfo(filePath).Length + }, token); + } + + public void OnReceiverDisconnected(ExternalBridgeReceiver receiver) + { + //Do Nothing... + } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Insights/IInsightsService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Insights/IInsightsService.cs index d7c5497d6..268bb269b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Insights/IInsightsService.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Insights/IInsightsService.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Tango.PPC.Common.Insights { - public interface IInsightsService: IPPCService + public interface IInsightsService { } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs index 5586b5341..9afbb52b6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs @@ -255,6 +255,26 @@ namespace Tango.PPC.Common /// public int RemoteDesktopFrameRate { get; set; } + /// + /// Gets or sets a value indicating whether to enable insights. + /// + public bool InsightsEnabled { get; set; } + + /// + /// Gets or sets the insights sampling interval. + /// + public TimeSpan InsightsSamplingInterval { get; set; } + + /// + /// Gets or sets the insights storage cleanup interval. + /// + public TimeSpan InsightsStorageCleanupInterval { get; set; } + + /// + /// Gets or sets the duration of the insights maximum storage duration. + /// + public TimeSpan InsightsMaxStorageDuration { get; set; } + /// /// Gets the machine service address. /// @@ -305,6 +325,11 @@ namespace Tango.PPC.Common ExternalBridgeSignalRHub = "ExternalBridgeHub"; EnableRemoteDesktop = true; RemoteDesktopFrameRate = 5; + + InsightsEnabled = true; + InsightsSamplingInterval = TimeSpan.FromMinutes(1); + InsightsMaxStorageDuration = TimeSpan.FromDays(30); + InsightsStorageCleanupInterval = TimeSpan.FromMinutes(60); } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Insights/InsightsRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Insights/InsightsRequest.cs new file mode 100644 index 000000000..23d19f4c9 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Insights/InsightsRequest.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Shared.Insights +{ + public class InsightsRequest + { + public DateTime StartDateUTC { get; set; } + public DateTime EndDateUTC { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Insights/InsightsResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Insights/InsightsResponse.cs new file mode 100644 index 000000000..38333a459 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Insights/InsightsResponse.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Shared.Insights +{ + public class InsightsResponse + { + public String InisightsFilePath { get; set; } + public long InsightsFileLength { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj index a0cc9b153..cc39c8746 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj @@ -65,6 +65,8 @@ + + diff --git a/Software/Visual_Studio/Tango.Insights/InsightsFile.cs b/Software/Visual_Studio/Tango.Insights/InsightsFile.cs new file mode 100644 index 000000000..853b23c98 --- /dev/null +++ b/Software/Visual_Studio/Tango.Insights/InsightsFile.cs @@ -0,0 +1,71 @@ +using Newtonsoft.Json; +using Newtonsoft.Json.Bson; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Insights +{ + public class InsightsFile + { + public List Frames { get; set; } + + public InsightsFile() + { + Frames = new List(); + } + + public Stream ToStream() + { + return new MemoryStream(ToBytes()); + } + + public byte[] ToBytes() + { + using (MemoryStream ms = new MemoryStream()) + { + using (BsonWriter writer = new BsonWriter(ms)) + { + JsonSerializer serializer = new JsonSerializer(); + serializer.Serialize(writer, this); + ms.Position = 0; + return ms.ToArray(); + } + } + } + + public void ToFile(String filePath) + { + File.WriteAllBytes(filePath, ToBytes()); + } + + public static InsightsFile FromStream(Stream stream) + { + using (BsonReader reader = new BsonReader(stream)) + { + JsonSerializer serializer = new JsonSerializer(); + return serializer.Deserialize(reader); + } + } + + public static InsightsFile FromBytes(byte[] data) + { + using (MemoryStream ms = new MemoryStream(data)) + { + ms.Position = 0; + return FromStream(ms); + } + } + + public static InsightsFile FromFile(String filePath) + { + using (FileStream fs = File.OpenRead(filePath)) + { + return FromStream(fs); + } + } + } +} diff --git a/Software/Visual_Studio/Tango.Insights/InsightsHelper.cs b/Software/Visual_Studio/Tango.Insights/InsightsHelper.cs index 202e2574d..29f761af6 100644 --- a/Software/Visual_Studio/Tango.Insights/InsightsHelper.cs +++ b/Software/Visual_Studio/Tango.Insights/InsightsHelper.cs @@ -66,7 +66,7 @@ namespace Tango.Insights public static InsightsMonitors AverageMonitors(List diagnosticsMonitorsCollection) { - List insightsMonitorsCollection = diagnosticsMonitorsCollection.ToList().Select(x => InsightsHelper.MapMonitors(x)).ToList(); + List insightsMonitorsCollection = diagnosticsMonitorsCollection.ToList().Select(x => MapMonitors(x)).ToList(); return AverageMonitors(insightsMonitorsCollection); } diff --git a/Software/Visual_Studio/Tango.Insights/InsightsListener.cs b/Software/Visual_Studio/Tango.Insights/InsightsListener.cs index 0df5b63a1..e534574fc 100644 --- a/Software/Visual_Studio/Tango.Insights/InsightsListener.cs +++ b/Software/Visual_Studio/Tango.Insights/InsightsListener.cs @@ -21,17 +21,17 @@ namespace Tango.Insights private bool _writing; public bool IsStarted { get; private set; } - public TimeSpan WriteInterval { get; set; } - public TimeSpan DeleteInterval { get; set; } - public TimeSpan MaxFramesStorage { get; set; } + public TimeSpan SamplingInterval { get; set; } + public TimeSpan StorageCleanupInterval { get; set; } + public TimeSpan MaxStorageDuration { get; set; } public InsightsListener(InsightsManager manager, IMachineOperator machineOperator) { _diagnosticsQueue = new List(); - WriteInterval = TimeSpan.FromMinutes(0.1); - DeleteInterval = TimeSpan.FromMinutes(60); - MaxFramesStorage = TimeSpan.FromDays(30); + SamplingInterval = TimeSpan.FromMinutes(1); + StorageCleanupInterval = TimeSpan.FromMinutes(60); + MaxStorageDuration = TimeSpan.FromDays(30); _manager = manager; _operator = machineOperator; @@ -51,12 +51,12 @@ namespace Tango.Insights if (_timer == null) { _timer = new Timer(); - _timer.Interval = WriteInterval.TotalMilliseconds; + _timer.Interval = SamplingInterval.TotalMilliseconds; } _writing = false; _timerCount = 0; - _deleteTicks = (int)(DeleteInterval.TotalMilliseconds / WriteInterval.TotalMilliseconds); + _deleteTicks = (int)(StorageCleanupInterval.TotalMilliseconds / SamplingInterval.TotalMilliseconds); _diagnosticsQueue.Clear(); IsStarted = true; @@ -98,11 +98,11 @@ namespace Tango.Insights InsightsMonitors monitorsAvg = InsightsHelper.AverageMonitors(queue); queue.Clear(); - frame = InsightsFrame.FromInsightsMonitors(monitorsAvg, DateTime.UtcNow.Subtract(WriteInterval)); + frame = InsightsFrame.FromInsightsMonitors(monitorsAvg, DateTime.UtcNow.Subtract(SamplingInterval)); } else { - frame = InsightsFrame.CreateEmpty(DateTime.UtcNow.Subtract(WriteInterval)); + frame = InsightsFrame.CreateEmpty(DateTime.UtcNow.Subtract(SamplingInterval)); } _manager.InsertFrame(frame); @@ -112,7 +112,7 @@ namespace Tango.Insights if (_timerCount >= _deleteTicks) { _timerCount = 0; - _manager.DeleteFrames(DateTime.UtcNow.Subtract(MaxFramesStorage)); + _manager.DeleteFrames(DateTime.UtcNow.Subtract(MaxStorageDuration)); } _writing = false; diff --git a/Software/Visual_Studio/Tango.Insights/Tango.Insights.csproj b/Software/Visual_Studio/Tango.Insights/Tango.Insights.csproj index 0b9ecc641..26b2e8204 100644 --- a/Software/Visual_Studio/Tango.Insights/Tango.Insights.csproj +++ b/Software/Visual_Studio/Tango.Insights/Tango.Insights.csproj @@ -44,6 +44,7 @@ GlobalVersionInfo.cs + @@ -75,6 +76,9 @@ 5.0.4 + + 9.0.1 + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 8a35deaf7..b270ff93a 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -407,6 +407,8 @@ Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "Tango.FSE.Procedures.Docume EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Insights", "Tango.Insights\Tango.Insights.csproj", "{4A55C185-3F8D-41B0-8815-C15F6213A14A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.Insights", "FSE\Modules\Tango.FSE.Insights\Tango.FSE.Insights.csproj", "{AC5B4BE7-D607-4A38-98F8-B87ACA468313}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -3814,6 +3816,26 @@ Global {4A55C185-3F8D-41B0-8815-C15F6213A14A}.Release|x64.Build.0 = Release|Any CPU {4A55C185-3F8D-41B0-8815-C15F6213A14A}.Release|x86.ActiveCfg = Release|Any CPU {4A55C185-3F8D-41B0-8815-C15F6213A14A}.Release|x86.Build.0 = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|ARM.ActiveCfg = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|ARM.Build.0 = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|ARM64.Build.0 = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|x64.ActiveCfg = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|x64.Build.0 = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|x86.ActiveCfg = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Debug|x86.Build.0 = Debug|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|Any CPU.Build.0 = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|ARM.ActiveCfg = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|ARM.Build.0 = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|ARM64.ActiveCfg = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|ARM64.Build.0 = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|x64.ActiveCfg = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|x64.Build.0 = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|x86.ActiveCfg = Release|Any CPU + {AC5B4BE7-D607-4A38-98F8-B87ACA468313}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3952,14 +3974,15 @@ Global {1754F846-4763-4000-807F-C7BFAA145DB2} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} {4C045668-9E5A-447A-A3B8-106C872C1039} = {004337EB-0761-4D30-B9F5-AE6E1CFC6013} {12EC97A5-C3C2-40CB-B658-EC4018B89269} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} + {AC5B4BE7-D607-4A38-98F8-B87ACA468313} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_UseGlobalSettings = False - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs - BuildVersion_StartDate = 2000/1/1 - BuildVersion_UpdateFileVersion = False - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_UpdateFileVersion = False + BuildVersion_StartDate = 2000/1/1 + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_UseGlobalSettings = False EndGlobalSection EndGlobal -- cgit v1.3.1