diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln index bfeb55e..c22d94f 100644 --- a/AyaNovaSolution.sln +++ b/AyaNovaSolution.sln @@ -28,29 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UTILS", "UTILS", "{71BC28F3 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GZTW.AyaNova.BLL", "source\bizobjects\AyaLib\GZTW.AyaNova.BLL.csproj", "{50B807B6-FC35-4CC3-B54D-91C78426A943}" EndProject -Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "AyaNovaWBI", "http://localhost/AyaNovaWBI", "{82EA0692-8199-45D6-8726-CA49EE893299}" - ProjectSection(WebsiteProperties) = preProject - UseIISExpress = "false" - TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" - ProjectReferences = "{50B807B6-FC35-4CC3-B54D-91C78426A943}|GZTW.AyaNova.BLL.dll;{C2392355-12A9-4197-A1D3-603C390B1E62}|CSLA.Core.Bindablebase.dll;{1B9A38BB-461A-47A4-AD72-099C694138A0}|CSLA.dll;{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}|CSLA.Server.DataPortal.dll;{701893AA-C042-4FB2-8643-E139372C1117}|GZTW.Data.dll;{EDE897E2-E2E6-441D-9F83-0B973AE09670}|GZTW.Profile.dll;" - Debug.AspNetCompiler.VirtualPath = "/AyaNovaWBI" - Debug.AspNetCompiler.PhysicalPath = "source\WBI\" - Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\AyaNovaWBI\" - Debug.AspNetCompiler.Updateable = "false" - Debug.AspNetCompiler.ForceOverwrite = "true" - Debug.AspNetCompiler.FixedNames = "false" - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.VirtualPath = "/AyaNovaWBI" - Release.AspNetCompiler.PhysicalPath = "source\WBI\" - Release.AspNetCompiler.TargetPath = "PrecompiledWeb\AyaNovaWBI\" - Release.AspNetCompiler.Updateable = "false" - Release.AspNetCompiler.ForceOverwrite = "true" - Release.AspNetCompiler.FixedNames = "false" - Release.AspNetCompiler.Debug = "False" - SlnRelativePath = "source\WBI\" - DefaultWebSiteLanguage = "Visual C#" - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GZTW.WinForm.Controls", "source\GZWFControls\GZTW.WinForm.Controls.csproj", "{FE5614F3-E435-423C-A23D-E3372B7EAEAB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GZTW.Data", "source\Data\Data\GZTW.Data.csproj", "{701893AA-C042-4FB2-8643-E139372C1117}" @@ -106,18 +83,44 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "notes", "notes", "{C8126A87-B1FB-4B88-817B-BFDDC191ADF8}" ProjectSection(SolutionItems) = preProject release procedure.txt = release procedure.txt + TODO.txt = TODO.txt EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build batch files", "Build batch files", "{E62344B1-D49D-4A4F-B8C9-9D691E1D1B2D}" ProjectSection(SolutionItems) = preProject - make.bat = make.bat + release\AyaNovaPart1.obproj = release\AyaNovaPart1.obproj + release\AyaNovaPart2.obproj = release\AyaNovaPart2.obproj + newforlaptopmake.bat = newforlaptopmake.bat testmake.bat = testmake.bat + release\WBI_MBI.obproj = release\WBI_MBI.obproj + release\x86AyaNovaOnly.obproj = release\x86AyaNovaOnly.obproj EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyaNova.Plugin.Dump", "source\Plugins\AyaNova.Plugin.Dump\AyaNova.Plugin.Dump.csproj", "{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyaNova.Plugin.ClientRemover", "source\Plugins\AyaNova.Plugin.ClientRemover\AyaNova.Plugin.ClientRemover.csproj", "{B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}" EndProject +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "WBI", "source\WBI\", "{9C259CE1-D7DC-4249-B1C1-DBB194984EA5}" + ProjectSection(WebsiteProperties) = preProject + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" + ProjectReferences = "{1b9a38bb-461a-47a4-ad72-099c694138a0}|CSLA.dll;{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}|CSLA.Server.DataPortal.dll;{701893AA-C042-4FB2-8643-E139372C1117}|GZTW.Data.dll;{EDE897E2-E2E6-441D-9F83-0B973AE09670}|GZTW.Profile.dll;{c2392355-12a9-4197-a1d3-603c390b1e62}|CSLA.Core.Bindablebase.dll;{50b807b6-fc35-4cc3-b54d-91c78426a943}|GZTW.AyaNova.BLL.dll;" + Debug.AspNetCompiler.VirtualPath = "/WBI" + Debug.AspNetCompiler.PhysicalPath = "source\WBI\" + Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\WBI\" + Debug.AspNetCompiler.Updateable = "true" + Debug.AspNetCompiler.ForceOverwrite = "true" + Debug.AspNetCompiler.FixedNames = "false" + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.VirtualPath = "/WBI" + Release.AspNetCompiler.PhysicalPath = "source\WBI\" + Release.AspNetCompiler.TargetPath = "PrecompiledWeb\WBI\" + Release.AspNetCompiler.Updateable = "true" + Release.AspNetCompiler.ForceOverwrite = "true" + Release.AspNetCompiler.FixedNames = "false" + Release.AspNetCompiler.Debug = "False" + VWDPort = "49600" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -186,42 +189,8 @@ Global {50B807B6-FC35-4CC3-B54D-91C78426A943}.ReleaseX86AyaNova|WBI.Build.0 = Release|Any CPU {50B807B6-FC35-4CC3-B54D-91C78426A943}.ReleaseX86AyaNova|x64.ActiveCfg = RELEASE AND DEPLOY BUILD|Any CPU {50B807B6-FC35-4CC3-B54D-91C78426A943}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Debug|.NET.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Debug|WBI.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Debug|x64.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Debug|x86.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Debug|x86.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|.NET.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|Any CPU.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|Any CPU.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|Mixed Platforms.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|Mixed Platforms.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|WBI.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|x64.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|x86.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Default|x86.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Release|.NET.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Release|Any CPU.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Release|Mixed Platforms.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Release|WBI.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Release|x64.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.Release|x86.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|.NET.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|Any CPU.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|Any CPU.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|Mixed Platforms.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|Mixed Platforms.Build.0 = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|WBI.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|x64.ActiveCfg = Debug|Any CPU - {82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|x86.ActiveCfg = Debug|Any CPU {FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|.NET.ActiveCfg = Debug|Any CPU {FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU {FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|WBI.ActiveCfg = Debug|Any CPU {FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -258,7 +227,6 @@ Global {FE5614F3-E435-423C-A23D-E3372B7EAEAB}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {701893AA-C042-4FB2-8643-E139372C1117}.Debug|.NET.ActiveCfg = Debug|Any CPU {701893AA-C042-4FB2-8643-E139372C1117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {701893AA-C042-4FB2-8643-E139372C1117}.Debug|Any CPU.Build.0 = Debug|Any CPU {701893AA-C042-4FB2-8643-E139372C1117}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {701893AA-C042-4FB2-8643-E139372C1117}.Debug|WBI.ActiveCfg = Debug|Any CPU {701893AA-C042-4FB2-8643-E139372C1117}.Debug|WBI.Build.0 = Debug|Any CPU @@ -297,7 +265,6 @@ Global {701893AA-C042-4FB2-8643-E139372C1117}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|.NET.ActiveCfg = Debug|Any CPU {EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|WBI.ActiveCfg = Debug|Any CPU {EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|WBI.Build.0 = Debug|Any CPU @@ -336,7 +303,6 @@ Global {EDE897E2-E2E6-441D-9F83-0B973AE09670}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|.NET.ActiveCfg = Debug|Any CPU {1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|WBI.ActiveCfg = Debug|Any CPU {1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|WBI.Build.0 = Debug|Any CPU @@ -375,7 +341,6 @@ Global {1B9A38BB-461A-47A4-AD72-099C694138A0}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|.NET.ActiveCfg = Debug|Any CPU {C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|WBI.ActiveCfg = Debug|Any CPU {C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|WBI.Build.0 = Debug|Any CPU @@ -414,7 +379,6 @@ Global {C2392355-12A9-4197-A1D3-603C390B1E62}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|.NET.ActiveCfg = Debug|Any CPU {80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|Any CPU.Build.0 = Debug|Any CPU {80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|WBI.ActiveCfg = Debug|Any CPU {80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|WBI.Build.0 = Debug|Any CPU @@ -527,7 +491,6 @@ Global {3A426361-1480-49A3-B596-53ABB98087F9}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|.NET.ActiveCfg = Debug|Any CPU {EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|Any CPU.Build.0 = Debug|Any CPU {EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|WBI.ActiveCfg = Debug|Any CPU {EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -597,7 +560,6 @@ Global {5083ED09-C394-48E7-B9DA-53A4CCA2D505}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|.NET.ActiveCfg = Debug|Any CPU {6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|Any CPU.Build.0 = Debug|Any CPU {6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|WBI.ActiveCfg = Debug|Any CPU {6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -629,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 @@ -664,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 @@ -699,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 @@ -732,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 @@ -766,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 @@ -799,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 @@ -832,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 @@ -865,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 @@ -899,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 @@ -932,7 +885,6 @@ Global {F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|.NET.ActiveCfg = Debug|Any CPU {0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU {0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|WBI.ActiveCfg = Debug|Any CPU {0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -965,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 @@ -998,7 +949,6 @@ Global {A9445D98-9E04-4A53-A6D7-441E97345975}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|.NET.ActiveCfg = Debug|x86 {A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|WBI.ActiveCfg = Debug|x86 {A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|x64.ActiveCfg = Debug|x86 @@ -1031,7 +981,6 @@ Global {A65F3152-E70D-47B6-8928-7AA52567BE8D}.ReleaseX86AyaNova|x86.Build.0 = Release|x86 {58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|.NET.ActiveCfg = Debug|Any CPU {58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|Any CPU.Build.0 = Debug|Any CPU {58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|WBI.ActiveCfg = Debug|Any CPU @@ -1063,7 +1012,6 @@ Global {58F36D78-4BBA-4A70-8EAB-A6D414663233}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|.NET.ActiveCfg = Debug|x86 {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Any CPU.Build.0 = Debug|Any CPU {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Mixed Platforms.Build.0 = Debug|x86 {CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|WBI.ActiveCfg = Debug|x86 @@ -1097,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 @@ -1134,7 +1081,6 @@ Global {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.ReleaseX86AyaNova|x86.Build.0 = Release|x86 {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.ActiveCfg = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU @@ -1166,7 +1112,6 @@ Global {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU {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 @@ -1196,6 +1141,38 @@ Global {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.ReleaseX86AyaNova|WBI.ActiveCfg = Release|Any CPU {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.ReleaseX86AyaNova|x64.ActiveCfg = Release|Any CPU {B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Debug|.NET.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Debug|WBI.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Debug|x64.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Debug|x86.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Default|.NET.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Default|Any CPU.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Default|Any CPU.Build.0 = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Default|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Default|Mixed Platforms.Build.0 = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Default|WBI.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Default|x64.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Default|x86.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Release|.NET.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Release|Any CPU.Build.0 = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Release|Mixed Platforms.Build.0 = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Release|WBI.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Release|x64.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.Release|x86.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|.NET.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|Any CPU.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|Any CPU.Build.0 = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|Mixed Platforms.Build.0 = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|WBI.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|x64.ActiveCfg = Debug|Any CPU + {9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|x86.ActiveCfg = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TODO.txt b/TODO.txt index 0605906..e2ad223 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,8 +1,5 @@ ////////////////////////////////////////////////////////// //TODO -Pack my box with five dozen liquor jugs - - "RequestedTrial": @@ -10,13 +7,3 @@ Pack my box with five dozen liquor jugs ////////////////////////////////////////////////////////// //DONE STUFF - - -/////////////////////////////////////////////////////////// -//ON HOLD - MAY BE REQUIRED OR I"M THINKING ABOUT IT STUFF - -- (ON HOLD UNTIL WE KNOW WHAT EXACTLY IS CAUSING THIS) Some changes during map and import are not set locally when first setting up so results in invalid cast message - - Error: Invalid Cast exception when first setup then try to invoice because it is needing refresh first - - - Set a currency for a customer (if multicurrency), will need if doesn't default customer. - - Set global tax thing for invoice (inclusive of tax or exclusive of tax, but I think exclusive is a good default maybe?) diff --git a/make.bat b/make.bat index cde87fc..b0fc8e8 100644 --- a/make.bat +++ b/make.bat @@ -1,4 +1,4 @@ -@echo off +rem @echo off cls cd c:\data\ayanova diff --git a/release/AyaNovaPart1.obproj b/release/AyaNovaPart1.obproj index 15ed5e8..e9a9241 100644 --- a/release/AyaNovaPart1.obproj +++ b/release/AyaNovaPart1.obproj @@ -5,7 +5,7 @@ - + diff --git a/release/AyaNovaPart2.obproj b/release/AyaNovaPart2.obproj index 85f5696..b7fb9c8 100644 --- a/release/AyaNovaPart2.obproj +++ b/release/AyaNovaPart2.obproj @@ -5,7 +5,7 @@ - + diff --git a/release/WBI_MBI.obproj b/release/WBI_MBI.obproj index 8eb2433..686288e 100644 --- a/release/WBI_MBI.obproj +++ b/release/WBI_MBI.obproj @@ -3,7 +3,7 @@ - + diff --git a/release/x86AyaNovaOnly.obproj b/release/x86AyaNovaOnly.obproj index 949b6e0..bd6f1bd 100644 --- a/release/x86AyaNovaOnly.obproj +++ b/release/x86AyaNovaOnly.obproj @@ -4,7 +4,7 @@ - + diff --git a/source/AyaNova.PlugIn/app.config b/source/AyaNova.PlugIn/app.config index b8db39c..8329beb 100644 --- a/source/AyaNova.PlugIn/app.config +++ b/source/AyaNova.PlugIn/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/MBI/MBI.csproj b/source/MBI/MBI.csproj index 6b7f5db..bf334b0 100644 --- a/source/MBI/MBI.csproj +++ b/source/MBI/MBI.csproj @@ -52,6 +52,10 @@ ..\..\release\CSLA.Server.DataPortal.dll True + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll + True + @@ -207,6 +211,7 @@ AyaNova.snk + diff --git a/source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user b/source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user index 83665bb..3b5fa99 100644 --- a/source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user +++ b/source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user @@ -10,10 +10,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt - 07/02/2018 11:40:56 + 03/14/2019 14:44:18 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 06/14/2017 11:29:54 @@ -28,46 +28,46 @@ by editing this MSBuild file. In order to learn more about this please visit htt 06/14/2017 11:29:55 - 07/02/2018 11:40:02 + 03/14/2019 14:42:04 - 07/02/2018 11:40:10 + 03/14/2019 14:41:56 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/13/2019 15:50:40 + 03/14/2019 16:10:07 - 09/13/2018 13:53:00 + 03/18/2019 11:55:42 - 02/14/2019 11:35:36 + 03/18/2019 11:55:43 - 09/13/2018 13:53:02 + 03/18/2019 11:55:42 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 07/02/2018 11:40:09 + 03/14/2019 14:42:21 - 02/15/2019 14:49:52 + 03/18/2019 11:55:46 - 02/15/2019 14:49:53 + 03/18/2019 11:56:01 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/13/2019 16:35:50 + 03/18/2019 11:55:42 06/14/2017 12:04:42 @@ -76,94 +76,97 @@ by editing this MSBuild file. In order to learn more about this please visit htt 06/14/2017 11:32:19 - 02/13/2019 16:35:50 + 03/18/2019 11:55:42 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 07/02/2018 11:40:10 + 03/18/2019 11:54:01 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/15/2019 14:50:11 + 03/18/2019 11:56:15 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 02/13/2019 15:50:40 + 03/14/2019 16:10:07 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 07/02/2018 11:40:56 + 03/14/2019 14:44:19 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 07/02/2018 11:40:55 + 03/14/2019 14:44:19 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 07/02/2018 11:40:55 + 03/14/2019 14:44:19 + + + 03/18/2019 11:55:01 - 07/02/2018 11:40:55 + 03/14/2019 14:44:19 - 02/15/2019 14:49:54 + 03/18/2019 11:56:03 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 02/13/2019 16:03:57 + 03/14/2019 14:44:19 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 02/15/2019 14:50:00 + 03/18/2019 11:56:07 - 07/02/2018 11:40:56 + 03/14/2019 14:44:18 - 02/14/2019 11:05:59 + 03/18/2019 11:55:01 \ No newline at end of file diff --git a/source/MBI/Web.config b/source/MBI/Web.config index ddc190c..df7fba8 100644 --- a/source/MBI/Web.config +++ b/source/MBI/Web.config @@ -3,13 +3,11 @@ - - + - - + @@ -28,6 +26,10 @@ + + + + - + \ No newline at end of file diff --git a/source/MBI/config.txt b/source/MBI/config.txt index 3949a45..4d07dd9 100644 --- a/source/MBI/config.txt +++ b/source/MBI/config.txt @@ -5,13 +5,13 @@ DataBase MSSQL - Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis; + Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis; diff --git a/source/Plugins/AyaNova.PlugIn.AyaScript/app.config b/source/Plugins/AyaNova.PlugIn.AyaScript/app.config index 4cc9d99..182cd9f 100644 --- a/source/Plugins/AyaNova.PlugIn.AyaScript/app.config +++ b/source/Plugins/AyaNova.PlugIn.AyaScript/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.PlugIn.ImportExportCSV/app.config b/source/Plugins/AyaNova.PlugIn.ImportExportCSV/app.config index b8db39c..8329beb 100644 --- a/source/Plugins/AyaNova.PlugIn.ImportExportCSV/app.config +++ b/source/Plugins/AyaNova.PlugIn.ImportExportCSV/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.PlugIn.Merger/app.config b/source/Plugins/AyaNova.PlugIn.Merger/app.config index b8db39c..8329beb 100644 --- a/source/Plugins/AyaNova.PlugIn.Merger/app.config +++ b/source/Plugins/AyaNova.PlugIn.Merger/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.ClientRemover/app.config b/source/Plugins/AyaNova.Plugin.ClientRemover/app.config index b8db39c..8329beb 100644 --- a/source/Plugins/AyaNova.Plugin.ClientRemover/app.config +++ b/source/Plugins/AyaNova.Plugin.ClientRemover/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.Dump/app.config b/source/Plugins/AyaNova.Plugin.Dump/app.config index b8db39c..8329beb 100644 --- a/source/Plugins/AyaNova.Plugin.Dump/app.config +++ b/source/Plugins/AyaNova.Plugin.Dump/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.ExportToExcel/app.config b/source/Plugins/AyaNova.Plugin.ExportToExcel/app.config index 4cc9d99..182cd9f 100644 --- a/source/Plugins/AyaNova.Plugin.ExportToExcel/app.config +++ b/source/Plugins/AyaNova.Plugin.ExportToExcel/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.OutlookSchedule/app.config b/source/Plugins/AyaNova.Plugin.OutlookSchedule/app.config index 4cc9d99..182cd9f 100644 --- a/source/Plugins/AyaNova.Plugin.OutlookSchedule/app.config +++ b/source/Plugins/AyaNova.Plugin.OutlookSchedule/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.PTI/app.config b/source/Plugins/AyaNova.Plugin.PTI/app.config index b8db39c..8329beb 100644 --- a/source/Plugins/AyaNova.Plugin.PTI/app.config +++ b/source/Plugins/AyaNova.Plugin.PTI/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.QBI/app.config b/source/Plugins/AyaNova.Plugin.QBI/app.config index b8db39c..8329beb 100644 --- a/source/Plugins/AyaNova.Plugin.QBI/app.config +++ b/source/Plugins/AyaNova.Plugin.QBI/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.QBOI/app.config b/source/Plugins/AyaNova.Plugin.QBOI/app.config index c25c416..b7b9339 100644 --- a/source/Plugins/AyaNova.Plugin.QBOI/app.config +++ b/source/Plugins/AyaNova.Plugin.QBOI/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.QuickNotification/app.config b/source/Plugins/AyaNova.Plugin.QuickNotification/app.config index b8db39c..8329beb 100644 --- a/source/Plugins/AyaNova.Plugin.QuickNotification/app.config +++ b/source/Plugins/AyaNova.Plugin.QuickNotification/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.XTools/app.config b/source/Plugins/AyaNova.Plugin.XTools/app.config index b8db39c..8329beb 100644 --- a/source/Plugins/AyaNova.Plugin.XTools/app.config +++ b/source/Plugins/AyaNova.Plugin.XTools/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/source/Plugins/AyaNovaOL/app.config b/source/Plugins/AyaNovaOL/app.config index 97585bc..808fce7 100644 --- a/source/Plugins/AyaNovaOL/app.config +++ b/source/Plugins/AyaNovaOL/app.config @@ -95,6 +95,10 @@ + + + + diff --git a/source/WBI/Bin/Antlr3.Runtime.dll b/source/WBI/Bin/Antlr3.Runtime.dll index 34bd478..b963933 100644 Binary files a/source/WBI/Bin/Antlr3.Runtime.dll and b/source/WBI/Bin/Antlr3.Runtime.dll differ diff --git a/source/WBI/Bin/config.txt b/source/WBI/Bin/config.txt index 22da02d..7c69b96 100644 --- a/source/WBI/Bin/config.txt +++ b/source/WBI/Bin/config.txt @@ -5,7 +5,7 @@ DataBase MSSQL - Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis; + Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis; + - DataBase FireBird ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.fdb;Dialect=3; - --> + - + @@ -68,6 +68,10 @@ + + + + \ No newline at end of file diff --git a/source/ri/ri/config.txt b/source/ri/ri/config.txt index 3949a45..4d07dd9 100644 --- a/source/ri/ri/config.txt +++ b/source/ri/ri/config.txt @@ -5,13 +5,13 @@ DataBase MSSQL - Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis; + Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis; diff --git a/source/ri/ri/packages.config b/source/ri/ri/packages.config index f728e79..2df2ab4 100644 --- a/source/ri/ri/packages.config +++ b/source/ri/ri/packages.config @@ -1,15 +1,16 @@  + - + - + - + \ No newline at end of file diff --git a/source/ri/ri/ri.csproj b/source/ri/ri/ri.csproj index 7c77f69..beeb0fc 100644 --- a/source/ri/ri/ri.csproj +++ b/source/ri/ri/ri.csproj @@ -55,7 +55,7 @@ - ..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll + ..\..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll False @@ -98,9 +98,8 @@ - False - bin\Newtonsoft.Json.dll - False + ..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll + True @@ -112,10 +111,34 @@ + + True + ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll + + + False + ..\..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll True + + True + ..\..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll + + + True + ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll + + + True + ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll + + + True + ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + @@ -130,30 +153,6 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - - - True - ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll - - - True - ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll - ..\packages\WebGrease.1.5.2\lib\WebGrease.dll diff --git a/utils/AyaImport/app.config b/utils/AyaImport/app.config index 2b3aa3e..e04b520 100644 --- a/utils/AyaImport/app.config +++ b/utils/AyaImport/app.config @@ -1,6 +1,8 @@  - + + + @@ -11,6 +13,10 @@ + + + + - + \ No newline at end of file diff --git a/utils/GeneratorService/app.config b/utils/GeneratorService/app.config index 2b3aa3e..e04b520 100644 --- a/utils/GeneratorService/app.config +++ b/utils/GeneratorService/app.config @@ -1,6 +1,8 @@  - + + + @@ -11,6 +13,10 @@ + + + + - + \ No newline at end of file diff --git a/utils/migration/ToMSSQL/Form1.cs b/utils/migration/ToMSSQL/Form1.cs index 4ec6e3b..407eda4 100644 --- a/utils/migration/ToMSSQL/Form1.cs +++ b/utils/migration/ToMSSQL/Form1.cs @@ -305,8 +305,8 @@ namespace ToMSSQL #if(DEBUG) //this.edFBConnect.Text = @"ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.FDB;Dialect=3;"; //this.edMSConnect.Text = @"Server=VIRTDEVJOHN;initial catalog=master;User Id=sa; Password=abraxis;"; - this.edFBConnect.Text = @"ServerType=1;DataBase=C:\data\AyaNova\database\ET_BAD_ID_AYANOVA.FDB;Dialect=3;"; - this.edMSConnect.Text = @"Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=master;User Id=sa; Password=abraxis;"; + this.edFBConnect.Text = @"ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.FDB;Dialect=3;"; + this.edMSConnect.Text = @"Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=master;User Id=sa; Password=abraxis;"; #endif }