Improvements for User.props #383: changed Import-statement to provide accessibility via Property Manager; User.props sample changed

Author: cshnik

Notepad2e.vcxproj

@@ -70,7 +70,6 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' != '14.0'">v141_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="User.props" Condition="exists('User.props')" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
@@ -101,6 +100,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="User.props" Condition="exists('User.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>

User.props.IN

@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<!-- NOTE: You can copy this file to User.props to override some standard settings -->
-<!-- NOTE: Don't add the copy User.props to source control!!! -->
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v142</PlatformToolset> <!-- VS2019 -->
+  <PropertyGroup Label="UserMacros">
+    <BOOST_ROOT>C:\boost\boost_1_73_0</BOOST_ROOT>
   </PropertyGroup>
-</Project>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="BOOST_ROOT">
+      <Value>$(BOOST_ROOT)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

test/Extension/Notepad2eTests.vcxproj

@@ -31,7 +31,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
-  <Import Project="..\..\User.props" Condition="exists('..\..\User.props')" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
@@ -46,6 +45,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\User.props" Condition="exists('..\..\User.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>