Make the portable ResultProvider DLLs portable

Prior to this commit, they were identical to the corresponding desktop
(i.e. NetFx20) assemblies but now all the pieces are in place to compile
them as portable assemblies.

Cleverness: Move resources into the portable projects and link them into
the corresponding desktop projects.  The desktop projects can compile
portable designer files, but not vice versa.

src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj

@@ -31,7 +31,7 @@
     <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\SymbolDisplay\ObjectDisplay.cs">
       <Link>Compiler\SymbolDisplay\ObjectDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\Resources.Designer.cs">
+    <Compile Include="..\Portable\Resources.Designer.cs">
       <Link>Resources.Designer.cs</Link>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -56,7 +56,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Resources.resx">
+    <EmbeddedResource Include="..\Portable\Resources.resx">
       <Link>Resources.resx</Link>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TargetNetFX20>true</TargetNetFX20>
-  </PropertyGroup>
   <ImportGroup Label="Settings">
     <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
     <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
@@ -16,7 +13,9 @@
     <RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
     <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
   <ItemGroup Label="Linked Files">
     <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Parser\CharacterInfo.cs">
@@ -31,8 +30,7 @@
     <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\SymbolDisplay\ObjectDisplay.cs">
       <Link>Compiler\SymbolDisplay\ObjectDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\Resources.Designer.cs">
-      <Link>Resources.Designer.cs</Link>
+    <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
@@ -44,7 +42,7 @@
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-  <ItemGroup>
+  <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\..\Core\Source\Concord\Concord.csproj">
       <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
       <Name>Concord</Name>
@@ -56,16 +54,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Resources.resx">
-      <Link>Resources.resx</Link>
+    <EmbeddedResource Include="Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <CustomToolNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</CustomToolNamespace>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="..\CSharpResultProvider.projitems" Label="Shared" />
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />

src/ExpressionEvaluator/CSharp/Source/ResultProvider/Resources.Designer.cs → src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/Resources.Designer.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.35312
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -10,6 +10,7 @@
 
 namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator {
     using System;
+    using System.Reflection;
     
     
     /// <summary>
@@ -39,7 +40,7 @@ internal class Resources {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.Resources", typeof(Resources).GetTypeInfo().Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/ExpressionEvaluator/CSharp/Source/ResultProvider/Resources.resx → src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/Resources.resx

@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="StaticMembers" xml:space="preserve">
     <value>Static members</value>

src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/packages.config

-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
-</packages>
\ No newline at end of file

src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj

@@ -86,7 +86,7 @@
     <Compile Include="..\..\..\..\Compilers\CSharp\Portable\SymbolDisplay\ObjectDisplay.cs">
       <Link>Compiler\SymbolDisplay\ObjectDisplay.cs</Link>
     </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Resources.Designer.cs">
+    <Compile Include="..\..\Source\ResultProvider\Portable\Resources.Designer.cs">
       <Link>Resources.Designer.cs</Link>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -111,7 +111,7 @@
     <Compile Include="ValueFormattingTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Source\ResultProvider\Resources.resx">
+    <EmbeddedResource Include="..\..\Source\ResultProvider\Portable\Resources.resx">
       <Link>Resources.resx</Link>
       <CustomToolNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</CustomToolNamespace>
       <Generator>ResXFileCodeGenerator</Generator>

src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TargetNetFX20>true</TargetNetFX20>
-  </PropertyGroup>
   <ImportGroup Label="Settings">
     <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
     <Import Project="..\..\..\..\..\build\VSL.Settings.Closed.targets" />
@@ -16,21 +13,17 @@
     <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
     <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.Concord.DoNotUse</AssemblyName>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <ConcordDir>$(MSBuildThisFileDirectory)</ConcordDir>
-	  <NonShipping>true</NonShipping>
+    <NonShipping>true</NonShipping>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <None Include="$(ConcordDir)Microsoft.VisualStudio.Debugger.Engine.xml">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <Visible>false</Visible>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ConcordAssemblies Include="Microsoft.VisualStudio.Debugger.Metadata">
       <Visible>false</Visible>
@@ -63,4 +56,4 @@
     <Import Project="..\..\..\..\..\build\VSL.Imports.Closed.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/ExpressionEvaluator/Core/Source/Concord/packages.config

-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />
-</packages>
\ No newline at end of file

src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionEvaluatorFatalError.cs

@@ -24,22 +24,25 @@ static ExpressionEvaluatorFatalError()
             {
                 // Microsoft.Win32.Registry is not supported on OneCore/CoreSystem,
                 // so we have to check to see if it's there at runtime.
-                var registry = typeof(object).Assembly.GetType("Microsoft.Win32.Registry");
-                if (registry != null)
+                var registryType = typeof(object).GetTypeInfo().Assembly.GetType("Microsoft.Win32.Registry");
+                if (registryType != null)
                 {
-                    var hKeyCurrentUserField = registry.GetField("CurrentUser", BindingFlags.Static | BindingFlags.Public);
-                    using (var currentUserKey = (IDisposable)hKeyCurrentUserField.GetValue(null))
+                    var hKeyCurrentUserField = registryType.GetTypeInfo().GetField("CurrentUser");
+                    if (hKeyCurrentUserField != null && hKeyCurrentUserField.IsStatic)
                     {
-                        var openSubKeyMethod = currentUserKey.GetType().GetMethod("OpenSubKey", new Type[] { typeof(string), typeof(bool) });
-                        using (var eeKey = (IDisposable)openSubKeyMethod.Invoke(currentUserKey, new object[] { RegistryKey, /*writable*/ false }))
+                        using (var currentUserKey = (IDisposable)hKeyCurrentUserField.GetValue(null))
                         {
-                            if (eeKey != null)
+                            var openSubKeyMethod = currentUserKey.GetType().GetTypeInfo().GetMethod("OpenSubKey", new Type[] { typeof(string), typeof(bool) });
+                            using (var eeKey = (IDisposable)openSubKeyMethod.Invoke(currentUserKey, new object[] { RegistryKey, /*writable*/ false }))
                             {
-                                var getValueMethod = eeKey.GetType().GetMethod("GetValue", new Type[] { typeof(string) });
-                                var value = getValueMethod.Invoke(eeKey, new object[] { RegistryValue });
-                                if ((value != null) && (value is int))
+                                if (eeKey != null)
                                 {
-                                    s_isFailFastEnabled = ((int)value == 1);
+                                    var getValueMethod = eeKey.GetType().GetTypeInfo().GetMethod("GetValue", new Type[] { typeof(string) });
+                                    var value = getValueMethod.Invoke(eeKey, new object[] { RegistryValue });
+                                    if ((value != null) && (value is int))
+                                    {
+                                        s_isFailFastEnabled = ((int)value == 1);
+                                    }
                                 }
                             }
                         }

src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj

@@ -63,9 +63,7 @@
     <Compile Include="..\..\ExpressionCompiler\DateTimeUtilities.cs">
       <Link>ExpressionCompiler\DateTimeUtilities.cs</Link>
     </Compile>
-    <Compile Include="..\Helpers\Placeholders.cs">
-      <Link>Helpers\Placeholders.cs</Link>
-    </Compile>
+    <Compile Include="Helpers\Placeholders.cs" />
     <Compile Include="..\SystemHelpers.cs">
       <Link>Helpers\SystemHelpers.cs</Link>
     </Compile>
@@ -84,7 +82,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
-    <Compile Include="..\Resources.Designer.cs">
+    <Compile Include="..\Portable\Resources.Designer.cs">
       <Link>Resources.Designer.cs</Link>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -92,7 +90,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Resources.resx">
+    <EmbeddedResource Include="..\Portable\Resources.resx">
       <Link>Resources.resx</Link>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Helpers/Placeholders.cs

+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace Microsoft.CodeAnalysis
+{
+    /// <summary>
+    /// Required by <see cref="SymbolDisplayPartKind"/>.
+    /// </summary>
+    internal static class IErrorTypeSymbol
+    {
+    }
+}
\ No newline at end of file

src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Helpers/ReflectionHelpers.cs

+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Reflection;
+
+namespace Microsoft.CodeAnalysis.ExpressionEvaluator
+{
+    internal static class ReflectionHelpers
+    {
+        public static MethodInfo GetMethod(this TypeInfo typeInfo, string name, Type[] types)
+        {
+            foreach (var method in typeInfo.GetDeclaredMethods(name))
+            {
+                var parameters = method.GetParameters();
+                if (parameters.Length == types.Length)
+                {
+                    for (int i = 0; i < types.Length; i++)
+                    {
+                        if (types[i] != parameters[i].ParameterType)
+                        {
+                            continue;
+                        }
+                    }
+
+                    return method;
+                }
+            }
+
+            return null;
+        }
+
+        public static FieldInfo GetField(this TypeInfo typeInfo, string name)
+        {
+            return typeInfo.GetDeclaredField(name);
+        }
+    }
+}
\ No newline at end of file

src/ExpressionEvaluator/Core/Source/ResultProvider/Resources.Designer.cs → src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Resources.Designer.cs

@@ -10,6 +10,7 @@
 
 namespace Microsoft.CodeAnalysis.ExpressionEvaluator {
     using System;
+    using System.Reflection;
     
     
     /// <summary>
@@ -39,7 +40,7 @@ internal class Resources {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.ExpressionEvaluator.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.ExpressionEvaluator.Resources", typeof(Resources).GetTypeInfo().Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

src/ExpressionEvaluator/Core/Source/ResultProvider/Resources.resx → src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/Resources.resx

@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ErrorName" xml:space="preserve">
     <value>Error</value>

src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TargetNetFX20>true</TargetNetFX20>
-  </PropertyGroup>
   <ImportGroup Label="Settings">
     <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
     <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
@@ -16,9 +13,11 @@
     <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
     <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider</AssemblyName>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
+    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
     <!-- Don't transitively copy output files, since everything builds to the same folder. -->
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <ItemGroup Label="Linked Files">
     <Compile Include="..\..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">
@@ -63,12 +62,8 @@
     <Compile Include="..\..\ExpressionCompiler\DateTimeUtilities.cs">
       <Link>ExpressionCompiler\DateTimeUtilities.cs</Link>
     </Compile>
-    <Compile Include="..\Helpers\Placeholders.cs">
-      <Link>Helpers\Placeholders.cs</Link>
-    </Compile>
-    <Compile Include="..\SystemHelpers.cs">
-      <Link>Helpers\SystemHelpers.cs</Link>
-    </Compile>
+    <Compile Include="Helpers\Placeholders.cs" />
+    <Compile Include="Helpers\ReflectionHelpers.cs" />
   </ItemGroup>
   <ItemGroup Label="File References">
     <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
@@ -84,16 +79,14 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
-    <Compile Include="..\Resources.Designer.cs">
-      <Link>Resources.Designer.cs</Link>
+    <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Resources.resx">
-      <Link>Resources.resx</Link>
+    <EmbeddedResource Include="Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
@@ -102,9 +95,6 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="..\ResultProvider.projitems" Label="Shared" />
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />

src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/packages.config

-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
-</packages>

src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj

@@ -76,7 +76,7 @@
     <Compile Include="..\..\Source\ExpressionCompiler\ExpressionEvaluatorFatalError.cs">
       <Link>ExpressionCompiler\ExpressionEvaluatorFatalError.cs</Link>
     </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Resources.Designer.cs">
+    <Compile Include="..\..\Source\ResultProvider\Portable\Resources.Designer.cs">
       <Link>Resources.Designer.cs</Link>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -148,7 +148,7 @@
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ResultProvider.UnitTests" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Source\ResultProvider\Resources.resx">
+    <EmbeddedResource Include="..\..\Source\ResultProvider\Portable\Resources.resx">
       <Link>Resources.resx</Link>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj

@@ -58,7 +58,7 @@
     <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Syntax\SyntaxKindFacts.vb">
       <Link>Compiler\Syntax\SyntaxKindFacts.vb</Link>
     </Compile>
-    <Compile Include="..\Resources.Designer.vb">
+    <Compile Include="..\Portable\Resources.Designer.vb">
       <Link>Resources.Designer.vb</Link>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -71,7 +71,7 @@
     <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Resources.resx">
+    <EmbeddedResource Include="..\Portable\Resources.resx">
       <Link>Resources.resx</Link>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>

src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TargetNetFX20>true</TargetNetFX20>
-  </PropertyGroup>
   <ImportGroup Label="Settings">
     <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
     <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
@@ -17,11 +14,13 @@
     </RootNamespace>
     <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider</AssemblyName>
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
+    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+    <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <VBSyntaxGeneratorToolPath>$(OutDir)..\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
     <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
     <!-- Don't transitively copy output files, since everything builds to the same folder. -->
     <RemoveIntegerChecks>true</RemoveIntegerChecks>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
   </PropertyGroup>
@@ -58,8 +57,7 @@
     <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Syntax\SyntaxKindFacts.vb">
       <Link>Compiler\Syntax\SyntaxKindFacts.vb</Link>
     </Compile>
-    <Compile Include="..\Resources.Designer.vb">
-      <Link>Resources.Designer.vb</Link>
+    <Compile Include="Resources.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
@@ -71,16 +69,12 @@
     <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Resources.resx">
-      <Link>Resources.resx</Link>
+    <EmbeddedResource Include="Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
       <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator</CustomToolNamespace>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="..\BasicResultProvider.projitems" Label="Shared" />
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />

src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Resources.Designer.vb → src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/Resources.Designer.vb

-' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-
-'------------------------------------------------------------------------------
+'------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.0
@@ -14,6 +12,7 @@ Option Strict On
 Option Explicit On
 
 Imports System
+Imports System.Reflection
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator
     
@@ -45,7 +44,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator
         Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Resources", GetType(Resources).GetTypeInfo.Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Resources.resx → src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/Resources.resx

@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="SharedMembers" xml:space="preserve">
     <value>Shared members</value>

src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/packages.config

-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
-</packages>

src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/packages.config

-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
-</packages>
\ No newline at end of file

src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj

@@ -77,7 +77,7 @@
     <Compile Include="..\..\..\..\Compilers\VisualBasic\Portable\SymbolDisplay\ObjectDisplay.vb">
       <Link>Compiler\SymbolDisplay\ObjectDisplay.vb</Link>
     </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Resources.Designer.vb">
+    <Compile Include="..\..\Source\ResultProvider\Portable\Resources.Designer.vb">
       <Link>Resources.Designer.vb</Link>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -97,7 +97,7 @@
     <Compile Include="VisualBasicResultProviderTestBase.vb" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Source\ResultProvider\Resources.resx">
+    <EmbeddedResource Include="..\..\Source\ResultProvider\Portable\Resources.resx">
       <Link>Resources.resx</Link>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>