diff --git a/3rdprtylibs/json.net.4.5/Newtonsoft.Json.dll b/3rdprtylibs/json.net.4.5/Newtonsoft.Json.dll index 77a5d89..a04a6ca 100644 Binary files a/3rdprtylibs/json.net.4.5/Newtonsoft.Json.dll and b/3rdprtylibs/json.net.4.5/Newtonsoft.Json.dll differ diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln index ee0aaf1..50eb645 100644 --- a/AyaNovaSolution.sln +++ b/AyaNovaSolution.sln @@ -457,7 +457,7 @@ Global {3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.ReleaseX86AyaNova|x86.ActiveCfg = Release|x86 {3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.ReleaseX86AyaNova|x86.Build.0 = Release|x86 {3A426361-1480-49A3-B596-53ABB98087F9}.Debug|.NET.ActiveCfg = Debug|Any CPU - {3A426361-1480-49A3-B596-53ABB98087F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3A426361-1480-49A3-B596-53ABB98087F9}.Debug|Any CPU.ActiveCfg = Debug|x86 {3A426361-1480-49A3-B596-53ABB98087F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {3A426361-1480-49A3-B596-53ABB98087F9}.Debug|WBI.ActiveCfg = Debug|Any CPU {3A426361-1480-49A3-B596-53ABB98087F9}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -590,6 +590,7 @@ 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 @@ -1044,6 +1045,7 @@ 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 diff --git a/keys/Generator/obj/Debug/Generator.csproj.GenerateResource.Cache b/keys/Generator/obj/Debug/Generator.csproj.GenerateResource.Cache index 298c0a9..ebf7cc1 100644 Binary files a/keys/Generator/obj/Debug/Generator.csproj.GenerateResource.Cache and b/keys/Generator/obj/Debug/Generator.csproj.GenerateResource.Cache differ diff --git a/keys/cspinstall.bat b/keys/cspinstall.bat index 6a2378d..db727ae 100644 --- a/keys/cspinstall.bat +++ b/keys/cspinstall.bat @@ -1,6 +1,12 @@ rem "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\Bin\sn.exe" -i AyaNovaKey.snk AyaNovaLicenseContainer - rem "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\NETFX 4.0 Tools\sn.exe" -i AyaNovaKey.snk AyaNovaLicenseContainer +rem "C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\sn.exe" -i AyaNovaKey.snk AyaNovaLicenseContainer +rem THIS MUST BE RUN AS ADMINISTRATOR!!!! +pause +"C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.2 Tools\sn.exe" -d AyaNovaLicenseContainer +pause -"C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\sn.exe" -i AyaNovaKey.snk AyaNovaLicenseContainer +"C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.2 Tools\sn.exe" -i C:\data\ayanova\keys\AyaNovaKey.snk AyaNovaLicenseContainer + +pause diff --git a/source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj b/source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj index a38e034..afff0a0 100644 --- a/source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj +++ b/source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj @@ -10,7 +10,7 @@ Properties AyaNova.PlugIn.QBOI AyaNova.PlugIn.QBOI - v4.7.1 + v4.7.2 512 true ..\..\..\keys\AyaNova.snk diff --git a/source/Plugins/AyaNova.Plugin.QBOI/app.config b/source/Plugins/AyaNova.Plugin.QBOI/app.config index b7b9339..12cf5e0 100644 --- a/source/Plugins/AyaNova.Plugin.QBOI/app.config +++ b/source/Plugins/AyaNova.Plugin.QBOI/app.config @@ -1,19 +1,19 @@ - + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/utils/AyaImport/AyaImport.csproj b/utils/AyaImport/AyaImport.csproj index 14999de..09f74bb 100644 --- a/utils/AyaImport/AyaImport.csproj +++ b/utils/AyaImport/AyaImport.csproj @@ -103,6 +103,37 @@ AnyCPU prompt + + true + bin\x86\Debug\ + DEBUG;TRACE + 285212672 + 4096 + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + 285212672 + true + 4096 + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\RELEASE AND DEPLOY BUILD\ + TRACE + 285212672 + true + + x86 + prompt + MinimumRecommendedRules.ruleset + False diff --git a/utils/AyaImport/AyaImport.csproj.user b/utils/AyaImport/AyaImport.csproj.user index cc6d96c..fe8bb0d 100644 --- a/utils/AyaImport/AyaImport.csproj.user +++ b/utils/AyaImport/AyaImport.csproj.user @@ -72,4 +72,13 @@ true + + true + + + true + + + true + \ No newline at end of file diff --git a/utils/AyaImport/Form1.cs b/utils/AyaImport/Form1.cs index 0d21aea..67be9a0 100644 --- a/utils/AyaImport/Form1.cs +++ b/utils/AyaImport/Form1.cs @@ -4428,7 +4428,7 @@ sLastOp="Saving workorder" + w.WorkorderService.ServiceNumber.ToString(); /// private bool DoNewLogin(string Login, string Password) { - if(!Thread.CurrentPrincipal.Identity.IsAuthenticated) + if(Thread.CurrentPrincipal.Identity==null || !Thread.CurrentPrincipal.Identity.IsAuthenticated) AyaBizUtils.Login(Login, Password); if(Thread.CurrentPrincipal.Identity.IsAuthenticated) {