diff --git a/Directory.Build.props b/Directory.Build.props
index 251b82b..1e2b9d1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,9 +4,9 @@
 		<BasePath>$(MSBuildThisFileDirectory)</BasePath>
 		<BaseIntermediateOutputPath>$(BasePath)artifacts\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
 		<!-- RestoreProjectStyle will be supported in VS for Mac 7.4 -->
-		<!--RestoreProjectStyle Condition="'$(RestoreProjectStyle)' == '' AND $(UsePackagesConfig) != 'True'">PackageReference</RestoreProjectStyle-->
-	    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    	<Deterministic>False</Deterministic>
+		<RestoreProjectStyle Condition="'$(RestoreProjectStyle)' == '' AND $(UsePackagesConfig) != 'True'">PackageReference</RestoreProjectStyle>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<Deterministic>False</Deterministic>
 	</PropertyGroup>
 	<Import Condition="Exists('$(MSBuildThisFileDirectory)..\Portable.Xaml.Common.props')" Project="$(MSBuildThisFileDirectory)..\Portable.Xaml.Common.props" />
 </Project>
\ No newline at end of file
diff --git a/NuGet.Config b/NuGet.Config
index 74ded01..c971e75 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,5 +1,5 @@
 <configuration>
 	<config>
-		<add key="repositoryPath" value="artifacts/packages" />
+		<add key="repositoryPath" value="artifacts\packages" />
 	</config>
 </configuration>
diff --git a/src/Portable.Xaml/Portable.Xaml-pcl259.csproj b/src/Portable.Xaml/Portable.Xaml-pcl259.csproj
index ca24b9d..7b59ee7 100644
--- a/src/Portable.Xaml/Portable.Xaml-pcl259.csproj
+++ b/src/Portable.Xaml/Portable.Xaml-pcl259.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,6 +10,7 @@
     <AssemblyName>Portable.Xaml</AssemblyName>
     <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,7 +32,6 @@
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <ItemGroup>
     <Compile Include="Helpers\MemberExpressionExtensions.cs" />
     <Compile Include="Helpers\ReflectionHelpers.cs" />
@@ -181,4 +181,5 @@
   <ItemGroup>
     <EmbeddedResource Include="Compat.snk" />
   </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Test/Portable.Xaml-tests-net_4_5.csproj b/src/Test/Portable.Xaml-tests-net_4_5.csproj
index 8c9c29e..388c2af 100644
--- a/src/Test/Portable.Xaml-tests-net_4_5.csproj
+++ b/src/Test/Portable.Xaml-tests-net_4_5.csproj
@@ -90,17 +90,18 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xaml" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\artifacts\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Collections.Immutable">
-      <HintPath>..\..\artifacts\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="XmlFiles\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.9.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>1.4.0</Version>
+    </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Test/Portable.Xaml-tests-netstandard1.3.csproj b/src/Test/Portable.Xaml-tests-netstandard1.3.csproj
index 4c52d07..0796835 100644
--- a/src/Test/Portable.Xaml-tests-netstandard1.3.csproj
+++ b/src/Test/Portable.Xaml-tests-netstandard1.3.csproj
@@ -89,18 +89,11 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="mscorlib" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\artifacts\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Collections.Immutable">
-      <HintPath>..\..\artifacts\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="XmlFiles\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Portable.Xaml\Portable.Xaml-netstandard1.3.csproj">
@@ -108,4 +101,12 @@
       <Name>Portable.Xaml-netstandard1.3</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.9.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>1.4.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Test/Portable.Xaml-tests-pcl259.csproj b/src/Test/Portable.Xaml-tests-pcl259.csproj
index 897f46c..6505bb0 100644
--- a/src/Test/Portable.Xaml-tests-pcl259.csproj
+++ b/src/Test/Portable.Xaml-tests-pcl259.csproj
@@ -82,18 +82,11 @@
     <Reference Include="System.Xml" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\artifacts\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Collections.Immutable">
-      <HintPath>..\..\artifacts\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="XmlFiles\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Portable.Xaml\Portable.Xaml-pcl259.csproj">
@@ -101,4 +94,12 @@
       <Name>Portable.Xaml-pcl259</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.9.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>1.4.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Test/packages.config b/src/Test/packages.config
deleted file mode 100644
index 54494f4..0000000
--- a/src/Test/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.9.0" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
-</packages>
\ No newline at end of file