diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Graphics/Bitmap.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Graphics/Bitmap.csproj
index 776c6603e..cf06928af 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Graphics/Bitmap.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Graphics/Bitmap.csproj
@@ -1,4 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Bitmap</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/EmulateHardware/EmulateHardware.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/EmulateHardware/EmulateHardware.csproj
index 3e4d1340f..debef5f74 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/EmulateHardware/EmulateHardware.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/EmulateHardware/EmulateHardware.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>EmulateHardware</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/I2C/I2C.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/I2C/I2C.csproj
index fe55019fe..30dbe714a 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/I2C/I2C.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/I2C/I2C.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>I2C</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/LargeBuffer/LargeBuffer.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/LargeBuffer/LargeBuffer.csproj
index a45b96f91..e97171f47 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/LargeBuffer/LargeBuffer.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/LargeBuffer/LargeBuffer.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>LargeBuffer</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/UsbClient/UsbClient.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/UsbClient/UsbClient.csproj
index b97994a79..409c86302 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/UsbClient/UsbClient.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Hardware/UsbClient/UsbClient.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>UsbClient</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Interop/Interop.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Interop/Interop.csproj
index e888016a9..9d8ffb8b9 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Interop/Interop.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Interop/Interop.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Interop</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Net.Security/ClientServer/Device.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Net.Security/ClientServer/Device.csproj
index 2a0cfee41..87d525c6f 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Net.Security/ClientServer/Device.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Net.Security/ClientServer/Device.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Test.SslClient</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Net.Security/SslStream/SslStreamTests.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Net.Security/SslStream/SslStreamTests.csproj
index 01ebc242b..50f4e468d 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Net.Security/SslStream/SslStreamTests.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Net.Security/SslStream/SslStreamTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.SslStream</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Net/WiFiTests/WiFiTests1/WiFiTests1.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Net/WiFiTests/WiFiTests1/WiFiTests1.csproj
index 5983123e0..c859c871f 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Net/WiFiTests/WiFiTests1/WiFiTests1.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Net/WiFiTests/WiFiTests1/WiFiTests1.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>WiFiTests1</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Net/netInfoTests/netInfoTests.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Net/netInfoTests/netInfoTests.csproj
index 820c98858..1ae71df6b 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Net/netInfoTests/netInfoTests.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Net/netInfoTests/netInfoTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>NetInfoTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.Time/TimeServiceTests/TimeServiceTests.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.Time/TimeServiceTests/TimeServiceTests.csproj
index 24852e31c..f28d2841a 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.Time/TimeServiceTests/TimeServiceTests.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.Time/TimeServiceTests/TimeServiceTests.csproj
@@ -1,4 +1,11 @@
-<Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.TimeServiceTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Controls/Controls.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Controls/Controls.csproj
index 51f763560..523dfd2a6 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Controls/Controls.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Controls/Controls.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Controls</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Media/Media.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Media/Media.csproj
index fdfdf5ffe..92e7b9a95 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Media/Media.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Media/Media.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Media</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Presentation/Presentation.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Presentation/Presentation.csproj
index cafb1abee..cefc0379f 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Presentation/Presentation.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Presentation/Presentation.csproj
@@ -1,4 +1,11 @@
-<Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Presentaion</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Shapes/Shapes.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Shapes/Shapes.csproj
index 8f4b2d273..627b75363 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Shapes/Shapes.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Shapes/Shapes.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Shapes</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/Microsoft.SPOT/ExtendedWeakReferenceTests/ExtendedWeakReferenceTests.csproj b/Test/Platform/Tests/CLR/Microsoft.SPOT/ExtendedWeakReferenceTests/ExtendedWeakReferenceTests.csproj
index f02adceb9..2c797b755 100644
--- a/Test/Platform/Tests/CLR/Microsoft.SPOT/ExtendedWeakReferenceTests/ExtendedWeakReferenceTests.csproj
+++ b/Test/Platform/Tests/CLR/Microsoft.SPOT/ExtendedWeakReferenceTests/ExtendedWeakReferenceTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.ExtendedWeakReferenceTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/Http/HttpTests.csproj b/Test/Platform/Tests/CLR/System/Http/HttpTests.csproj
index a8f1abe8f..093148667 100644
--- a/Test/Platform/Tests/CLR/System/Http/HttpTests.csproj
+++ b/Test/Platform/Tests/CLR/System/Http/HttpTests.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.HttpTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/IO/Directory/DirectoryTests.csproj b/Test/Platform/Tests/CLR/System/IO/Directory/DirectoryTests.csproj
index 68ff18823..e63c2d790 100644
--- a/Test/Platform/Tests/CLR/System/IO/Directory/DirectoryTests.csproj
+++ b/Test/Platform/Tests/CLR/System/IO/Directory/DirectoryTests.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.IO.DirectoryTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/IO/File/FileTests.csproj b/Test/Platform/Tests/CLR/System/IO/File/FileTests.csproj
index 3bb77cb1c..476a638a2 100644
--- a/Test/Platform/Tests/CLR/System/IO/File/FileTests.csproj
+++ b/Test/Platform/Tests/CLR/System/IO/File/FileTests.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.IO.FileTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/IO/FileStream/FileStreamTests.csproj b/Test/Platform/Tests/CLR/System/IO/FileStream/FileStreamTests.csproj
index 789ee5337..cc5009da7 100644
--- a/Test/Platform/Tests/CLR/System/IO/FileStream/FileStreamTests.csproj
+++ b/Test/Platform/Tests/CLR/System/IO/FileStream/FileStreamTests.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.IO.FileStreamTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/IO/IOTests.csproj b/Test/Platform/Tests/CLR/System/IO/IOTests.csproj
index a4126a036..7d7f07352 100644
--- a/Test/Platform/Tests/CLR/System/IO/IOTests.csproj
+++ b/Test/Platform/Tests/CLR/System/IO/IOTests.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.IOTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/IO/IOTestsHelper/IOTestsHelper.csproj b/Test/Platform/Tests/CLR/System/IO/IOTestsHelper/IOTestsHelper.csproj
index 631699980..c7b0943bc 100644
--- a/Test/Platform/Tests/CLR/System/IO/IOTestsHelper/IOTestsHelper.csproj
+++ b/Test/Platform/Tests/CLR/System/IO/IOTestsHelper/IOTestsHelper.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.IOTestsHelper</AssemblyName>
     <OutputType>Library</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/IO/MemoryStream/MemoryStreamTests.csproj b/Test/Platform/Tests/CLR/System/IO/MemoryStream/MemoryStreamTests.csproj
index 194f08abe..82ef86b0f 100644
--- a/Test/Platform/Tests/CLR/System/IO/MemoryStream/MemoryStreamTests.csproj
+++ b/Test/Platform/Tests/CLR/System/IO/MemoryStream/MemoryStreamTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.IO.MemoryStreamTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/IO/Path/PathTests.csproj b/Test/Platform/Tests/CLR/System/IO/Path/PathTests.csproj
index ca482b699..491490c8a 100644
--- a/Test/Platform/Tests/CLR/System/IO/Path/PathTests.csproj
+++ b/Test/Platform/Tests/CLR/System/IO/Path/PathTests.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.IO.PathTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/Text/Regexp/RegEx.csproj b/Test/Platform/Tests/CLR/System/Text/Regexp/RegEx.csproj
index 96e02d7f6..3fa196ec0 100644
--- a/Test/Platform/Tests/CLR/System/Text/Regexp/RegEx.csproj
+++ b/Test/Platform/Tests/CLR/System/Text/Regexp/RegEx.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.RegExTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/Text/StringBuilder/StringBuilder.csproj b/Test/Platform/Tests/CLR/System/Text/StringBuilder/StringBuilder.csproj
index 427347709..ec77802ef 100644
--- a/Test/Platform/Tests/CLR/System/Text/StringBuilder/StringBuilder.csproj
+++ b/Test/Platform/Tests/CLR/System/Text/StringBuilder/StringBuilder.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.StringBuilderTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/System/xmlTests/xmlTests.csproj b/Test/Platform/Tests/CLR/System/xmlTests/xmlTests.csproj
index a5aad6dce..914300427 100644
--- a/Test/Platform/Tests/CLR/System/xmlTests/xmlTests.csproj
+++ b/Test/Platform/Tests/CLR/System/xmlTests/xmlTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Xml</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/arrays/arrays.csproj b/Test/Platform/Tests/CLR/mscorlib/arrays/arrays.csproj
index 6f87684e9..4e2d8a0b3 100644
--- a/Test/Platform/Tests/CLR/mscorlib/arrays/arrays.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/arrays/arrays.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Arrays</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/attributes/attributes.csproj b/Test/Platform/Tests/CLR/mscorlib/attributes/attributes.csproj
index 553c2a633..c8630c805 100644
--- a/Test/Platform/Tests/CLR/mscorlib/attributes/attributes.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/attributes/attributes.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Attributes</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/basicconcepts/basicconcepts.csproj b/Test/Platform/Tests/CLR/mscorlib/basicconcepts/basicconcepts.csproj
index 03a792351..fc04cb47f 100644
--- a/Test/Platform/Tests/CLR/mscorlib/basicconcepts/basicconcepts.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/basicconcepts/basicconcepts.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.BasicConcepts</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/bitconverter/bitconverter.csproj b/Test/Platform/Tests/CLR/mscorlib/bitconverter/bitconverter.csproj
index 0d9fad20a..0e4c119c7 100644
--- a/Test/Platform/Tests/CLR/mscorlib/bitconverter/bitconverter.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/bitconverter/bitconverter.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.BitConverter</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/classes/classes1/classes1.csproj b/Test/Platform/Tests/CLR/mscorlib/classes/classes1/classes1.csproj
index d5d0e3698..1a8eff6a5 100644
--- a/Test/Platform/Tests/CLR/mscorlib/classes/classes1/classes1.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/classes/classes1/classes1.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Classes</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/classes/classes2/classes2.csproj b/Test/Platform/Tests/CLR/mscorlib/classes/classes2/classes2.csproj
index d8d9710ad..313bbfb20 100644
--- a/Test/Platform/Tests/CLR/mscorlib/classes/classes2/classes2.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/classes/classes2/classes2.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Classes</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/classes/classes3/classes3.csproj b/Test/Platform/Tests/CLR/mscorlib/classes/classes3/classes3.csproj
index a7be438c7..f4a89a3de 100644
--- a/Test/Platform/Tests/CLR/mscorlib/classes/classes3/classes3.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/classes/classes3/classes3.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Classes</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/collections/collections.csproj b/Test/Platform/Tests/CLR/mscorlib/collections/collections.csproj
index 464a61f23..2ce9a9632 100644
--- a/Test/Platform/Tests/CLR/mscorlib/collections/collections.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/collections/collections.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Collections</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/conversions/conversions.csproj b/Test/Platform/Tests/CLR/mscorlib/conversions/conversions.csproj
index f79269c27..4a7aefaec 100644
--- a/Test/Platform/Tests/CLR/mscorlib/conversions/conversions.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/conversions/conversions.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Conversions</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/delegates/delegates.csproj b/Test/Platform/Tests/CLR/mscorlib/delegates/delegates.csproj
index 01ce41b77..850392f2b 100644
--- a/Test/Platform/Tests/CLR/mscorlib/delegates/delegates.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/delegates/delegates.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Delegates</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/enums/enums.csproj b/Test/Platform/Tests/CLR/mscorlib/enums/enums.csproj
index 9ba3da970..2e5079b20 100644
--- a/Test/Platform/Tests/CLR/mscorlib/enums/enums.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/enums/enums.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Enums</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/exceptions/CSharp/exceptions.csproj b/Test/Platform/Tests/CLR/mscorlib/exceptions/CSharp/exceptions.csproj
index f2587c3fd..50ac5446a 100644
--- a/Test/Platform/Tests/CLR/mscorlib/exceptions/CSharp/exceptions.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/exceptions/CSharp/exceptions.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Exceptions</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/exceptions/VB/exceptions_VB.vbproj b/Test/Platform/Tests/CLR/mscorlib/exceptions/VB/exceptions_VB.vbproj
index 917be003f..f19122295 100644
--- a/Test/Platform/Tests/CLR/mscorlib/exceptions/VB/exceptions_VB.vbproj
+++ b/Test/Platform/Tests/CLR/mscorlib/exceptions/VB/exceptions_VB.vbproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
diff --git a/Test/Platform/Tests/CLR/mscorlib/expressions/expressions1/expressions1.csproj b/Test/Platform/Tests/CLR/mscorlib/expressions/expressions1/expressions1.csproj
index 6b2342195..ba82615c2 100644
--- a/Test/Platform/Tests/CLR/mscorlib/expressions/expressions1/expressions1.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/expressions/expressions1/expressions1.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Expressions</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/expressions/expressions2/expressions2.csproj b/Test/Platform/Tests/CLR/mscorlib/expressions/expressions2/expressions2.csproj
index 5a3952d3b..27247f52f 100644
--- a/Test/Platform/Tests/CLR/mscorlib/expressions/expressions2/expressions2.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/expressions/expressions2/expressions2.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Expressions</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/interfaces/interfaces.csproj b/Test/Platform/Tests/CLR/mscorlib/interfaces/interfaces.csproj
index 2dad9242f..2949ef592 100644
--- a/Test/Platform/Tests/CLR/mscorlib/interfaces/interfaces.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/interfaces/interfaces.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Interfaces</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/lexical/lexical.csproj b/Test/Platform/Tests/CLR/mscorlib/lexical/lexical.csproj
index f019885da..b2ae8080c 100644
--- a/Test/Platform/Tests/CLR/mscorlib/lexical/lexical.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/lexical/lexical.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Lexical</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/namespaces/namespaces.csproj b/Test/Platform/Tests/CLR/mscorlib/namespaces/namespaces.csproj
index e737aa9d2..c0035d7db 100644
--- a/Test/Platform/Tests/CLR/mscorlib/namespaces/namespaces.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/namespaces/namespaces.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Namespaces</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/statements/statements.csproj b/Test/Platform/Tests/CLR/mscorlib/statements/statements.csproj
index 51f7b91ff..3e398503f 100644
--- a/Test/Platform/Tests/CLR/mscorlib/statements/statements.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/statements/statements.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Statements</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/structs/structs.csproj b/Test/Platform/Tests/CLR/mscorlib/structs/structs.csproj
index e4097be19..db29fd82f 100644
--- a/Test/Platform/Tests/CLR/mscorlib/structs/structs.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/structs/structs.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Structs</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib.csproj b/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib.csproj
index 57b2d1801..7089ff8c0 100644
--- a/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Systemlib</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib1/systemlib1.csproj b/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib1/systemlib1.csproj
index 5000dd3d4..f56b075a0 100644
--- a/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib1/systemlib1.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib1/systemlib1.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Systemlib1</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib2/systemlib2.csproj b/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib2/systemlib2.csproj
index d8c6e8415..51c116034 100644
--- a/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib2/systemlib2.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/systemlib/systemlib2/systemlib2.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Systemlib2</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/threads/threads1/threads1.csproj b/Test/Platform/Tests/CLR/mscorlib/threads/threads1/threads1.csproj
index bcb3164ad..ed08da6f9 100644
--- a/Test/Platform/Tests/CLR/mscorlib/threads/threads1/threads1.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/threads/threads1/threads1.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Threads1</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/threads/threads2/threads2.csproj b/Test/Platform/Tests/CLR/mscorlib/threads/threads2/threads2.csproj
index a3b2a4017..83126134c 100644
--- a/Test/Platform/Tests/CLR/mscorlib/threads/threads2/threads2.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/threads/threads2/threads2.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Threads2</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/threads/threads3/threads3.csproj b/Test/Platform/Tests/CLR/mscorlib/threads/threads3/threads3.csproj
index 5da5ea5ad..bd8997e31 100644
--- a/Test/Platform/Tests/CLR/mscorlib/threads/threads3/threads3.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/threads/threads3/threads3.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Threads3</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/types/types.csproj b/Test/Platform/Tests/CLR/mscorlib/types/types.csproj
index d40a9e5b8..26f7b904d 100644
--- a/Test/Platform/Tests/CLR/mscorlib/types/types.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/types/types.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Types</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/CLR/mscorlib/variables/variables.csproj b/Test/Platform/Tests/CLR/mscorlib/variables/variables.csproj
index 24ac5a77b..4094b1e9c 100644
--- a/Test/Platform/Tests/CLR/mscorlib/variables/variables.csproj
+++ b/Test/Platform/Tests/CLR/mscorlib/variables/variables.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Variables</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Native_MathMethods/Math/Math/MathTests.csproj b/Test/Platform/Tests/Native_MathMethods/Math/Math/MathTests.csproj
index 5fe9968ca..9a259a0b5 100644
--- a/Test/Platform/Tests/Native_MathMethods/Math/Math/MathTests.csproj
+++ b/Test/Platform/Tests/Native_MathMethods/Math/Math/MathTests.csproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>System.Math.Tests.MathTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/ProfilerTests/ProfilerCollectionsTests/ProfilerCollectionsTests.csproj b/Test/Platform/Tests/Performance/ProfilerTests/ProfilerCollectionsTests/ProfilerCollectionsTests.csproj
index eec2ce95d..92328a782 100644
--- a/Test/Platform/Tests/Performance/ProfilerTests/ProfilerCollectionsTests/ProfilerCollectionsTests.csproj
+++ b/Test/Platform/Tests/Performance/ProfilerTests/ProfilerCollectionsTests/ProfilerCollectionsTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>ProfilerCollectionsTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/ProfilerTests/ProfilerStringTests/ProfilerStringTests.csproj b/Test/Platform/Tests/Performance/ProfilerTests/ProfilerStringTests/ProfilerStringTests.csproj
index 6b44f0cff..afde25abb 100644
--- a/Test/Platform/Tests/Performance/ProfilerTests/ProfilerStringTests/ProfilerStringTests.csproj
+++ b/Test/Platform/Tests/Performance/ProfilerTests/ProfilerStringTests/ProfilerStringTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>ProfilerStringTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/ProfilerTests/ProfilerThreadTests/ProfilerThreadTests.csproj b/Test/Platform/Tests/Performance/ProfilerTests/ProfilerThreadTests/ProfilerThreadTests.csproj
index 4ed76f0f5..33bdb1bf0 100644
--- a/Test/Platform/Tests/Performance/ProfilerTests/ProfilerThreadTests/ProfilerThreadTests.csproj
+++ b/Test/Platform/Tests/Performance/ProfilerTests/ProfilerThreadTests/ProfilerThreadTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>ProfilerThreadTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/ProfilerTests/ProfilerXmlTests/ProfilerXmlTests.csproj b/Test/Platform/Tests/Performance/ProfilerTests/ProfilerXmlTests/ProfilerXmlTests.csproj
index 0d8d95c26..b0e6a3b79 100644
--- a/Test/Platform/Tests/Performance/ProfilerTests/ProfilerXmlTests/ProfilerXmlTests.csproj
+++ b/Test/Platform/Tests/Performance/ProfilerTests/ProfilerXmlTests/ProfilerXmlTests.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>ProfilerXmlTests</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/Sockets/Sockets.csproj b/Test/Platform/Tests/Performance/Sockets/Sockets.csproj
index 58882d262..71c87b9df 100644
--- a/Test/Platform/Tests/Performance/Sockets/Sockets.csproj
+++ b/Test/Platform/Tests/Performance/Sockets/Sockets.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Performance.Sockets</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/Stress/Sockets/Loopback/Loopback.csproj b/Test/Platform/Tests/Performance/Stress/Sockets/Loopback/Loopback.csproj
index d63112131..b8da223b9 100644
--- a/Test/Platform/Tests/Performance/Stress/Sockets/Loopback/Loopback.csproj
+++ b/Test/Platform/Tests/Performance/Stress/Sockets/Loopback/Loopback.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Loopback</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/Stress/Sockets/MultiThreadStress/MultiThreadStress.csproj b/Test/Platform/Tests/Performance/Stress/Sockets/MultiThreadStress/MultiThreadStress.csproj
index faa535bcd..52f483219 100644
--- a/Test/Platform/Tests/Performance/Stress/Sockets/MultiThreadStress/MultiThreadStress.csproj
+++ b/Test/Platform/Tests/Performance/Stress/Sockets/MultiThreadStress/MultiThreadStress.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>MultiThreadStress</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/Stress/Sockets/NormalMode/SocketClient/SocketClientTest.csproj b/Test/Platform/Tests/Performance/Stress/Sockets/NormalMode/SocketClient/SocketClientTest.csproj
index 69235575c..01d87a730 100644
--- a/Test/Platform/Tests/Performance/Stress/Sockets/NormalMode/SocketClient/SocketClientTest.csproj
+++ b/Test/Platform/Tests/Performance/Stress/Sockets/NormalMode/SocketClient/SocketClientTest.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
diff --git a/Test/Platform/Tests/Performance/Stress/Sockets/NormalMode/SocketServer/SocketServerTest.csproj b/Test/Platform/Tests/Performance/Stress/Sockets/NormalMode/SocketServer/SocketServerTest.csproj
index 437409ea7..a825aee90 100644
--- a/Test/Platform/Tests/Performance/Stress/Sockets/NormalMode/SocketServer/SocketServerTest.csproj
+++ b/Test/Platform/Tests/Performance/Stress/Sockets/NormalMode/SocketServer/SocketServerTest.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>SocketServerTest</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/Test/Platform/Tests/Performance/Strings/Strings.csproj b/Test/Platform/Tests/Performance/Strings/Strings.csproj
index 68dd70f2b..3913ceef0 100644
--- a/Test/Platform/Tests/Performance/Strings/Strings.csproj
+++ b/Test/Platform/Tests/Performance/Strings/Strings.csproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="TinyCLR_Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), BuildEnv.props))\BuildEnv.props')" />
+  <PropertyGroup>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.SPOT.Platform.Tests.Performance.Strings</AssemblyName>
     <OutputType>Exe</OutputType>