diff --git a/build/Targets/Signing.props b/build/Targets/Signing.props
index 230a5ceec30f2037536e09e16296ef661e95bc31..1cf14a7c8816f2ad3fc06d2a768ae935ecf0fe7a 100644
--- a/build/Targets/Signing.props
+++ b/build/Targets/Signing.props
@@ -11,17 +11,18 @@
-->
-
-
-
-
+
+
+
+
+
+ net45;netstandard2.0
diff --git a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj
index 42ee0f28a1ca45d06f789836292cf593e0c18491..b9410a9df7a47873e966ae58ea50b667219fad6e 100644
--- a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj
+++ b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj
@@ -36,6 +36,7 @@
BuiltProjectOutputGroup%3bVsdConfigOutputGroup
DebugSymbolsProjectOutputGroup
true
+ TargetFramework=netstandard2.0
ResultProvider.Portable
diff --git a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
index c494fbd12ef93e8358e67ea03eae1cb8c6bd86ad..b7b447256839b0f93d00d69bbddae82b111e477f 100644
--- a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
+++ b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
@@ -96,20 +96,21 @@
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.ResultProvider\Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll" TargetDir="" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.ResultProvider\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll" TargetDir="" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.ResultProvider\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll" TargetDir="" />
- <_File Include="$(_Dlls)Microsoft.CodeAnalysis.FunctionResolver\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.dll" TargetDir="" />
+ <_File Include="$(_Dlls)Microsoft.CodeAnalysis.FunctionResolver\netstandard2.0\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.dll" TargetDir="" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.dll" TargetDir="" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.ExpressionCompiler\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll" TargetDir="" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.ExpressionCompiler\Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll" TargetDir="" />
- <_File Include="$(_Dlls)BasicResultProvider.NetFX20\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll" TargetDir="Dlls\BasicResultProvider.NetFX20" />
- <_File Include="$(_Dlls)CSharpResultProvider.NetFX20\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll" TargetDir="Dlls\CSharpResultProvider.NetFX20" />
- <_File Include="$(_Dlls)ResultProvider.NetFX20\Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll" TargetDir="Dlls\ResultProvider.NetFX20" />
+ <_File Include="$(_Dlls)BasicResultProvider.NetFX20\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll" TargetDir="RemoteDebugger" />
+ <_File Include="$(_Dlls)CSharpResultProvider.NetFX20\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll" TargetDir="RemoteDebugger" />
+ <_File Include="$(_Dlls)ResultProvider.NetFX20\Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll" TargetDir="RemoteDebugger" />
+ <_File Include="$(_Dlls)Microsoft.CodeAnalysis.FunctionResolver\net45\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.dll" TargetDir="RemoteDebugger" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.ResultProvider\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.ExpressionCompiler\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.ResultProvider\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" />
<_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices\Microsoft.VisualStudio.LanguageServices.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" />
- <_File Include="$(_Dlls)Microsoft.CodeAnalysis.FunctionResolver\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" />
+ <_File Include="$(_Dlls)Microsoft.CodeAnalysis.FunctionResolver\netstandard2.0\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" />
<_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" />