diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-16 15:25:47 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-16 15:25:47 +0300 |
| commit | 90287baf32ed1fe6bbca479cf679e3f76bfcebe2 (patch) | |
| tree | 6e5b17e728eb4de0f0d04b60d494b741c2b3ac3c | |
| parent | 1b4bd3fa7b135d5a5d0ebee41ae3d99ba0a8fbf0 (diff) | |
| download | Tango-90287baf32ed1fe6bbca479cf679e3f76bfcebe2.tar.gz Tango-90287baf32ed1fe6bbca479cf679e3f76bfcebe2.zip | |
Versions updates.
| -rw-r--r-- | Software/Android_Studio/ColorCapture/app/build.gradle | 4 | ||||
| -rw-r--r-- | Software/DB/PPC/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/PPC/Tango_log.ldf | bin | 53673984 -> 53673984 bytes | |||
| -rw-r--r-- | Software/DB/TCC/TCC.mdf | bin | 8388608 -> 8388608 bytes | |||
| -rw-r--r-- | Software/DB/TCC/TCC_log.ldf | bin | 8388608 -> 8388608 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip | 18 | ||||
| -rw-r--r-- | Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt | bin | 52 -> 52 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip | 18 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.sln | 20 |
12 files changed, 29 insertions, 37 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle index 9c57418b5..e5d67ac98 100644 --- a/Software/Android_Studio/ColorCapture/app/build.gradle +++ b/Software/Android_Studio/ColorCapture/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.twine.colorcapture" minSdkVersion 22 targetSdkVersion 27 - versionCode 6 - versionName "1.6" + versionCode 7 + versionName "1.7" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf Binary files differindex d59a7577a..c28e4a08e 100644 --- a/Software/DB/PPC/Tango.mdf +++ b/Software/DB/PPC/Tango.mdf diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf Binary files differindex ce4ff9a10..235a60d33 100644 --- a/Software/DB/PPC/Tango_log.ldf +++ b/Software/DB/PPC/Tango_log.ldf diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf Binary files differindex 5982d6e99..3e1402f14 100644 --- a/Software/DB/TCC/TCC.mdf +++ b/Software/DB/TCC/TCC.mdf diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf Binary files differindex 7f66cb642..d08dcc9c3 100644 --- a/Software/DB/TCC/TCC_log.ldf +++ b/Software/DB/TCC/TCC_log.ldf diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index cea0c9655..aea5b03a5 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -15,10 +15,10 @@ <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/> <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/> <ROW Property="Manufacturer" Value="Twine"/> - <ROW Property="ProductCode" Value="1033:{E661B31E-76E5-450D-A94C-AA88FD6128CB} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{22538FE4-B2F2-406E-966C-24FEA15F3342} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="Machine Studio"/> - <ROW Property="ProductVersion" Value="4.0.20.0" Type="32"/> + <ROW Property="ProductVersion" Value="4.0.21.0" Type="32"/> <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/> <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/> <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> @@ -109,6 +109,7 @@ <ROW Component="Microsoft.WindowsAzure.Storage.dll" ComponentId="{38DD34C7-3DE1-4F73-B1A0-433DA73627F0}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.WindowsAzure.Storage.dll"/> <ROW Component="Newtonsoft.Json.dll" ComponentId="{4900AB50-083B-4DDE-9584-6AD9E63BEE98}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/> <ROW Component="ProductInformation" ComponentId="{0E2AEDFB-F480-4EFC-9E30-3BF55F4003A6}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/> + <ROW Component="ProtoCompilers" ComponentId="{1404D358-09EE-47B7-AF41-73987FDB9643}" Directory_="ProtoCompilers_Dir" Attributes="0"/> <ROW Component="RazorEngine.dll" ComponentId="{548FE444-B574-42E5-8E6D-74F0BD9ACCA3}" Directory_="APPDIR" Attributes="0" KeyPath="RazorEngine.dll"/> <ROW Component="RealTimeGraphX.WPF.dll" ComponentId="{9A629F42-5E01-48A8-A690-DB13143EC7D6}" Directory_="APPDIR" Attributes="0" KeyPath="RealTimeGraphX.WPF.dll"/> <ROW Component="RealTimeGraphX.dll" ComponentId="{ED4D6081-888A-44D8-8327-A74150928C55}" Directory_="APPDIR" Attributes="0" KeyPath="RealTimeGraphX.dll"/> @@ -325,9 +326,6 @@ <ROW Component="opencv_video330d.dll" ComponentId="{33A1A287-4354-49E8-A9FA-0AC40ECDAF8E}" Directory_="APPDIR" Attributes="0" KeyPath="opencv_video330d.dll"/> <ROW Component="opencv_videoio330d.dll" ComponentId="{2D1BA382-4181-46BB-AAFD-CEF4F0C478C0}" Directory_="APPDIR" Attributes="0" KeyPath="opencv_videoio330d.dll"/> <ROW Component="opencv_videostab330d.dll" ComponentId="{ECC20E86-E98A-4D9F-B7DA-67AF4528A9B1}" Directory_="APPDIR" Attributes="0" KeyPath="opencv_videostab330d.dll"/> - <ROW Component="protoc.exe" ComponentId="{A6D142BB-FCC1-40F0-803F-4B297F41F44F}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc.exe"/> - <ROW Component="protoc1.0M4.jar" ComponentId="{022ECA61-49D3-46DC-AD34-A77FD3FFBD9F}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc1.0M4.jar" Type="0"/> - <ROW Component="protocc.exe" ComponentId="{44BBA6D9-F31A-4957-B8F5-C9A8D54A3B64}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protocc.exe"/> <ROW Component="roslyn" ComponentId="{0213EF2F-EA65-4862-BE1A-E69A06623386}" Directory_="roslyn_Dir" Attributes="0"/> <ROW Component="ucrtbased.dll" ComponentId="{DA7E4E6B-6A10-4C41-8B36-5BBAC6442CBF}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/> <ROW Component="vcruntime140.dll" ComponentId="{96045530-543D-487A-875A-F9A7EBDCFED0}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/> @@ -335,7 +333,7 @@ <ROW Component="zlib1.dll" ComponentId="{AB6E3F34-F125-4364-A26B-F02193779155}" Directory_="APPDIR" Attributes="0" KeyPath="zlib1.dll"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent"> - <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AForge.Imaging.dll AForge.Math.dll AForge.dll AI_ExePath ColorMine.dll CommandLine.dll DeepEqual.dll DocumentFormat.OpenXml.dll Dragablz.dll Dragablz.xml EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll HelixToolkit.Wpf.Input.dll HelixToolkit.Wpf.dll HelixToolkit.dll ICSharpCode.AvalonEdit.dll Ionic.Zip.dll JWT.dll LiveCharts.Wpf.dll_1 LiveCharts.dll_1 MahApps.Metro.dll MaterialDesignColors.dll MaterialDesignThemes.Wpf.dll Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.Practices.ServiceLocation.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WITDataStore32.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAPICodePack.Shell.dll Microsoft.WindowsAPICodePack.ShellExtensions.dll Microsoft.WindowsAPICodePack.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll ProductInformation RazorEngine.dll RealTimeGraphX.WPF.dll RealTimeGraphX.dll SHORTCUTDIR SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Concurrent.dll System.Collections.NonGeneric.dll System.Collections.Specialized.dll System.Collections.dll System.ComponentModel.EventBasedAsync.dll System.ComponentModel.Primitives.dll System.ComponentModel.TypeConverter.dll System.ComponentModel.dll System.Console.dll System.Data.Common.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.Contracts.dll System.Diagnostics.Debug.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.Diagnostics.TextWriterTraceListener.dll System.Diagnostics.Tools.dll System.Diagnostics.TraceSource.dll System.Diagnostics.Tracing.dll System.Drawing.Primitives.dll System.Dynamic.Runtime.dll System.Globalization.Calendars.dll System.Globalization.Extensions.dll System.Globalization.dll System.IO.Compression.ZipFile.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.Watcher.dll System.IO.FileSystem.dll System.IO.IsolatedStorage.dll System.IO.MemoryMappedFiles.dll System.IO.Pipes.dll System.IO.UnmanagedMemoryStream.dll System.IO.dll System.IdentityModel.Tokens.Jwt.dll System.Linq.Expressions.dll System.Linq.Parallel.dll System.Linq.Queryable.dll System.Linq.dll System.Net.Http.Formatting.dll System.Net.Http.dll System.Net.NameResolution.dll System.Net.NetworkInformation.dll System.Net.Ping.dll System.Net.Primitives.dll System.Net.Requests.dll System.Net.Security.dll System.Net.Sockets.dll System.Net.WebHeaderCollection.dll System.Net.WebSockets.Client.dll System.Net.WebSockets.dll System.ObjectModel.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reactive.Windows.Threading.dll System.Reflection.Extensions.dll System.Reflection.Primitives.dll System.Reflection.dll System.Resources.Reader.dll System.Resources.ResourceManager.dll System.Resources.Writer.dll System.Runtime.CompilerServices.VisualC.dll System.Runtime.Extensions.dll System.Runtime.Handles.dll System.Runtime.InteropServices.RuntimeInformation.dll System.Runtime.InteropServices.dll System.Runtime.Numerics.dll System.Runtime.Serialization.Formatters.dll System.Runtime.Serialization.Json.dll System.Runtime.Serialization.Primitives.dll System.Runtime.Serialization.Xml.dll System.Runtime.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Csp.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.dll System.Security.SecureString.dll System.Text.Encoding.Extensions.dll System.Text.Encoding.dll System.Text.RegularExpressions.dll System.Threading.Overlapped.dll System.Threading.Tasks.Parallel.dll System.Threading.Tasks.dll System.Threading.Thread.dll System.Threading.ThreadPool.dll System.Threading.Timer.dll System.Threading.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Razor.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XDocument.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll System.Xml.XmlSerializer.dll Tango.AdvancedInstaller.dll Tango.AutoComplete.dll Tango.BL.dll Tango.BrushPicker.dll Tango.CSV.dll Tango.CircularGauge.dll Tango.CodeGeneration.dll Tango.ColorLib.dll Tango.ColorPicker.dll Tango.Core.dll Tango.DAL.Local.dll Tango.DAL.Remote.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Editors.dll Tango.Embroidery.dll Tango.EmbroideryUI.dll Tango.Emulations.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.MachineStudio.ColorCapture.dll Tango.MachineStudio.ColorLab.dll Tango.MachineStudio.Common.dll Tango.MachineStudio.DB.dll Tango.MachineStudio.DataCapture.dll Tango.MachineStudio.Developer.dll Tango.MachineStudio.Dispensers.dll Tango.MachineStudio.HardwareDesigner.dll Tango.MachineStudio.Logging.dll Tango.MachineStudio.MachineDesigner.dll Tango.MachineStudio.RML.dll Tango.MachineStudio.Statistics.dll_1 Tango.MachineStudio.Storage.dll Tango.MachineStudio.Stubs.dll Tango.MachineStudio.Technician.dll Tango.MachineStudio.UI.exe Tango.MachineStudio.Updater.exe Tango.MachineStudio.UsersAndRoles.dll Tango.PMR.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.Stubs.dll Tango.Synchronization.dll Tango.TCC.BL.dll Tango.TCC.CardDetector.dll Tango.TCC.ColorDetector.dll Tango.TCC.LoadTestLib.dll Tango.TCC.OpenCV.DLL.dll Tango.TFS.dll Tango.Transport.dll Tango.Video.dll Tango.Visuals.dll Tango.Web.dll WpfAnimatedGif.dll WriteableBitmapEx.Wpf.dll ZedGraph.dll ZedGraph.resources.dll benchmarks_rgb_lab.csv concrt140.dll cvextern.dll fpgen.exe libMagickCore2.dll libMagickWand2.dll libiconv2.dll libjpeg7.dll libpng120.dll libtiff3.dll libxml22.dll libzbar0.dll mscoree.dll msvcp140.dll msvcp140d.dll netstandard.dll opencv_aruco330d.dll opencv_calib3d330d.dll opencv_core330d.dll opencv_dnn330d.dll opencv_features2d330d.dll opencv_ffmpeg310.dll opencv_ffmpeg310_64.dll opencv_ffmpeg320.dll opencv_ffmpeg320_64.dll opencv_ffmpeg330.dll opencv_flann330d.dll opencv_highgui330d.dll opencv_imgcodecs330d.dll opencv_imgproc330d.dll opencv_ml330d.dll opencv_objdetect330d.dll opencv_photo330d.dll opencv_shape330d.dll opencv_stitching330d.dll opencv_superres330d.dll opencv_video330d.dll opencv_videoio330d.dll opencv_videostab330d.dll protoc.exe protoc1.0M4.jar protocc.exe roslyn ucrtbased.dll vcruntime140.dll vcruntime140d.dll zlib1.dll"/> + <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AForge.Imaging.dll AForge.Math.dll AForge.dll AI_ExePath ColorMine.dll CommandLine.dll DeepEqual.dll DocumentFormat.OpenXml.dll Dragablz.dll Dragablz.xml EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll HelixToolkit.Wpf.Input.dll HelixToolkit.Wpf.dll HelixToolkit.dll ICSharpCode.AvalonEdit.dll Ionic.Zip.dll JWT.dll LiveCharts.Wpf.dll_1 LiveCharts.dll_1 MahApps.Metro.dll MaterialDesignColors.dll MaterialDesignThemes.Wpf.dll Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.Practices.ServiceLocation.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WITDataStore32.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAPICodePack.Shell.dll Microsoft.WindowsAPICodePack.ShellExtensions.dll Microsoft.WindowsAPICodePack.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll ProductInformation ProtoCompilers RazorEngine.dll RealTimeGraphX.WPF.dll RealTimeGraphX.dll SHORTCUTDIR SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Concurrent.dll System.Collections.NonGeneric.dll System.Collections.Specialized.dll System.Collections.dll System.ComponentModel.EventBasedAsync.dll System.ComponentModel.Primitives.dll System.ComponentModel.TypeConverter.dll System.ComponentModel.dll System.Console.dll System.Data.Common.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.Contracts.dll System.Diagnostics.Debug.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.Diagnostics.TextWriterTraceListener.dll System.Diagnostics.Tools.dll System.Diagnostics.TraceSource.dll System.Diagnostics.Tracing.dll System.Drawing.Primitives.dll System.Dynamic.Runtime.dll System.Globalization.Calendars.dll System.Globalization.Extensions.dll System.Globalization.dll System.IO.Compression.ZipFile.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.Watcher.dll System.IO.FileSystem.dll System.IO.IsolatedStorage.dll System.IO.MemoryMappedFiles.dll System.IO.Pipes.dll System.IO.UnmanagedMemoryStream.dll System.IO.dll System.IdentityModel.Tokens.Jwt.dll System.Linq.Expressions.dll System.Linq.Parallel.dll System.Linq.Queryable.dll System.Linq.dll System.Net.Http.Formatting.dll System.Net.Http.dll System.Net.NameResolution.dll System.Net.NetworkInformation.dll System.Net.Ping.dll System.Net.Primitives.dll System.Net.Requests.dll System.Net.Security.dll System.Net.Sockets.dll System.Net.WebHeaderCollection.dll System.Net.WebSockets.Client.dll System.Net.WebSockets.dll System.ObjectModel.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reactive.Windows.Threading.dll System.Reflection.Extensions.dll System.Reflection.Primitives.dll System.Reflection.dll System.Resources.Reader.dll System.Resources.ResourceManager.dll System.Resources.Writer.dll System.Runtime.CompilerServices.VisualC.dll System.Runtime.Extensions.dll System.Runtime.Handles.dll System.Runtime.InteropServices.RuntimeInformation.dll System.Runtime.InteropServices.dll System.Runtime.Numerics.dll System.Runtime.Serialization.Formatters.dll System.Runtime.Serialization.Json.dll System.Runtime.Serialization.Primitives.dll System.Runtime.Serialization.Xml.dll System.Runtime.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Csp.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.dll System.Security.SecureString.dll System.Text.Encoding.Extensions.dll System.Text.Encoding.dll System.Text.RegularExpressions.dll System.Threading.Overlapped.dll System.Threading.Tasks.Parallel.dll System.Threading.Tasks.dll System.Threading.Thread.dll System.Threading.ThreadPool.dll System.Threading.Timer.dll System.Threading.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Razor.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XDocument.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll System.Xml.XmlSerializer.dll Tango.AdvancedInstaller.dll Tango.AutoComplete.dll Tango.BL.dll Tango.BrushPicker.dll Tango.CSV.dll Tango.CircularGauge.dll Tango.CodeGeneration.dll Tango.ColorLib.dll Tango.ColorPicker.dll Tango.Core.dll Tango.DAL.Local.dll Tango.DAL.Remote.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Editors.dll Tango.Embroidery.dll Tango.EmbroideryUI.dll Tango.Emulations.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.MachineStudio.ColorCapture.dll Tango.MachineStudio.ColorLab.dll Tango.MachineStudio.Common.dll Tango.MachineStudio.DB.dll Tango.MachineStudio.DataCapture.dll Tango.MachineStudio.Developer.dll Tango.MachineStudio.Dispensers.dll Tango.MachineStudio.HardwareDesigner.dll Tango.MachineStudio.Logging.dll Tango.MachineStudio.MachineDesigner.dll Tango.MachineStudio.RML.dll Tango.MachineStudio.Statistics.dll_1 Tango.MachineStudio.Storage.dll Tango.MachineStudio.Stubs.dll Tango.MachineStudio.Technician.dll Tango.MachineStudio.UI.exe Tango.MachineStudio.Updater.exe Tango.MachineStudio.UsersAndRoles.dll Tango.PMR.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.Stubs.dll Tango.Synchronization.dll Tango.TCC.BL.dll Tango.TCC.CardDetector.dll Tango.TCC.ColorDetector.dll Tango.TCC.LoadTestLib.dll Tango.TCC.OpenCV.DLL.dll Tango.TFS.dll Tango.Transport.dll Tango.Video.dll Tango.Visuals.dll Tango.Web.dll WpfAnimatedGif.dll WriteableBitmapEx.Wpf.dll ZedGraph.dll ZedGraph.resources.dll benchmarks_rgb_lab.csv concrt140.dll cvextern.dll fpgen.exe libMagickCore2.dll libMagickWand2.dll libiconv2.dll libjpeg7.dll libpng120.dll libtiff3.dll libxml22.dll libzbar0.dll mscoree.dll msvcp140.dll msvcp140d.dll netstandard.dll opencv_aruco330d.dll opencv_calib3d330d.dll opencv_core330d.dll opencv_dnn330d.dll opencv_features2d330d.dll opencv_ffmpeg310.dll opencv_ffmpeg310_64.dll opencv_ffmpeg320.dll opencv_ffmpeg320_64.dll opencv_ffmpeg330.dll opencv_flann330d.dll opencv_highgui330d.dll opencv_imgcodecs330d.dll opencv_imgproc330d.dll opencv_ml330d.dll opencv_objdetect330d.dll opencv_photo330d.dll opencv_shape330d.dll opencv_stitching330d.dll opencv_superres330d.dll opencv_video330d.dll opencv_videoio330d.dll opencv_videostab330d.dll roslyn ucrtbased.dll vcruntime140.dll vcruntime140d.dll zlib1.dll"/> <ATTRIBUTE name="CurrentFeature" value="MainFeature"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent"> @@ -778,14 +776,11 @@ <ROW File="opencv_video330d.dll" Component_="opencv_video330d.dll" FileName="OPENC~21.DLL|opencv_video330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_video330d.dll" SelfReg="false" NextFile="opencv_videoio330d.dll"/> <ROW File="opencv_videoio330d.dll" Component_="opencv_videoio330d.dll" FileName="OPENC~22.DLL|opencv_videoio330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_videoio330d.dll" SelfReg="false" NextFile="opencv_videostab330d.dll"/> <ROW File="opencv_videostab330d.dll" Component_="opencv_videostab330d.dll" FileName="OPENC~23.DLL|opencv_videostab330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_videostab330d.dll" SelfReg="false" NextFile="Tango.MachineStudio.ColorCapture.dll"/> - <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc.exe" SelfReg="false" NextFile="AForge.dll" DigSign="true"/> - <ROW File="protoc1.0M4.jar" Component_="protoc1.0M4.jar" FileName="PROTOC~1.JAR|protoc-1.0M4.jar" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc-1.0M4.jar" SelfReg="false" NextFile="protocc.exe"/> - <ROW File="protocc.exe" Component_="protocc.exe" FileName="protoc-c.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc-c.exe" SelfReg="false" NextFile="protoc.exe" DigSign="true"/> <ROW File="template.bmp" Component_="benchmarks_rgb_lab.csv" FileName="template.bmp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\TCC\template.bmp" SelfReg="false" NextFile="ZedGraph.dll"/> <ROW File="ucrtbased.dll" Component_="ucrtbased.dll" FileName="UCRTBA~1.DLL|ucrtbased.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ucrtbased.dll" SelfReg="false" NextFile="vcruntime140.dll"/> <ROW File="vcruntime140.dll" Component_="vcruntime140.dll" FileName="VCRUNT~1.DLL|vcruntime140.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\vcruntime140.dll" SelfReg="false" NextFile="vcruntime140d.dll"/> <ROW File="vcruntime140d.dll" Component_="vcruntime140d.dll" FileName="VCRUNT~2.DLL|vcruntime140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\vcruntime140d.dll" SelfReg="false" NextFile="WpfAnimatedGif.dll"/> - <ROW File="zlib1.dll" Component_="zlib1.dll" FileName="zlib1.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\zlib1.dll" SelfReg="false" NextFile="protoc1.0M4.jar"/> + <ROW File="zlib1.dll" Component_="zlib1.dll" FileName="zlib1.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\zlib1.dll" SelfReg="false" NextFile="AForge.dll"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.custcomp.MsiShortcutPropertyComponent"> <ROW MsiShortcutProperty="Tango.MachineStudio.UI.exe0" Shortcut_="Tango.MachineStudio.UI.exe" PropertyKey="System.AppUserModel.PreventPinning" PropVariantValue="1"/> @@ -801,7 +796,7 @@ <ROW Action="AI_DetectSoftware" Sequence="101"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent"> - <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.0.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.0.20"/> + <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.0.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.0.21"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> <ROW Path="<AI_DICTS>ui.ail"/> @@ -878,6 +873,7 @@ <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent"> <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/> <ROW Directory_="roslyn_Dir" Component_="roslyn" ManualDelete="false"/> + <ROW Directory_="ProtoCompilers_Dir" Component_="ProtoCompilers" ManualDelete="false"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent"> <ROW Action="AI_AiRemoveFilesCommit" Type="11777" Source="ResourceCleaner.dll" Target="OnAiRemoveFilesCommit" WithoutSeq="true"/> diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt Binary files differindex 6d87e9201..a603ff06b 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 424e66b4d..63c3aa8a6 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/> <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/> <ROW Property="Manufacturer" Value="Twine"/> - <ROW Property="ProductCode" Value="1033:{D7960DF7-1557-4E2E-8544-C56BB91753E2} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{06451C1A-27E7-4EF0-8BF8-729B7BF9D9E3} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="Tango"/> - <ROW Property="ProductVersion" Value="1.0.27.0" Type="32"/> + <ROW Property="ProductVersion" Value="1.0.28.0" Type="32"/> <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/> <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/> <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> @@ -115,6 +115,7 @@ <ROW Component="Newtonsoft.Json.dll" ComponentId="{E556628B-DB87-4249-AF5E-F5D0AC9E6C32}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/> <ROW Component="OverrideData.xml" ComponentId="{D7B559ED-70E2-42F9-996D-2D6FDB2ED752}" Directory_="Configurations_Dir" Attributes="0" KeyPath="OverrideData.xml" Type="0"/> <ROW Component="ProductInformation" ComponentId="{1D49743C-F4ED-4BE9-8ED0-3792287247F6}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/> + <ROW Component="ProtoCompilers" ComponentId="{D9A7C493-573C-44DA-A57C-3A616D9956BA}" Directory_="ProtoCompilers_Dir" Attributes="0"/> <ROW Component="SA.Binary.dll" ComponentId="{FCC45B67-1B47-46A2-8C0A-6CAA78E7C9F0}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.Binary.dll"/> <ROW Component="SA.CodeView.dll" ComponentId="{0C133131-0EB4-4E2B-885F-B62EECF039AB}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.CodeView.dll"/> <ROW Component="SA.CommonTypes.dll" ComponentId="{7CE9EB0C-3192-4540-8A08-E7E6C59AA62A}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.CommonTypes.dll"/> @@ -211,16 +212,13 @@ <ROW Component="csi.exe" ComponentId="{E336E715-213E-4B46-9EC8-6512CDA2BC73}" Directory_="roslyn_Dir" Attributes="0" KeyPath="csi.exe"/> <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/> <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/> - <ROW Component="protoc.exe" ComponentId="{131E0FDB-687D-4F21-A394-30D75036BA27}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc.exe"/> - <ROW Component="protoc1.0M4.jar" ComponentId="{D50B5B91-D2FC-4C9A-9809-651AE0958130}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc1.0M4.jar" Type="0"/> - <ROW Component="protocc.exe" ComponentId="{24B8B558-172D-40F8-BC59-B6AEDC656738}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protocc.exe"/> <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/> <ROW Component="vbc.exe" ComponentId="{4744BEEE-9411-407E-A359-C3755394DF7C}" Directory_="roslyn_Dir" Attributes="0" KeyPath="vbc.exe"/> <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/> <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent"> - <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Build.Tasks.CodeAnalysis.dll Microsoft.CodeAnalysis.CSharp.Scripting.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.CodeAnalysis.Scripting.dll Microsoft.CodeAnalysis.VisualBasic.dll Microsoft.CodeAnalysis.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.DiaSymReader.Native.amd64.dll Microsoft.DiaSymReader.Native.x86.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Immutable.dll System.Console.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.dll System.IO.Pipes.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reflection.Metadata.dll System.Security.AccessControl.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.Windows.dll System.Spatial.dll System.Text.Encoding.CodePages.dll System.Threading.Thread.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.ColorLib.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BootScreen.exe Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.Pulse.dll Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll VBCSCompiler.exe csc.exe csc.exe.config csi.exe mscoree.dll msvcp140d.dll protoc.exe protoc1.0M4.jar protocc.exe ucrtbased.dll vbc.exe vcruntime140.dll vcruntime140d.dll"/> + <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Build.Tasks.CodeAnalysis.dll Microsoft.CodeAnalysis.CSharp.Scripting.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.CodeAnalysis.Scripting.dll Microsoft.CodeAnalysis.VisualBasic.dll Microsoft.CodeAnalysis.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.DiaSymReader.Native.amd64.dll Microsoft.DiaSymReader.Native.x86.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation ProtoCompilers SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Immutable.dll System.Console.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.dll System.IO.Pipes.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reflection.Metadata.dll System.Security.AccessControl.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.Windows.dll System.Spatial.dll System.Text.Encoding.CodePages.dll System.Threading.Thread.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.ColorLib.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BootScreen.exe Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.Pulse.dll Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll VBCSCompiler.exe csc.exe csc.exe.config csi.exe mscoree.dll msvcp140d.dll ucrtbased.dll vbc.exe vcruntime140.dll vcruntime140d.dll"/> <ATTRIBUTE name="CurrentFeature" value="MainFeature"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent"> @@ -458,7 +456,7 @@ <ROW File="Tango.PPC.WatchDog.exe.config" Component_="CommandLine.xml" FileName="TANGO~11.CON|Tango.PPC.WatchDog.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.WatchDog.exe.config" SelfReg="false" NextFile="Tango.PPC.WatchDog.pdb"/> <ROW File="Tango.PPC.WatchDog.pdb" Component_="Tango.PPC.WatchDog.exe" FileName="TANGO~12.PDB|Tango.PPC.WatchDog.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.WatchDog.pdb" SelfReg="false" NextFile="Tango.Scripting.dll"/> <ROW File="Tango.Pulse.dll" Component_="Tango.Pulse.dll" FileName="TANGOP~5.DLL|Tango.Pulse.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Pulse.dll" SelfReg="false" NextFile="Tango.Pulse.pdb"/> - <ROW File="Tango.Pulse.pdb" Component_="Tango.Pulse.dll" FileName="TANGOP~6.PDB|Tango.Pulse.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Pulse.pdb" SelfReg="false" NextFile="protoc1.0M4.jar"/> + <ROW File="Tango.Pulse.pdb" Component_="Tango.Pulse.dll" FileName="TANGOP~6.PDB|Tango.Pulse.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Pulse.pdb" SelfReg="false"/> <ROW File="Tango.SQLExaminer.dll" Component_="Tango.SQLExaminer.dll" FileName="TANGOS~5.DLL|Tango.SQLExaminer.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.SQLExaminer.dll" SelfReg="false" NextFile="Tango.SQLExaminer.pdb"/> <ROW File="Tango.SQLExaminer.pdb" Component_="Tango.SQLExaminer.dll" FileName="TANGOS~5.PDB|Tango.SQLExaminer.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.SQLExaminer.pdb" SelfReg="false" NextFile="Tango.TFS.dll"/> <ROW File="Tango.Scripting.dll" Component_="Tango.Scripting.dll" FileName="TANGOS~1.DLL|Tango.Scripting.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Scripting.dll" SelfReg="false" NextFile="Tango.Scripting.dll.config"/> @@ -497,9 +495,6 @@ <ROW File="csi.rsp" Component_="csc.exe.config" FileName="csi.rsp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csi.rsp" SelfReg="false" NextFile="Microsoft.Build.Tasks.CodeAnalysis.dll"/> <ROW File="mscoree.dll" Component_="mscoree.dll" FileName="mscoree.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\mscoree.dll" SelfReg="false" NextFile="msvcp140d.dll"/> <ROW File="msvcp140d.dll" Component_="msvcp140d.dll" FileName="MSVCP1~1.DLL|msvcp140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\msvcp140d.dll" SelfReg="false" NextFile="Newtonsoft.Json.dll"/> - <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc.exe" SelfReg="false" DigSign="true"/> - <ROW File="protoc1.0M4.jar" Component_="protoc1.0M4.jar" FileName="PROTOC~1.JAR|protoc-1.0M4.jar" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc-1.0M4.jar" SelfReg="false" NextFile="protocc.exe"/> - <ROW File="protocc.exe" Component_="protocc.exe" FileName="protoc-c.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc-c.exe" SelfReg="false" NextFile="protoc.exe" DigSign="true"/> <ROW File="ucrtbased.dll" Component_="ucrtbased.dll" FileName="UCRTBA~1.DLL|ucrtbased.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ucrtbased.dll" SelfReg="false" NextFile="vcruntime140.dll"/> <ROW File="vbc.exe" Component_="vbc.exe" FileName="vbc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.exe" SelfReg="false" NextFile="vbc.exe.config" DigSign="true"/> <ROW File="vbc.exe.config" Component_="csc.exe.config" FileName="VBCEXE~1.CON|vbc.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.exe.config" SelfReg="false" NextFile="vbc.rsp"/> @@ -515,7 +510,7 @@ <ROW Action="AI_DetectSoftware" Sequence="101"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent"> - <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.27"/> + <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.28"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> <ROW Path="<AI_DICTS>ui.ail"/> @@ -582,6 +577,7 @@ </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent"> <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/> + <ROW Directory_="ProtoCompilers_Dir" Component_="ProtoCompilers" ManualDelete="false"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent"> <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/> 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 3cf0dce1a..13e2af128 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("4.0.20.0")] +[assembly: AssemblyVersion("4.0.21.0")] [assembly: ComVisible(false)]
\ No newline at end of file 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 89fde22d0..3156b718b 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 PPC Application")] -[assembly: AssemblyVersion("1.0.27.0")] +[assembly: AssemblyVersion("1.0.28.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> + <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index a3e349ad0..b6ce08b2d 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -4618,7 +4618,7 @@ Global {862328A4-8632-43AF-B466-55825C7962FE}.DefaultBuild|x64.Build.0 = Debug|x64 {862328A4-8632-43AF-B466-55825C7962FE}.DefaultBuild|x86.ActiveCfg = Debug|Win32 {862328A4-8632-43AF-B466-55825C7962FE}.DefaultBuild|x86.Build.0 = Debug|Win32 - {862328A4-8632-43AF-B466-55825C7962FE}.Release|Any CPU.ActiveCfg = Release|Win32 + {862328A4-8632-43AF-B466-55825C7962FE}.Release|Any CPU.ActiveCfg = Debug|Win32 {862328A4-8632-43AF-B466-55825C7962FE}.Release|ARM.ActiveCfg = Release|Win32 {862328A4-8632-43AF-B466-55825C7962FE}.Release|ARM64.ActiveCfg = Release|Win32 {862328A4-8632-43AF-B466-55825C7962FE}.Release|x64.ActiveCfg = Release|x64 @@ -4726,7 +4726,7 @@ Global {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E}.DefaultBuild|x64.Build.0 = Debug|x64 {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E}.DefaultBuild|x86.ActiveCfg = Debug|Win32 {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E}.DefaultBuild|x86.Build.0 = Debug|Win32 - {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E}.Release|Any CPU.ActiveCfg = Release|Win32 + {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E}.Release|Any CPU.ActiveCfg = Debug|Win32 {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E}.Release|ARM.ActiveCfg = Release|Win32 {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E}.Release|ARM64.ActiveCfg = Release|Win32 {09B2CCD8-9EEE-4837-A6BC-B5AF3DF0557E}.Release|x64.ActiveCfg = Release|x64 @@ -4800,7 +4800,7 @@ Global {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.DefaultBuild|x64.Build.0 = Debug|x64 {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.DefaultBuild|x86.ActiveCfg = Debug|Win32 {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.DefaultBuild|x86.Build.0 = Debug|Win32 - {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.Release|Any CPU.ActiveCfg = Release|Win32 + {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.Release|Any CPU.ActiveCfg = Debug|Win32 {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.Release|ARM.ActiveCfg = Release|Win32 {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.Release|ARM64.ActiveCfg = Release|Win32 {DD19A7B3-E4B0-444E-98D4-D1C346442E63}.Release|x64.ActiveCfg = Release|x64 @@ -4874,7 +4874,7 @@ Global {BB268536-9E03-46A4-9B11-6025211D87F0}.DefaultBuild|x64.Build.0 = Debug|x64 {BB268536-9E03-46A4-9B11-6025211D87F0}.DefaultBuild|x86.ActiveCfg = Debug|Win32 {BB268536-9E03-46A4-9B11-6025211D87F0}.DefaultBuild|x86.Build.0 = Debug|Win32 - {BB268536-9E03-46A4-9B11-6025211D87F0}.Release|Any CPU.ActiveCfg = Release|Win32 + {BB268536-9E03-46A4-9B11-6025211D87F0}.Release|Any CPU.ActiveCfg = Debug|Win32 {BB268536-9E03-46A4-9B11-6025211D87F0}.Release|ARM.ActiveCfg = Release|Win32 {BB268536-9E03-46A4-9B11-6025211D87F0}.Release|ARM64.ActiveCfg = Release|Win32 {BB268536-9E03-46A4-9B11-6025211D87F0}.Release|x64.ActiveCfg = Release|x64 @@ -5296,12 +5296,12 @@ Global {B822CBD9-1113-4668-85C9-22AA9C24CE60} = {EC62BC9C-F2FE-4333-B7E4-110E38D43958} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_UpdateFileVersion = False - BuildVersion_StartDate = 2000/1/1 - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs BuildVersion_UseGlobalSettings = False + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_StartDate = 2000/1/1 + BuildVersion_UpdateFileVersion = False + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} EndGlobalSection EndGlobal |
