immediately before implementing new QBOI code for oAuth2 (except did change json.net in qboi project from v10 to v12)

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

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

source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AyaNova.PlugIn.QBOI</RootNamespace>
     <AssemblyName>AyaNova.PlugIn.QBOI</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\..\keys\AyaNova.snk</AssemblyOriginatorKeyFile>

source/Plugins/AyaNova.Plugin.QBOI/app.config

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

utils/AyaImport/AyaImport.csproj

@@ -103,6 +103,37 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <BaseAddress>285212672</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <BaseAddress>285212672</BaseAddress>
+    <Optimize>true</Optimize>
+    <FileAlignment>4096</FileAlignment>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RELEASE AND DEPLOY BUILD|x86'">
+    <OutputPath>bin\x86\RELEASE AND DEPLOY BUILD\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <BaseAddress>285212672</BaseAddress>
+    <Optimize>true</Optimize>
+    <DebugType />
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FirebirdSql.Data.FirebirdClient, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

utils/AyaImport/AyaImport.csproj.user

@@ -72,4 +72,13 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RELEASE AND DEPLOY BUILD|AnyCPU' ">
     <StartWithIE>true</StartWithIE>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <StartWithIE>true</StartWithIE>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <StartWithIE>true</StartWithIE>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RELEASE AND DEPLOY BUILD|x86'">
+    <StartWithIE>true</StartWithIE>
+  </PropertyGroup>
 </Project>

utils/AyaImport/Form1.cs

@@ -4428,7 +4428,7 @@ sLastOp="Saving workorder" + w.WorkorderService.ServiceNumber.ToString();
 		/// <returns></returns>
 		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)
 			{