From eb5ec83ad94415bad281e2117d99932cd7ae7d72 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 8 May 2020 20:47:35 +0000 Subject: [PATCH] --- AyaNovaSolution.sln | 12 ------------ Installs/AyaNovaINNO/AyaNova.iss | 9 ++++++--- source/Plugins/AyaNova.Plugin.V8/V8.cs | 14 +++++++------- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln index 682ccad..0357f81 100644 --- a/AyaNovaSolution.sln +++ b/AyaNovaSolution.sln @@ -591,7 +591,6 @@ Global {674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|.NET.ActiveCfg = Debug|Any CPU {674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|.NET.Build.0 = Debug|Any CPU {674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|WBI.ActiveCfg = Debug|Any CPU {674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -626,7 +625,6 @@ Global {674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|.NET.ActiveCfg = Debug|Any CPU {F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|WBI.ActiveCfg = Debug|Any CPU {F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|x64.ActiveCfg = Debug|x64 @@ -661,7 +659,6 @@ Global {F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|.NET.ActiveCfg = Debug|Any CPU {AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|WBI.ActiveCfg = Debug|Any CPU {AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -694,7 +691,6 @@ Global {AA1D8C90-D676-4438-8C68-DB9AA1783396}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|.NET.ActiveCfg = Debug|Any CPU {0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|WBI.ActiveCfg = Debug|Any CPU @@ -728,7 +724,6 @@ Global {0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {122B13D1-19DD-47AD-B030-A209167EF258}.Debug|.NET.ActiveCfg = Debug|Any CPU {122B13D1-19DD-47AD-B030-A209167EF258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {122B13D1-19DD-47AD-B030-A209167EF258}.Debug|Any CPU.Build.0 = Debug|Any CPU {122B13D1-19DD-47AD-B030-A209167EF258}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {122B13D1-19DD-47AD-B030-A209167EF258}.Debug|WBI.ActiveCfg = Debug|Any CPU {122B13D1-19DD-47AD-B030-A209167EF258}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -761,7 +756,6 @@ Global {122B13D1-19DD-47AD-B030-A209167EF258}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|.NET.ActiveCfg = Debug|Any CPU {4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|WBI.ActiveCfg = Debug|Any CPU {4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -794,7 +788,6 @@ Global {4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|.NET.ActiveCfg = Debug|Any CPU {19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|Any CPU.Build.0 = Debug|Any CPU {19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|WBI.ActiveCfg = Debug|Any CPU {19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -827,7 +820,6 @@ Global {19024613-F5C6-42A5-B02D-CECD8B20BF77}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|.NET.ActiveCfg = Debug|Any CPU {42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|Any CPU.Build.0 = Debug|Any CPU {42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|WBI.ActiveCfg = Debug|Any CPU @@ -861,7 +853,6 @@ Global {42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|.NET.ActiveCfg = Debug|Any CPU {F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|Any CPU.Build.0 = Debug|Any CPU {F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|WBI.ActiveCfg = Debug|Any CPU {F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -926,7 +917,6 @@ Global {0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|.NET.ActiveCfg = Debug|Any CPU {A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|Any CPU.Build.0 = Debug|Any CPU {A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|WBI.ActiveCfg = Debug|Any CPU {A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1055,7 +1045,6 @@ Global {CE73BA18-914D-4426-8888-1DA0F0FC4764}.ReleaseX86AyaNova|x86.Build.0 = Release|x86 {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|.NET.ActiveCfg = Debug|x86 {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Any CPU.Build.0 = Debug|Any CPU {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Mixed Platforms.Build.0 = Debug|x86 @@ -1092,7 +1081,6 @@ Global {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.ReleaseX86AyaNova|x86.Build.0 = Release|x86 {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|.NET.ActiveCfg = Debug|Any CPU {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|Any CPU.Build.0 = Debug|Any CPU {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|WBI.ActiveCfg = Debug|Any CPU diff --git a/Installs/AyaNovaINNO/AyaNova.iss b/Installs/AyaNovaINNO/AyaNova.iss index 33d9021..b1e81fa 100644 --- a/Installs/AyaNovaINNO/AyaNova.iss +++ b/Installs/AyaNovaINNO/AyaNova.iss @@ -102,10 +102,13 @@ Source: "..\..\source\AyaNova.PlugIn\bin\Release\AyaNova.PlugIn.dll"; DestDir: " Source: "..\..\source\Plugins\AyaNova.PlugIn.Merger\bin\Release\AyaNova.PlugIn.Merger.dll"; DestDir: "{app}\plugins\Merger";Permissions: everyone-full;Flags:ignoreversion; Source: "..\..\source\Plugins\AyaNova.PlugIn.XTools\bin\Release\AyaNova.PlugIn.XTools.dll"; DestDir: "{app}\plugins\XTools";Permissions: everyone-full;Flags:ignoreversion; Source: "..\..\release\AyaNova.PlugIn.ClientRemover.dll"; DestDir: "{app}\plugins\ClientRemover";Permissions: everyone-full;Flags:ignoreversion; +;-------- ;v8 exporter -Source: "..\..\release\AyaNova.PlugIn.V8.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; -Source: "..\..\source\Plugins\AyaNova.Plugin.V8\libs\HtmlAgilityPack.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; -Source: "..\..\source\Plugins\AyaNova.Plugin.V8\libs\ReverseMarkdown.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; +;;Note: commented out until we're ready to release as alpha or beta test +;;Source: "..\..\release\AyaNova.PlugIn.V8.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; +;;Source: "..\..\source\Plugins\AyaNova.Plugin.V8\libs\HtmlAgilityPack.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; +;;Source: "..\..\source\Plugins\AyaNova.Plugin.V8\libs\ReverseMarkdown.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; +;-------- ;firebird files diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs index c06bce0..150162a 100644 --- a/source/Plugins/AyaNova.Plugin.V8/V8.cs +++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs @@ -1403,10 +1403,10 @@ namespace AyaNova.PlugIn.V8 string NonFileUrls = await ExportDocs(ObjectTID, c.Docs, progress, util.AyaType.WorkOrder); if (!string.IsNullOrEmpty(NonFileUrls)) { - //need to repost the user with the notes modified + ////need to repost the user with the notes modified - d.login = null; - d.password = null; + //d.login = null; + //d.password = null; d.notes = NonFileUrls + "\n-----------------\n" + d.notes; repost = true; } @@ -1489,8 +1489,8 @@ namespace AyaNova.PlugIn.V8 { //need to repost the user with the notes modified - d.login = null; - d.password = null; + //d.login = null; + //d.password = null; d.notes = NonFileUrls + "\n-----------------\n" + d.notes; repost = true; } @@ -1573,8 +1573,8 @@ namespace AyaNova.PlugIn.V8 { //need to repost the user with the notes modified - d.login = null; - d.password = null; + //d.login = null; + //d.password = null; d.notes = NonFileUrls + "\n-----------------\n" + d.notes; repost = true; }