From 63320b29beeda1edd2def8ee69227f4840a51e50 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 6 Dec 2020 15:08:01 +0200 Subject: Machine_Studio_v4.2.6 --- .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') 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 716b31a27..4f9bee934 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.2.5.0")] +[assembly: AssemblyVersion("4.2.6.0")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1 From 6f870fe0dee45f73953c7ec78e7cbd86f7cc2c1c Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 15 Dec 2020 14:07:15 +0200 Subject: Reference and build ColorLib from PPC and MS auto ! --- .../Tango.MachineStudio.UI.csproj | 49 ++++++++++++++-------- .../PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 46 +++++++++++++------- Software/Visual_Studio/Tango.sln | 16 ++++--- 3 files changed, 72 insertions(+), 39 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') 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 7895a9355..cd4eb4dd3 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 @@ -343,22 +343,6 @@ Settings.settings True - - Tango.ColorLib_v1.dll - PreserveNewest - - - Tango.ColorLib_v2.dll - PreserveNewest - - - Tango.ColorLib_v3.dll - PreserveNewest - - - Tango.ColorLib_v4.dll - PreserveNewest - TCC\benchmarks_rgb_lab.csv Always @@ -542,6 +526,37 @@ {cb0b0aa2-bb24-4bca-a720-45e397684e12} Tango.MachineStudio.Common + + + + {E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6} + Tango.ColorLib_v4 + false + Content + PreserveNewest + + + {A3A8ADA0-C150-4E30-A60D-11F291FDBF7A} + Tango.ColorLib_v3 + false + Content + PreserveNewest + + + {1A3FC7FB-403C-4B3D-B705-28FCE11317DD} + Tango.ColorLib_v2 + false + Content + PreserveNewest + + + {CF4C66B0-CD13-4D31-8133-339A01E7E6F2} + Tango.ColorLib_v1 + false + Content + PreserveNewest + + @@ -681,7 +696,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)lib\" - + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index e738dbd43..081d79f3e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -426,18 +426,6 @@ - - Tango.ColorLib_v1.dll - PreserveNewest - - - Tango.ColorLib_v2.dll - PreserveNewest - - - Tango.ColorLib_v3.dll - PreserveNewest - @@ -456,10 +444,6 @@ - - Tango.ColorLib_v4.dll - PreserveNewest - @@ -620,6 +604,36 @@ {208c8bd8-72c6-4e3c-acaa-351091a2acc7} Tango.PPC.Shared + + + {E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6} + Tango.ColorLib_v4 + false + Content + PreserveNewest + + + {A3A8ADA0-C150-4E30-A60D-11F291FDBF7A} + Tango.ColorLib_v3 + false + Content + PreserveNewest + + + {1A3FC7FB-403C-4B3D-B705-28FCE11317DD} + Tango.ColorLib_v2 + false + Content + PreserveNewest + + + {CF4C66B0-CD13-4D31-8133-339A01E7E6F2} + Tango.ColorLib_v1 + false + Content + PreserveNewest + + diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index c9ca85279..83c36a91e 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -2938,6 +2938,7 @@ Global {50119E79-5012-4B36-8438-953DD5FC06E6}.Release|x86.ActiveCfg = Release|Any CPU {50119E79-5012-4B36-8438-953DD5FC06E6}.Release|x86.Build.0 = Release|Any CPU {CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|Any CPU.Build.0 = Debug|Win32 {CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|ARM.ActiveCfg = Debug|Win32 {CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|ARM64.ActiveCfg = Debug|Win32 {CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|x64.ActiveCfg = Debug|x64 @@ -2952,6 +2953,7 @@ Global {CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Release|x86.ActiveCfg = Release|Win32 {CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Release|x86.Build.0 = Release|Win32 {1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|Any CPU.Build.0 = Debug|Win32 {1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|ARM.ActiveCfg = Debug|Win32 {1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|ARM64.ActiveCfg = Debug|Win32 {1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|x64.ActiveCfg = Debug|x64 @@ -2966,6 +2968,7 @@ Global {1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Release|x86.ActiveCfg = Release|Win32 {1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Release|x86.Build.0 = Release|Win32 {A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|Any CPU.Build.0 = Debug|Win32 {A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|ARM.ActiveCfg = Debug|Win32 {A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|ARM64.ActiveCfg = Debug|Win32 {A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|x64.ActiveCfg = Debug|x64 @@ -3676,6 +3679,7 @@ Global {F15985C7-DF60-41CF-9333-D98BB8B43E6C}.Release|x86.ActiveCfg = Release|Any CPU {F15985C7-DF60-41CF-9333-D98BB8B43E6C}.Release|x86.Build.0 = Release|Any CPU {E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|Any CPU.Build.0 = Debug|Win32 {E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|ARM.ActiveCfg = Debug|Win32 {E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|ARM64.ActiveCfg = Debug|Win32 {E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|x64.ActiveCfg = Debug|x64 @@ -4323,12 +4327,12 @@ Global {F1DC98EF-C50A-4E84-9A39-211A68626FBA} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_UpdateFileVersion = False - BuildVersion_StartDate = 2000/1/1 - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs BuildVersion_UseGlobalSettings = False + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_StartDate = 2000/1/1 + BuildVersion_UpdateFileVersion = False + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} EndGlobalSection EndGlobal -- cgit v1.3.1