diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..3e0f5d3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.lib filter=lfs diff=lfs merge=lfs -text
diff --git a/.yamato/windows-build.yml b/.yamato/windows-build.yml
index f36cf7d..f5f6b35 100644
--- a/.yamato/windows-build.yml
+++ b/.yamato/windows-build.yml
@@ -1,7 +1,7 @@
 name: Win - Build & Test VCS plugins
 agent:
     type: Unity::VM
-    image: core-kaunas/win10-vs2010:latest
+    image: vcs-ecosystem/win10-vs2019-perforce-plugin:latest
     flavor: b1.large
     
 interpreter: powershell    
@@ -18,4 +18,4 @@ artifacts:
     logs:
       paths:
         - "win_build.txt"
-        - "win_test.txt"
\ No newline at end of file
+        - "win_test.txt"
diff --git a/P4Plugin/P4Plugin.vcxproj b/P4Plugin/P4Plugin.vcxproj
index 8901b33..58814da 100644
--- a/P4Plugin/P4Plugin.vcxproj
+++ b/P4Plugin/P4Plugin.vcxproj
@@ -99,18 +99,21 @@
     <ProjectGuid>{06DFA5BA-ACFC-4170-9143-5B2D1E654180}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>P4Plugin2</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -148,7 +151,7 @@ _SCL_SECURE_NO_DEPRECATE
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(ProjectDir)Source\r19.1\lib\win32debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>crypt32.lib;libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y</Command>
@@ -174,7 +177,7 @@ _SCL_SECURE_NO_DEPRECATE
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(ProjectDir)Source\r19.1\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>crypt32.lib;libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y
diff --git a/P4Plugin/Source/r19.1/lib/win32/libMT.pdb b/P4Plugin/Source/r19.1/lib/win32/libMT.pdb
new file mode 100644
index 0000000..21c7fb9
Binary files /dev/null and b/P4Plugin/Source/r19.1/lib/win32/libMT.pdb differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/libclient.lib b/P4Plugin/Source/r19.1/lib/win32/libclient.lib
index 339b99e..a045e3f 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/libclient.lib and b/P4Plugin/Source/r19.1/lib/win32/libclient.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/libeay32.lib b/P4Plugin/Source/r19.1/lib/win32/libeay32.lib
index e431013..f5136b9 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/libeay32.lib and b/P4Plugin/Source/r19.1/lib/win32/libeay32.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/libp4script.lib b/P4Plugin/Source/r19.1/lib/win32/libp4script.lib
index c952c8a..1952979 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/libp4script.lib and b/P4Plugin/Source/r19.1/lib/win32/libp4script.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/libp4script_c.lib b/P4Plugin/Source/r19.1/lib/win32/libp4script_c.lib
index 4ac64d6..1fe311f 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/libp4script_c.lib and b/P4Plugin/Source/r19.1/lib/win32/libp4script_c.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/libp4script_curl.lib b/P4Plugin/Source/r19.1/lib/win32/libp4script_curl.lib
index 2e88702..9b65dcd 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/libp4script_curl.lib and b/P4Plugin/Source/r19.1/lib/win32/libp4script_curl.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/libp4script_sqlite.lib b/P4Plugin/Source/r19.1/lib/win32/libp4script_sqlite.lib
index 5be5fe6..106b44e 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/libp4script_sqlite.lib and b/P4Plugin/Source/r19.1/lib/win32/libp4script_sqlite.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/librpc.lib b/P4Plugin/Source/r19.1/lib/win32/librpc.lib
index b3630e3..c9bb1fa 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/librpc.lib and b/P4Plugin/Source/r19.1/lib/win32/librpc.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/libsupp.lib b/P4Plugin/Source/r19.1/lib/win32/libsupp.lib
index 3cc105b..c1d2ab3 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/libsupp.lib and b/P4Plugin/Source/r19.1/lib/win32/libsupp.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32/ssleay32.lib b/P4Plugin/Source/r19.1/lib/win32/ssleay32.lib
index d78beda..ac11c6a 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32/ssleay32.lib and b/P4Plugin/Source/r19.1/lib/win32/ssleay32.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/libMTd.pdb b/P4Plugin/Source/r19.1/lib/win32debug/libMTd.pdb
new file mode 100644
index 0000000..5efd443
Binary files /dev/null and b/P4Plugin/Source/r19.1/lib/win32debug/libMTd.pdb differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/libclient.lib b/P4Plugin/Source/r19.1/lib/win32debug/libclient.lib
index 0beed99..98e4829 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/libclient.lib and b/P4Plugin/Source/r19.1/lib/win32debug/libclient.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/libeay32.lib b/P4Plugin/Source/r19.1/lib/win32debug/libeay32.lib
index e431013..bda8d7b 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/libeay32.lib and b/P4Plugin/Source/r19.1/lib/win32debug/libeay32.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/libp4script.lib b/P4Plugin/Source/r19.1/lib/win32debug/libp4script.lib
index 71b3bf3..1c0be13 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/libp4script.lib and b/P4Plugin/Source/r19.1/lib/win32debug/libp4script.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/libp4script_c.lib b/P4Plugin/Source/r19.1/lib/win32debug/libp4script_c.lib
index e2dd470..6ecf714 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/libp4script_c.lib and b/P4Plugin/Source/r19.1/lib/win32debug/libp4script_c.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/libp4script_curl.lib b/P4Plugin/Source/r19.1/lib/win32debug/libp4script_curl.lib
index 4dcd2f3..f08d9d7 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/libp4script_curl.lib and b/P4Plugin/Source/r19.1/lib/win32debug/libp4script_curl.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/libp4script_sqlite.lib b/P4Plugin/Source/r19.1/lib/win32debug/libp4script_sqlite.lib
index 6eea33b..12a3520 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/libp4script_sqlite.lib and b/P4Plugin/Source/r19.1/lib/win32debug/libp4script_sqlite.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/librpc.lib b/P4Plugin/Source/r19.1/lib/win32debug/librpc.lib
index f084306..7aa94ee 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/librpc.lib and b/P4Plugin/Source/r19.1/lib/win32debug/librpc.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/libsupp.lib b/P4Plugin/Source/r19.1/lib/win32debug/libsupp.lib
index 12d3599..253b6ae 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/libsupp.lib and b/P4Plugin/Source/r19.1/lib/win32debug/libsupp.lib differ
diff --git a/P4Plugin/Source/r19.1/lib/win32debug/ssleay32.lib b/P4Plugin/Source/r19.1/lib/win32debug/ssleay32.lib
index d78beda..38025bb 100644
Binary files a/P4Plugin/Source/r19.1/lib/win32debug/ssleay32.lib and b/P4Plugin/Source/r19.1/lib/win32debug/ssleay32.lib differ
diff --git a/Test/TestServer/TestServer.vcxproj b/Test/TestServer/TestServer.vcxproj
index f0c558f..9d0349e 100644
--- a/Test/TestServer/TestServer.vcxproj
+++ b/Test/TestServer/TestServer.vcxproj
@@ -14,18 +14,21 @@
     <ProjectGuid>{64C0D8D3-68C7-46C6-B341-0ED1C78B225B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>TestServer</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -101,4 +104,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msbuilder.cmd b/msbuilder.cmd
index 6fbe9ac..c97f489 100644
--- a/msbuilder.cmd
+++ b/msbuilder.cmd
@@ -1,4 +1,4 @@
-if exist "%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" call "%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
-if exist "%REALVSPATH%\Common7\Tools\vsvars32.bat" call "%REALVSPATH%\Common7\Tools\vsvars32.bat"
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsMSBuildCmd.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsMSBuildCmd.bat"
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsMSBuildCmd.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsMSBuildCmd.bat"
+
 call msbuild %1 /t:Clean;%2 /p:Configuration=Release;Platform=%3