diff --git a/build/Defaults/Portable/app.config b/build/Defaults/Portable/app.config
index 05f3697860b6387987f509bd58a29727c240ac40..ccc5bf4a6675ef3c903b8b56625e93e7509f4427 100644
--- a/build/Defaults/Portable/app.config
+++ b/build/Defaults/Portable/app.config
@@ -21,6 +21,10 @@
+
+
+
+
diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets
index 48177d49b6a350cd923db4d3e7fd38e66c7a6f51..60d9acaca9b4870f5ba08bc39f76685a766cdb3e 100644
--- a/build/Targets/Imports.targets
+++ b/build/Targets/Imports.targets
@@ -21,10 +21,22 @@
+
- <_CopyReferences>false
- <_CopyProjectReferences>false
+ <_CopyReferences>$(DeveloperBuild>
+ <_CopyProjectReferences>$(DeveloperBuild>
<_IsAnyUnitTest>true
+ <_IsAnyPortableUnitTest>true
false
$(OutDir)Dlls\$(MSBuildProjectName)\
@@ -347,6 +359,7 @@
==================================================================================== -->
+ DeployPortableOnDeveloperBuild;$(PrepareResourcesDependsOn)
$(IntermediateOutputPath)$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)
$(IntermediateOutputPath)$(TargetFileName).pcbm
$(NuGetPackageRoot)\RoslynDependencies.OptimizationData\2.0.0-rc-61101-16\content\OptimizationData
@@ -417,6 +430,27 @@
+
+
+
+
+
+
+
+
diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props
index 99d1811d1cce7ab3d9966054b33f8ae3c3b8a6fc..2cde3795c28a0028384ef3c6bdb8c0a814f9f4f2 100644
--- a/build/Targets/Settings.props
+++ b/build/Targets/Settings.props
@@ -3,6 +3,11 @@
+ false
+ true
+ false
+ true
+
$(MSBuildThisFileDirectory)..\..\
$(ProjectDir)nuget.exe
$(ProjectDir)build\ToolsetPackages\
diff --git a/src/Test/Utilities/Portable/TestUtilities.csproj b/src/Test/Utilities/Portable/TestUtilities.csproj
index 6fa7c602496c9b4c97fa3a7c134e292a259dcdac..0a76b2d90786a048ad032db7ffab89e83ee811ed 100644
--- a/src/Test/Utilities/Portable/TestUtilities.csproj
+++ b/src/Test/Utilities/Portable/TestUtilities.csproj
@@ -45,16 +45,20 @@
ARM
-
+
+
-
+
+
-
+
+
-
+
+
@@ -114,6 +118,7 @@
True
TestResource.resx
+
@@ -124,4 +129,4 @@
-
+
\ No newline at end of file
diff --git a/src/Test/Utilities/Portable/ThrowingTraceListener.cs b/src/Test/Utilities/Portable/ThrowingTraceListener.cs
index 3ff8fbfd0548c1f820adf2c34125c46d07267c8a..070ddb802717752f9af37a86105cd7b1f0691daf 100644
--- a/src/Test/Utilities/Portable/ThrowingTraceListener.cs
+++ b/src/Test/Utilities/Portable/ThrowingTraceListener.cs
@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis
//
//
//
- //
+ //
//
//
//