From ac513c06f8c80b8158d7921a93d758f4ba66afaf Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Thu, 3 Aug 2017 01:14:20 -0400
Subject: [PATCH] Test importing property sheets before project's global
 properties

---
 TestScripts/cryptest.vcxproj | 13 +++++++------
 TestScripts/cryptlib.vcxproj | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/TestScripts/cryptest.vcxproj b/TestScripts/cryptest.vcxproj
index a961cfeb..141c1587 100644
--- a/TestScripts/cryptest.vcxproj
+++ b/TestScripts/cryptest.vcxproj
@@ -34,12 +34,7 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>
-    <RootNamespace>cryptest</RootNamespace>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+  <!-- Import property sheets -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -50,6 +45,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <!-- End of Visual Studio boilerplate -->
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>
+    <RootNamespace>cryptest</RootNamespace>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
   <!-- All Configurations -->
   <PropertyGroup Label="All Configurations">
     <ConfigurationType>Application</ConfigurationType>
diff --git a/TestScripts/cryptlib.vcxproj b/TestScripts/cryptlib.vcxproj
index 287ca5a6..523498f8 100644
--- a/TestScripts/cryptlib.vcxproj
+++ b/TestScripts/cryptlib.vcxproj
@@ -34,12 +34,7 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>
-    <RootNamespace>cryptlib</RootNamespace>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
+  <!-- Import property sheets -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -50,6 +45,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <!-- End of Visual Studio boilerplate -->
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>
+    <RootNamespace>cryptlib</RootNamespace>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
   <!-- All Configurations -->
   <PropertyGroup Label="All Configurations">
     <ConfigurationType>StaticLibrary</ConfigurationType>