diff --git a/TestScripts/change-version.sh b/TestScripts/change-version.sh
old mode 100644
new mode 100755
diff --git a/TestScripts/cryptest.vcxproj b/TestScripts/cryptest.vcxproj
index a961cfeb..c8cab38e 100644
--- a/TestScripts/cryptest.vcxproj
+++ b/TestScripts/cryptest.vcxproj
@@ -34,6 +34,11 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <!-- Undocumented MSbuild variable, set to a sane default value. -->
+  <!-- It may be changed later by Microsoft.Cpp.Default.props -->
+  <PropertyGroup Label="Globals">
+    <DefaultPlatformToolset>$(DefaultPlatformToolset)</DefaultPlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>
     <RootNamespace>cryptest</RootNamespace>
diff --git a/TestScripts/cryptlib.vcxproj b/TestScripts/cryptlib.vcxproj
index 287ca5a6..5e6dd47f 100644
--- a/TestScripts/cryptlib.vcxproj
+++ b/TestScripts/cryptlib.vcxproj
@@ -34,12 +34,18 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <!-- Undocumented MSbuild variable, set to a sane default value. -->
+  <!-- It may be changed later by Microsoft.Cpp.Default.props -->
+  <PropertyGroup Label="Globals">
+    <DefaultPlatformToolset>$(DefaultPlatformToolset)</DefaultPlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>
     <RootNamespace>cryptlib</RootNamespace>
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>
+  <!-- VCUpgrade leases a lot to be desired -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/cryptest.vcxproj b/cryptest.vcxproj
index 4ff99b48..98325eb7 100644
--- a/cryptest.vcxproj
+++ b/cryptest.vcxproj
@@ -34,10 +34,15 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <!-- Undocumented MSbuild variable, set to a sane default value. -->
+  <!-- It may be changed later by Microsoft.Cpp.Default.props -->
+  <PropertyGroup Label="Globals">
+    <DefaultPlatformToolset>v100</DefaultPlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>
     <RootNamespace>cryptest</RootNamespace>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj
index 25a36079..eb4e76d9 100644
--- a/cryptlib.vcxproj
+++ b/cryptlib.vcxproj
@@ -34,12 +34,18 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <!-- Undocumented MSbuild variable, set to a sane default value. -->
+  <!-- It may be changed later by Microsoft.Cpp.Default.props -->
+  <PropertyGroup Label="Globals">
+    <DefaultPlatformToolset>v100</DefaultPlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>
     <RootNamespace>cryptlib</RootNamespace>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>
+  <!-- VCUpgrade leases a lot to be desired -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">