From dc774f2956a749a9054aad17b04a202d5373548d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 23 Jul 2018 10:50:31 +0300 Subject: Fixed issue with machine studio. --- .../Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs | 1 - .../MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') 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 70ae8a90a..ebf2f2446 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs @@ -16,7 +16,6 @@ namespace Tango.MachineStudio.Developer /// static ViewModelLocator() { - TangoIOC.Default.Register(MainView.Instance); TangoIOC.Default.Register(); TangoIOC.Default.Register(); } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt index d7f0f1ad3..74eace1ea 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt @@ -1 +1 @@ -19-Jul-18 14:12:44.53 +Mon 07/23/2018 10:41:01.98 -- cgit v1.3.1 From 1f2ebb7e81e6082ec31f3febbcf0f777263679aa Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 23 Jul 2018 12:03:18 +0300 Subject: Changed versions to per assembly. --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 1572864 -> 1572864 bytes .../Tango.Embroidery/Tango.Embroidery.vcxproj | 5 ++++ .../Tango.EmbroideryUI/Properties/AssemblyInfo.cs | 7 ----- .../Tango.EmbroideryUI/Tango.EmbroideryUI.csproj | 8 ++++++ .../libEmbroideryTest/libEmbroideryTest.vcxproj | 5 ++++ .../visualstudio/libEmbroideryVS2008.vcxproj | 5 ++++ .../VS Extensions/BuildVersionIncrement.vsix | Bin 0 -> 1554704 bytes .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.ColorLab.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.DB.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.DataCapture.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.Developer.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.HardwareDesigner.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.Logging.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.MachineDesigner.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.Stubs.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.Synchronization.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.Technician.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.UsersAndRoles.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.Common.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.Publisher.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Properties/Resources.Designer.cs | 9 ------- .../Properties/Resources.resx | 4 --- .../Tango.MachineStudio.UI/Resources/BuildDate.txt | 1 - .../DefaultStudioApplicationManager.cs | 10 ++++--- .../Tango.MachineStudio.UI.csproj | 22 ++++++++------- .../Properties/AssemblyInfo.cs | 10 +------ .../Tango.MachineStudio.UpdateService.csproj | 4 +++ .../Properties/AssemblyInfo.cs | 1 + .../Tango.MachineStudio.Updater.csproj | 9 +++++-- .../Native/Tango.ColorLib/Tango.ColorLib.vcxproj | 5 ++++ .../Tango.Emulations.Native.vcxproj | 5 ++++ .../Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj | 5 ++++ .../Notes/Tango.Notes/Tango.Notes.csproj | 5 ++++ .../Tango.PPC.Jobs/Properties/AssemblyInfo.cs | 1 + .../Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.PPC.Synchronization.csproj | 9 +++++-- .../Tango.PPC.Common/Properties/AssemblyInfo.cs | 1 + .../PPC/Tango.PPC.Common/Tango.PPC.Common.csproj | 9 +++++-- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 1 + .../PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 9 +++++-- .../ICSharpCode.AvalonEdit.csproj | 5 ++++ .../MaterialDesignColors.Wpf.csproj | 5 ++++ .../MaterialDesignThemes.Wpf.csproj | 5 ++++ .../RealTimeGraphEx/RealTimeGraphEx.csproj | 5 ++++ .../Tango.AutoComplete/Tango.AutoComplete.csproj | 5 ++++ .../Tango.AnimatedGif/Properties/AssemblyInfo.cs | 1 + .../Tango.AnimatedGif/Tango.AnimatedGif.csproj | 9 +++++-- .../Tango.BL/Properties/AssemblyInfo.cs | 3 ++- Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 9 +++++-- .../Tango.BrushPicker/Properties/AssemblyInfo.cs | 2 +- .../Tango.BrushPicker/Tango.BrushPicker.csproj | 9 +++++-- .../Tango.CircularGauge/Properties/AssemblyInfo.cs | 1 + .../Tango.CircularGauge/Tango.CircularGauge.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.CodeGeneration.csproj | 9 +++++-- .../Tango.ColorPicker/Properties/AssemblyInfo.cs | 1 + .../Tango.ColorPicker/Tango.ColorPicker.csproj | 9 +++++-- .../Tango.Core/Helpers/AssemblyHelper.cs | 30 +++++++++++++++++++++ .../Tango.Core/Properties/AssemblyInfo.cs | 1 + .../Visual_Studio/Tango.Core/Tango.Core.csproj | 9 +++++-- .../Tango.DAL.Local/Properties/AssemblyInfo.cs | 1 + .../Tango.DAL.Local/Tango.DAL.Local.csproj | 9 +++++-- .../Tango.DAL.Remote/Properties/AssemblyInfo.cs | 1 + .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 9 +++++-- .../Tango.Documents/Properties/AssemblyInfo.cs | 1 + .../Tango.Documents/Tango.Documents.csproj | 9 +++++-- .../Tango.DragAndDrop/Properties/AssemblyInfo.cs | 1 + .../Tango.DragAndDrop/Tango.DragAndDrop.csproj | 9 +++++-- .../Tango.Editors/Properties/AssemblyInfo.cs | 1 + .../Tango.Editors/Tango.Editors.csproj | 9 +++++-- .../Tango.Emulations/Properties/AssemblyInfo.cs | 1 + .../Tango.Emulations/Tango.Emulations.csproj | 9 +++++-- .../Tango.Hive/Properties/AssemblyInfo.cs | 1 + .../Visual_Studio/Tango.Hive/Tango.Hive.csproj | 9 +++++-- .../Tango.Integration/Properties/AssemblyInfo.cs | 1 + .../Tango.Integration/Tango.Integration.csproj | 9 +++++-- Software/Visual_Studio/Tango.Logging/LogManager.cs | 17 ++++++++++++ .../Tango.Logging/Properties/AssemblyInfo.cs | 1 + .../Tango.Logging/Tango.Logging.csproj | 9 +++++-- .../Tango.PMR/Properties/AssemblyInfo.cs | 1 + Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj | 9 +++++-- .../Tango.Protobuf/Properties/AssemblyInfo.cs | 1 + .../Tango.Protobuf/Tango.Protobuf.csproj | 9 +++++-- .../Tango.Scripting/Properties/AssemblyInfo.cs | 1 + .../Tango.Scripting/Tango.Scripting.csproj | 9 +++++-- .../Tango.Serialization/Properties/AssemblyInfo.cs | 1 + .../Tango.Serialization/Tango.Serialization.csproj | 9 +++++-- .../Tango.Settings/Properties/AssemblyInfo.cs | 1 + .../Tango.Settings/Tango.Settings.csproj | 9 +++++-- .../Tango.SharedUI/Properties/AssemblyInfo.cs | 1 + .../Tango.SharedUI/Tango.SharedUI.csproj | 9 +++++-- .../Tango.Stubs/Properties/AssemblyInfo.cs | 1 + .../Visual_Studio/Tango.Stubs/Tango.Stubs.csproj | 11 +++++--- .../Properties/AssemblyInfo.cs | 1 + .../Tango.Synchronization.csproj | 9 +++++-- .../Tango.TFS/Properties/AssemblyInfo.cs | 1 + Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj | 9 +++++-- .../Tango.Touch/Properties/AssemblyInfo.cs | 1 + .../Visual_Studio/Tango.Touch/Tango.Touch.csproj | 9 +++++-- .../Tango.Transport/Properties/AssemblyInfo.cs | 1 + .../Tango.Transport/Tango.Transport.csproj | 9 +++++-- .../Tango.UnitTesting/Properties/AssemblyInfo.cs | 1 + .../Tango.UnitTesting/Tango.UnitTesting.csproj | 9 +++++-- .../Tango.Video/Properties/AssemblyInfo.cs | 1 + .../Visual_Studio/Tango.Video/Tango.Video.csproj | 9 +++++-- .../Tango.Visuals/Properties/AssemblyInfo.cs | 1 + .../Tango.Visuals/Tango.Visuals.csproj | 9 +++++-- Software/Visual_Studio/Tango.sln | 12 ++++----- .../Tango.BugReporter/Properties/AssemblyInfo.cs | 10 +------ .../Tango.BugReporter/Tango.BugReporter.csproj | 8 ++++++ .../Properties/AssemblyInfo.cs | 10 +------ .../Tango.CatalogGenerator.csproj | 8 ++++++ .../Properties/AssemblyInfo.cs | 1 + .../Tango.DBObservablesGenerator.CLI.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.EmbroideryViewer.csproj | 9 +++++-- .../Tango.HashGenerator/Properties/AssemblyInfo.cs | 10 +------ .../Tango.HashGenerator/Tango.HashGenerator.csproj | 8 ++++++ .../Tango.ILMerge.UI/Properties/AssemblyInfo.cs | 10 +------ .../Tango.ILMerge.UI/Tango.ILMerge.UI.csproj | 8 ++++++ .../Tango.MachineEM.UI/Properties/AssemblyInfo.cs | 1 + .../Tango.MachineEM.UI/Tango.MachineEM.UI.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.PMRGenerator.CLI.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 1 + .../Tango.PortsListGenerator.csproj | 9 +++++-- .../Tango.Protobuf.CLI/Properties/AssemblyInfo.cs | 1 + .../Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj | 9 +++++-- .../Tango.Protobuf.UI/Properties/AssemblyInfo.cs | 1 + .../Tango.Protobuf.UI/Tango.Protobuf.UI.csproj | 9 +++++-- .../Properties/AssemblyInfo.cs | 10 +------ .../Tango.RemoteRunner.UI.csproj | 8 ++++++ .../Properties/AssemblyInfo.cs | 10 +------ .../Tango.SQLiteGenerator.CLI.csproj | 8 ++++++ .../Properties/AssemblyInfo.cs | 1 + .../Tango.ShortcutGenerator.CLI.csproj | 9 +++++-- .../Tango.Stubs.CLI/Properties/AssemblyInfo.cs | 1 + .../Tango.Stubs.CLI/Tango.Stubs.CLI.csproj | 8 ++++++ .../Tango.Stubs.UI/Properties/AssemblyInfo.cs | 9 +------ .../Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj | 8 ++++++ .../Properties/AssemblyInfo.cs | 1 + .../Tango.TransportRouter.UI.csproj | 9 +++++-- .../Utilities/Tango.UITests/Tango.UITests.csproj | 5 ++++ .../Tango.BuildExtensions.csproj | 5 ++++ Software/Visual_Studio/Versioning/ChangeLog.txt | 2 ++ Software/Visual_Studio/Versioning/Core.cs | 13 --------- .../Visual_Studio/Versioning/CoreChangeLog.txt | 2 -- .../Visual_Studio/Versioning/GlobalVersionInfo.cs | 10 +++++++ Software/Visual_Studio/Versioning/MachineStudio.cs | 13 --------- .../Versioning/MachineStudioChangeLog.txt | 7 ----- Software/Visual_Studio/Versioning/PPC.cs | 13 --------- Software/Visual_Studio/Versioning/PPCChangeLog.txt | 13 --------- .../Properties/AssemblyInfo.cs | 10 +------ .../Tango.MachineService.csproj | 4 +++ 170 files changed, 702 insertions(+), 299 deletions(-) create mode 100644 Software/Visual_Studio/Installers/VS Extensions/BuildVersionIncrement.vsix delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt create mode 100644 Software/Visual_Studio/Versioning/ChangeLog.txt delete mode 100644 Software/Visual_Studio/Versioning/Core.cs delete mode 100644 Software/Visual_Studio/Versioning/CoreChangeLog.txt create mode 100644 Software/Visual_Studio/Versioning/GlobalVersionInfo.cs delete mode 100644 Software/Visual_Studio/Versioning/MachineStudio.cs delete mode 100644 Software/Visual_Studio/Versioning/MachineStudioChangeLog.txt delete mode 100644 Software/Visual_Studio/Versioning/PPC.cs delete mode 100644 Software/Visual_Studio/Versioning/PPCChangeLog.txt (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 7362a9cbf..7eb2bd633 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 25d89aba8..ff050e99b 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj b/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj index 41d11f2fe..71cb4c8b5 100644 --- a/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj +++ b/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj @@ -182,4 +182,9 @@ + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs index 83b86417d..4bc7b84a6 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs @@ -8,13 +8,6 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango.EmbroideryUI")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tango.EmbroideryUI")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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 diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj index d384abfe7..e272faec1 100644 --- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj +++ b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj @@ -56,6 +56,9 @@ + + GlobalVersionInfo.cs + EmbroideryFileEditor.xaml @@ -118,4 +121,9 @@ + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj b/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj index 14b902ba6..24b9ba8dd 100644 --- a/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj +++ b/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj @@ -161,4 +161,9 @@ + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj b/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj index 8076b030d..8d15fc0d0 100644 --- a/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj +++ b/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj @@ -297,4 +297,9 @@ + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Installers/VS Extensions/BuildVersionIncrement.vsix b/Software/Visual_Studio/Installers/VS Extensions/BuildVersionIncrement.vsix new file mode 100644 index 000000000..13fd60ba0 Binary files /dev/null and b/Software/Visual_Studio/Installers/VS Extensions/BuildVersionIncrement.vsix 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 e62c20367..a2891d634 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Color Lab Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj index ed7b3b4f2..8983148e5 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj @@ -69,8 +69,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -177,4 +177,9 @@ + + + + + \ No newline at end of file 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 73a5c7c86..0e59a4c08 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio DB Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index 1535c6dce..9b91fd58f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj @@ -75,8 +75,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -808,4 +808,9 @@ + + + + + \ No newline at end of file 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 0fd6e93b2..ea2bb2d75 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Data Capturing Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj index 99645a659..e2d47481c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj @@ -63,8 +63,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -182,4 +182,9 @@ + + + + + \ No newline at end of file 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 09a564296..45ec89e9e 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] 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 46396c791..ed2aa203f 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 @@ -90,8 +90,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -357,4 +357,9 @@ + + + + + \ No newline at end of file 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 321f57d7d..052c1f28c 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj index 2e2920af2..48b761551 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj @@ -66,8 +66,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -167,4 +167,9 @@ + + + + + \ No newline at end of file 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 c13446ecd..79dedc390 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj index 2ce0446aa..22a9b329f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj @@ -66,8 +66,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -252,4 +252,9 @@ + + + + + \ No newline at end of file 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 2470d1d64..a5ea4bd2b 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj index 03509da5d..e5fef1f75 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj @@ -65,8 +65,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -222,4 +222,9 @@ + + + + + \ No newline at end of file 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 45c89075b..3467c8c27 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Stubs Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj index 99ba89122..f01bc1af0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj @@ -68,8 +68,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -164,4 +164,9 @@ + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs index d0a85a97c..8ff62cb28 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs @@ -5,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Synchronization Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj index 41009b79f..3ade27930 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj @@ -90,8 +90,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -241,4 +241,9 @@ + + + + + \ No newline at end of file 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 73b9c68fc..c81b8a0fa 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj index d358edae8..79bdd8645 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj @@ -84,8 +84,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -560,4 +560,9 @@ + + + + + \ No newline at end of file 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 aeb6b6c4d..7dbfb4a47 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,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj index cc9a60f30..7345eefaf 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj @@ -69,8 +69,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -208,4 +208,9 @@ + + + + + \ No newline at end of file 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 f03b250be..7ff538c8f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs @@ -5,6 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Machine Studio Common Components")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] [assembly:ThemeInfo( 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 145d91461..e32a9c1ca 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 @@ -72,8 +72,8 @@ - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -292,4 +292,9 @@ + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs index 8d5288e3c..e1e39d3aa 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs @@ -4,4 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio Publish Utility")] +[assembly: AssemblyVersion("2.0.*")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj index 4d8ea2579..4a01b2958 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj @@ -85,8 +85,8 @@ MSBuild:Compile Designer - - MachineStudio.cs + + GlobalVersionInfo.cs App.xaml @@ -163,4 +163,9 @@ + + + + + \ No newline at end of file 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 5cdfd162a..b8dffb406 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,4 +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.0.*")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs index 5ff36aae1..c035ee88d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs @@ -59,14 +59,5 @@ namespace Tango.MachineStudio.UI.Properties { resourceCulture = value; } } - - /// - /// Looks up a localized string similar to . - /// - internal static string BuildDate { - get { - return ResourceManager.GetString("BuildDate", resourceCulture); - } - } } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx index 32307e87f..1af7de150 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx @@ -117,8 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt deleted file mode 100644 index 74eace1ea..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt +++ /dev/null @@ -1 +0,0 @@ -Mon 07/23/2018 10:41:01.98 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 fdad31251..8a9e3a43b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -56,6 +56,8 @@ namespace Tango.MachineStudio.UI.StudioApplication { TangoIOC.Default.GetAllInstancesByBase().ToList().ForEach(x => x.OnApplicationStarted()); }; + + LogManager.LogReferencedAssemblies(); }); }); } @@ -135,7 +137,7 @@ namespace Tango.MachineStudio.UI.StudioApplication { get { - return typeof(DefaultStudioApplicationManager).Assembly.GetName().Version.ToString(); + return AssemblyHelper.GetCurrentAssemblyVersion().ToString(2); } } @@ -264,7 +266,7 @@ namespace Tango.MachineStudio.UI.StudioApplication { get { - return typeof(ExtendedObject).Assembly.GetName().Version.ToString(); + return typeof(ExtendedObject).Assembly.GetName().Version.ToString(2); } } @@ -275,7 +277,7 @@ namespace Tango.MachineStudio.UI.StudioApplication { get { - return Properties.Resources.BuildDate; + return AssemblyHelper.GetCurrentAssemblyBuildDate().ToString(); } } @@ -286,7 +288,7 @@ namespace Tango.MachineStudio.UI.StudioApplication { get { - return EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLogs.MachineStudioChangeLog.txt") + Environment.NewLine + Environment.NewLine + Environment.NewLine + EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLogs.CoreChangeLog.txt"); + return EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLog.txt"); } } } 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 4d581795b..162c8c780 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 @@ -133,8 +133,8 @@ Designer - - MachineStudio.cs + + GlobalVersionInfo.cs @@ -488,14 +488,10 @@ - - ChangeLogs\CoreChangeLog.txt - - - ChangeLogs\MachineStudioChangeLog.txt + + ChangeLog.txt - @@ -505,12 +501,13 @@ + + + if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk" -echo %25date%25 %25time%25 > "$(ProjectDir)\Resources\BuildDate.txt" - RD /S /Q "$(TargetDir)cs\" RD /S /Q "$(TargetDir)da\" RD /S /Q "$(TargetDir)de\" @@ -563,4 +560,9 @@ RD /S /Q "$(TargetDir)nb-NO\" + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/AssemblyInfo.cs index 6b9387721..553de895f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/AssemblyInfo.cs @@ -6,13 +6,6 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango.MachineStudio.UpdateService")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tango.MachineStudio.UpdateService")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[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 @@ -32,5 +25,4 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.*")] diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj index 8dc2d264e..018caf903 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj @@ -71,6 +71,9 @@ + + GlobalVersionInfo.cs + MachineStudioUpdateService.svc @@ -134,6 +137,7 @@ False + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphEx.csproj b/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphEx.csproj index cc8eda5a4..2a1fc3e7c 100644 --- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphEx.csproj +++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphEx.csproj @@ -216,6 +216,11 @@ + + + + +