From 639bf85398e7f7b957a13d1d70ecdae4fb73c0ef Mon Sep 17 00:00:00 2001
From: Fabrice Foray <fabrice.foray@hotmail.fr>
Date: Wed, 16 Sep 2020 23:44:24 +0200
Subject: [PATCH] General Update to XSharp 2.6

---
 FabTools/FabCtrl/FabCtrl.xsproj                         | 6 +++---
 FabTools/FabOutlookBar/FabOutlookBar.xsproj             | 6 +++---
 FabTools/FabPaintLib/FabPaintLib.xsproj                 | 6 +++---
 FabTools/FabPaintLib_Control/FabPaintLib_Control.xsproj | 6 +++---
 FabTools/FabPaintLib_Test/FabPaintLib_Test.xsproj       | 6 +++---
 FabTools/FabSplitShellLib/FabSplitShellLib.xsproj       | 6 +++---
 FabTools/FabSplitShellTest/FabSplitShellTest.xsproj     | 6 +++---
 FabTools/FabTools/FabTools.xsproj                       | 6 +++---
 FabTools/FabToolsTest/FabToolsTest.xsproj               | 6 +++---
 FabTools/FabTwain/FabTwain.xsproj                       | 6 +++---
 FabTools/FabTwainTest/FabTwainTest.xsproj               | 6 +++---
 FabTools/FabZip/FabZip.xsproj                           | 6 +++---
 FabTools/FabZipVo/FabZipVo.xsproj                       | 6 +++---
 FabTools/FabZip_Test/FabZip_Test.xsproj                 | 6 +++---
 FabTools/Fab_Zip_1_52j_Test/Fab_Zip_1_52j_Test.xsproj   | 6 +++---
 FabTools/NewZipApp/NewZipApp.xsproj                     | 6 +++---
 FabTools/XSPaintLib_Test/XSPaintLib_Test.xsproj         | 6 +++---
 17 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/FabTools/FabCtrl/FabCtrl.xsproj b/FabTools/FabCtrl/FabCtrl.xsproj
index 9ea33de..5fae9fa 100644
--- a/FabTools/FabCtrl/FabCtrl.xsproj
+++ b/FabTools/FabCtrl/FabCtrl.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>Vulcan</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -161,7 +161,7 @@
   <ItemGroup>
     <NativeResource Include="Resources\HyperLink.CURSOR_HAND.rc" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent />
     <PostBuildEvent>xcopy $(ProjectDir)bin\$(Configuration) $(SolutionDir)bin\$(Configuration) /y /s /i</PostBuildEvent>
diff --git a/FabTools/FabOutlookBar/FabOutlookBar.xsproj b/FabTools/FabOutlookBar/FabOutlookBar.xsproj
index 8409ccd..91edca3 100644
--- a/FabTools/FabOutlookBar/FabOutlookBar.xsproj
+++ b/FabTools/FabOutlookBar/FabOutlookBar.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <ProjectGuid>29651908-b583-4e70-86d5-ce27f3a095c1</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -83,7 +83,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/FabTools/FabPaintLib/FabPaintLib.xsproj b/FabTools/FabPaintLib/FabPaintLib.xsproj
index 3a2e789..d977b24 100644
--- a/FabTools/FabPaintLib/FabPaintLib.xsproj
+++ b/FabTools/FabPaintLib/FabPaintLib.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>VO</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -160,7 +160,7 @@
     <Folder Include="FreeImage" />
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent />
     <PostBuildEvent>xcopy $(ProjectDir)bin\$(Configuration) $(SolutionDir)bin\$(Configuration) /y /s /i</PostBuildEvent>
diff --git a/FabTools/FabPaintLib_Control/FabPaintLib_Control.xsproj b/FabTools/FabPaintLib_Control/FabPaintLib_Control.xsproj
index c127216..0357de4 100644
--- a/FabTools/FabPaintLib_Control/FabPaintLib_Control.xsproj
+++ b/FabTools/FabPaintLib_Control/FabPaintLib_Control.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>VO</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -166,7 +166,7 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent />
     <PostBuildEvent>xcopy $(ProjectDir)bin\$(Configuration) $(SolutionDir)bin\$(Configuration) /y /s /i</PostBuildEvent>
diff --git a/FabTools/FabPaintLib_Test/FabPaintLib_Test.xsproj b/FabTools/FabPaintLib_Test/FabPaintLib_Test.xsproj
index 31e6cc7..57a4513 100644
--- a/FabTools/FabPaintLib_Test/FabPaintLib_Test.xsproj
+++ b/FabTools/FabPaintLib_Test/FabPaintLib_Test.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>Vulcan</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -267,7 +267,7 @@
     <Folder Include="Properties\" />
     <Folder Include="Resources\" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent />
     <PostBuildEvent>xcopy $(ProjectDir)bin\$(Configuration) $(SolutionDir)bin\$(Configuration) /y /s /i</PostBuildEvent>
diff --git a/FabTools/FabSplitShellLib/FabSplitShellLib.xsproj b/FabTools/FabSplitShellLib/FabSplitShellLib.xsproj
index 9bbccc7..7359b22 100644
--- a/FabTools/FabSplitShellLib/FabSplitShellLib.xsproj
+++ b/FabTools/FabSplitShellLib/FabSplitShellLib.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <ProjectGuid>4917d936-b6e8-440a-9ce7-6411b6e7488e</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -89,7 +89,7 @@
     <Prefer32Bit>False</Prefer32Bit>
     <RegisterForComInterop>False</RegisterForComInterop>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/FabTools/FabSplitShellTest/FabSplitShellTest.xsproj b/FabTools/FabSplitShellTest/FabSplitShellTest.xsproj
index 04ff970..60e3342 100644
--- a/FabTools/FabSplitShellTest/FabSplitShellTest.xsproj
+++ b/FabTools/FabSplitShellTest/FabSplitShellTest.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <ProjectGuid>{5ed9239d-dbb3-4ab8-8d19-cef010154e54}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -86,7 +86,7 @@
     <Prefer32Bit>True</Prefer32Bit>
     <RegisterForComInterop>False</RegisterForComInterop>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/FabTools/FabTools/FabTools.xsproj b/FabTools/FabTools/FabTools.xsproj
index 63f10ef..1b415e7 100644
--- a/FabTools/FabTools/FabTools.xsproj
+++ b/FabTools/FabTools/FabTools.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <ProjectGuid>d2a10849-0553-4ad0-9b7f-cec2a03b79d5</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -89,7 +89,7 @@
     <Prefer32Bit>False</Prefer32Bit>
     <RegisterForComInterop>False</RegisterForComInterop>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/FabTools/FabToolsTest/FabToolsTest.xsproj b/FabTools/FabToolsTest/FabToolsTest.xsproj
index 89a6b9b..4b56b3d 100644
--- a/FabTools/FabToolsTest/FabToolsTest.xsproj
+++ b/FabTools/FabToolsTest/FabToolsTest.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <ProjectGuid>210dbe32-b8b3-4a5f-946f-3d15a9691bb5</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -51,7 +51,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/FabTools/FabTwain/FabTwain.xsproj b/FabTools/FabTwain/FabTwain.xsproj
index 192ff13..496760a 100644
--- a/FabTools/FabTwain/FabTwain.xsproj
+++ b/FabTools/FabTwain/FabTwain.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <ProjectGuid>2720b640-4614-42eb-b6a2-c5eb10558ee3</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -78,7 +78,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/FabTools/FabTwainTest/FabTwainTest.xsproj b/FabTools/FabTwainTest/FabTwainTest.xsproj
index 5bc36cb..a7af449 100644
--- a/FabTools/FabTwainTest/FabTwainTest.xsproj
+++ b/FabTools/FabTwainTest/FabTwainTest.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <ProjectGuid>{2606f8fb-5100-4c96-a31c-1cc99f5439a8}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -86,7 +86,7 @@
     <Prefer32Bit>True</Prefer32Bit>
     <RegisterForComInterop>False</RegisterForComInterop>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/FabTools/FabZip/FabZip.xsproj b/FabTools/FabZip/FabZip.xsproj
index 0e4156d..71fcfd6 100644
--- a/FabTools/FabZip/FabZip.xsproj
+++ b/FabTools/FabZip/FabZip.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>Vulcan</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -127,7 +127,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent>
     </PreBuildEvent>
diff --git a/FabTools/FabZipVo/FabZipVo.xsproj b/FabTools/FabZipVo/FabZipVo.xsproj
index 73a7087..33ce839 100644
--- a/FabTools/FabZipVo/FabZipVo.xsproj
+++ b/FabTools/FabZipVo/FabZipVo.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <ProjectGuid>4dd08a41-2945-4ddd-9821-4bf8a301fa9b</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -57,7 +57,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <ItemGroup>
     <Reference Include="DotNetZip, Version=1.13.6.0, Culture=neutral, PublicKeyToken=6583c7c814667745">
       <Name>DotNetZip</Name>
diff --git a/FabTools/FabZip_Test/FabZip_Test.xsproj b/FabTools/FabZip_Test/FabZip_Test.xsproj
index e98ca4b..1169004 100644
--- a/FabTools/FabZip_Test/FabZip_Test.xsproj
+++ b/FabTools/FabZip_Test/FabZip_Test.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>Vulcan</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -133,7 +133,7 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent>
     </PreBuildEvent>
diff --git a/FabTools/Fab_Zip_1_52j_Test/Fab_Zip_1_52j_Test.xsproj b/FabTools/Fab_Zip_1_52j_Test/Fab_Zip_1_52j_Test.xsproj
index c16e868..132dcd5 100644
--- a/FabTools/Fab_Zip_1_52j_Test/Fab_Zip_1_52j_Test.xsproj
+++ b/FabTools/Fab_Zip_1_52j_Test/Fab_Zip_1_52j_Test.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>Vulcan</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -279,7 +279,7 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent />
     <PostBuildEvent>xcopy $(ProjectDir)bin\$(Configuration) $(SolutionDir)bin\$(Configuration) /y /s /i</PostBuildEvent>
diff --git a/FabTools/NewZipApp/NewZipApp.xsproj b/FabTools/NewZipApp/NewZipApp.xsproj
index 4832da4..41bc54c 100644
--- a/FabTools/NewZipApp/NewZipApp.xsproj
+++ b/FabTools/NewZipApp/NewZipApp.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>Vulcan</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -159,7 +159,7 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent>
     </PreBuildEvent>
diff --git a/FabTools/XSPaintLib_Test/XSPaintLib_Test.xsproj b/FabTools/XSPaintLib_Test/XSPaintLib_Test.xsproj
index 6ec8f25..c880e95 100644
--- a/FabTools/XSPaintLib_Test/XSPaintLib_Test.xsproj
+++ b/FabTools/XSPaintLib_Test/XSPaintLib_Test.xsproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.Default.props" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.Default.props" />
   <PropertyGroup>
     <Dialect>Vulcan</Dialect>
     <PlatformTarget>x86</PlatformTarget>
@@ -154,7 +154,7 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\XSharp\XSharp.targets" />
+  <Import Project="$(XSharpMsBuildDir)\XSharp.targets" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PreBuildEvent>
     </PreBuildEvent>