Updating platform toolset to VS2022 and updating headers for same

Author: maz-net-au

.gitignore

@@ -1,12 +1,15 @@
 *.tlog
 bin/
 obj/
+.vs/
 **obj/**
 *.obj
 *.pdb
 *.res
 *.log
 *.idb
+*.ilk
+*.recipe
 *.pch
 *.sdf
 *.ipch
@@ -15,4 +18,6 @@ obj/
 *.db
 packages/
 *.opendb
-*.user
+*.user
+*.vspscc
+*.lib

Credential/CredUILauncher/CredUILauncher.vcxproj

@@ -26,6 +26,7 @@
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
     <SccProvider>SAK</SccProvider>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -47,7 +48,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Credential/NFCRingCredentialProvider/NFCRingCredentialProvider.vcxproj

@@ -25,6 +25,7 @@
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
     <SccProvider>SAK</SccProvider>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -36,7 +37,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

Credential/NFCRingCredentialProvider/Reader.h

@@ -17,6 +17,7 @@
 #include <thread>
 #include "NFCCredentialProvider.h"
 #include "guid.h"
+#include <string>
 
 #pragma comment(lib, "Ws2_32.lib")
 

Management/RegistryWriter/NewToken.cs

@@ -64,6 +64,8 @@ private void frmNewToken_Load(object sender, EventArgs e)
                 {
                     // still waiting for it to be scanned
                     value += 7;
+                    if (value > 100)
+                        value = 100;
                     ClientCommon.SetControlPropertyThreadSafe(pgbAwaitingToken, "Value", value);
                 }
             }, task, 1000, 1000);

Service/NFCRingServiceCore/ServiceCore.cs

@@ -111,7 +111,7 @@ private void ScanForId()
             //Thread.Sleep(10000);
             List<string> currentTokens = new List<string>();
             SCardContext sCardContext = new SCardContext();
-            SerialContext serialContext = new SerialContext();
+            //SerialContext serialContext = new SerialContext();
             // basically keep running until we're told to stop
             while(state == ServiceState.Starting || state == ServiceState.Running)
             {
@@ -129,7 +129,7 @@ private void ScanForId()
                 //Marshal.FreeHGlobal(idloc);
                 //Marshal.FreeHGlobal(errloc);
                 List<string> ls = sCardContext.GetIds();
-                ls = ls.Concat(serialContext.GetIds()).ToList();
+                //ls = ls.Concat(serialContext.GetIds()).ToList();
                 foreach (string id in ls)
                 {
                     //string id = ls.FirstOrDefault() ?? "";
@@ -212,7 +212,7 @@ private void ScanForId()
                 // sleep for configured delay?
                 Thread.Sleep(100);
             }
-            serialContext.Stop();
+            //serialContext.Stop();
             Log("NFC Reading stopped");
         }
 
@@ -603,7 +603,7 @@ private bool LoadConfig()
 
         private bool SaveConfig()
         {
-            File.WriteAllText(appPath + @"\Application.config", JsonConvert.SerializeObject(ApplicationConfiguration));
+            File.WriteAllText(appPath + @"\Application.config", JsonConvert.SerializeObject(ApplicationConfiguration, Formatting.Indented));
             Log("Configuration saved to " + appPath + @"\Application.config");
             return true;
         }