fixed merge conflict

07ae86b4 · Heejae Chang · eb1dfc8e · 8330cfcd · 07ae86b4 · 07ae86b4
265 changed file
--- a/build/Targets/VSL.Imports.targets
+++ b/build/Targets/VSL.Imports.targets
@@ -59,15 +59,30 @@
      <RemoveAssemblyFoldersIfNoTargetFramework>false</RemoveAssemblyFoldersIfNoTargetFramework>
  </PropertyGroup>

+  <!-- Work around issue in dotnet/roslyn issue #5213
+       Since MSBuild wants a reference assembly location and DNXCore doesn't have one,
+       trick MSBuild into using the .NETPortable,v5.0 reference assembly path which happens
+       to have the same set of reference assemblies as DNXCore (i.e., none). -->
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore'">
+    <_TargetFrameworkDirectories>$([System.String]::Join(";", $([Microsoft.Build.Utilities.ToolLocationHelper]::GetPathToReferenceAssemblies(".NETPortable", "v5.0", ""))))</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths>$(_TargetFrameworkDirectories)</_FullFrameworkReferenceAssemblyPaths>
+  </PropertyGroup>
+
  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore'">
      <BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win</BaseNuGetRuntimeIdentifier>
      <BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Unix'">linux</BaseNuGetRuntimeIdentifier>
  </PropertyGroup>

-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets" Condition="'$(ProjectLanguage)' == 'VB' And '$(TargetFrameworkIdentifier)' == '.NETPortable'"/>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" Condition="'$(ProjectLanguage)' == 'CSharp' And '$(TargetFrameworkIdentifier)' == '.NETPortable'"/>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" Condition="'$(ProjectLanguage)' == 'VB' And '$(TargetFrameworkIdentifier)' != '.NETPortable'" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(ProjectLanguage)' == 'CSharp' And '$(TargetFrameworkIdentifier)' != '.NETPortable'" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets"
+          Condition="'$(ProjectLanguage)' == 'VB' And '$(TargetFrameworkIdentifier)' == '.NETPortable'"/>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets"
+          Condition="'$(ProjectLanguage)' == 'CSharp' And '$(TargetFrameworkIdentifier)' == '.NETPortable'"/>
+
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets"
+          Condition="'$(ProjectLanguage)' == 'VB' And '$(TargetFrameworkIdentifier)' != '.NETPortable'" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"
+          Condition="'$(ProjectLanguage)' == 'CSharp' And '$(TargetFrameworkIdentifier)' != '.NETPortable'" />
+
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(ProjectLanguage)' == 'C++'" />

  <!-- On Mono on *nix the NuGet targets aren't imported by default, so we do that here -->

--- a/build/ToolsetPackages/project.json
+++ b/build/ToolsetPackages/project.json
@@ -2,7 +2,6 @@
    "dependencies": {
        "Microsoft.Build.Mono.Debug": "14.1.0-prerelease",
        "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150817-01",
-        "Microsoft.DiaSymReader": "1.0.5",
        "Microsoft.DiaSymReader.Native": "1.1.0-alpha2",
        "Microsoft.Net.Compilers": "1.1.0-beta1-20150727-01",
        "Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150814-01",

--- a/build/ToolsetPackages/project.lock.json
+++ b/build/ToolsetPackages/project.lock.json
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -79,7 +79,7 @@ restore_nuget()
 {
    acquire_sem_or_wait "restore_nuget"

-    local package_name="nuget.10.zip"
+    local package_name="nuget.11.zip"
    local target="/tmp/$package_name"
    echo "Installing NuGet Packages $target"
    if [ -f $target ]; then

--- a/nuget.exe
+++ b/nuget.exe
--- a/src/Compilers/CSharp/CscCore/project.lock.json
+++ b/src/Compilers/CSharp/CscCore/project.lock.json
--- a/src/Compilers/CSharp/Portable/project.lock.json
+++ b/src/Compilers/CSharp/Portable/project.lock.json
@@ -3,6 +3,7 @@
  "version": 1,
  "targets": {
    ".NETPortable,Version=v4.5,Profile=Profile7": {
+      "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
      "System.Collections.Immutable/1.1.36": {
        "compile": {
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
@@ -25,30 +26,42 @@
    }
  },
  "libraries": {
+    "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {
+      "sha512": "D9bGkcO1+s5c0jn4R/9BD3pw4gqyaFzC7XdlYBVDTqYMqVITMDpF8xxMXN0F3nZRl1dE54RGWp5k8GVAnMhpgQ==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "Microsoft.DiaSymReader.Native.nuspec",
+        "package/services/metadata/core-properties/e2e1c0f9faac4ddb951a90d33184740b.psmdcp",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll"
+      ]
+    },
    "System.Collections.Immutable/1.1.36": {
      "sha512": "MOlivTIeAIQPPMUPWIIoMCvZczjFRLYUWSYwqi1szu8QPyeIbsaPeI+hpXe1DzTxNwnRnmfYaoToi6kXIfSPNg==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Collections.Immutable.nuspec",
-        "License-Stable.rtf",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
+        "License-Stable.rtf",
        "package/services/metadata/core-properties/c8b7b781850445db852bd2d848380ca6.psmdcp",
-        "[Content_Types].xml"
+        "System.Collections.Immutable.nuspec"
      ]
    },
    "System.Reflection.Metadata/1.1.0-alpha-00014": {
      "sha512": "rVeIWjVoLQS0aNrGdzndZReskyfxu4EfO9BKqT5GJt0YfGtlsHB1aDPnjl4jIBDTr+WJC9YsnZg8S5sKT1X42g==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Reflection.Metadata.nuspec",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.pdb",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml",
        "package/services/metadata/core-properties/a48ecf967b1540bba8edfe9af3a99ea5.psmdcp",
-        "[Content_Types].xml"
+        "System.Reflection.Metadata.nuspec"
      ]
    }
  },

--- a/src/Compilers/CSharp/Test/CommandLine/project.lock.json
+++ b/src/Compilers/CSharp/Test/CommandLine/project.lock.json
@@ -11,14 +11,15 @@
          "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
        }
      },
-      "Microsoft.DiaSymReader/1.0.5": {
+      "Microsoft.DiaSymReader/1.0.5.1": {
        "compile": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        },
        "runtime": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        }
      },
+      "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
      "System.Collections.Immutable/1.1.36": {
        "compile": {
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
@@ -53,67 +54,79 @@
      "sha512": "mQa72JIzSdIC7wOcW8vl1izgZ+GSeTRrYYpbPKPvrX/PeygTd4SRxord7PL+fTb1q3YjlwMBSqgJsDXVa99fUA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
        "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll",
-        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp",
-        "[Content_Types].xml"
+        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
+        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp"
      ]
    },
-    "Microsoft.DiaSymReader/1.0.5": {
-      "sha512": "0Ugv1+34GttdWLdhquMnRCgo4ktDNGQBDDtY+1Jdcuk1jOD0jeeqlR/AZDhxcrV25eOMC3Lwumj353nAYRylqQ==",
+    "Microsoft.DiaSymReader/1.0.5.1": {
+      "sha512": "s3ExUWlfkWt9cHcJQgrm4mS5Lfj91B6o2G9DD1zFA1/7aihXPL8W16Hyix+joyh8g3buxsxb0snwhPKQHb9ApA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.DiaSymReader.nuspec",
-        "lib/net45/Microsoft.DiaSymReader.dll",
-        "lib/net45/Microsoft.DiaSymReader.xml",
        "lib/net20/Microsoft.DiaSymReader.dll",
        "lib/net20/Microsoft.DiaSymReader.xml",
-        "package/services/metadata/core-properties/08003dc206aa4abfa0c6f00c3f91c002.psmdcp",
-        "[Content_Types].xml"
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.dll",
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.xml",
+        "Microsoft.DiaSymReader.nuspec",
+        "package/services/metadata/core-properties/4ff7fb1418cc465f82f38fc19097827f.psmdcp"
+      ]
+    },
+    "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {
+      "sha512": "D9bGkcO1+s5c0jn4R/9BD3pw4gqyaFzC7XdlYBVDTqYMqVITMDpF8xxMXN0F3nZRl1dE54RGWp5k8GVAnMhpgQ==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "Microsoft.DiaSymReader.Native.nuspec",
+        "package/services/metadata/core-properties/e2e1c0f9faac4ddb951a90d33184740b.psmdcp",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll"
      ]
    },
    "System.Collections.Immutable/1.1.36": {
      "sha512": "MOlivTIeAIQPPMUPWIIoMCvZczjFRLYUWSYwqi1szu8QPyeIbsaPeI+hpXe1DzTxNwnRnmfYaoToi6kXIfSPNg==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Collections.Immutable.nuspec",
-        "License-Stable.rtf",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
+        "License-Stable.rtf",
        "package/services/metadata/core-properties/c8b7b781850445db852bd2d848380ca6.psmdcp",
-        "[Content_Types].xml"
+        "System.Collections.Immutable.nuspec"
      ]
    },
    "System.Reflection.Metadata/1.1.0-alpha-00014": {
      "sha512": "rVeIWjVoLQS0aNrGdzndZReskyfxu4EfO9BKqT5GJt0YfGtlsHB1aDPnjl4jIBDTr+WJC9YsnZg8S5sKT1X42g==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Reflection.Metadata.nuspec",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.pdb",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml",
        "package/services/metadata/core-properties/a48ecf967b1540bba8edfe9af3a99ea5.psmdcp",
-        "[Content_Types].xml"
+        "System.Reflection.Metadata.nuspec"
      ]
    },
    "xunit/1.9.2": {
      "sha512": "c1wppJtYPUGPHVP9U1wjmfii4553MuQSXkAt8rudkXW+eUFJxOOfDvhBJ6S0YHHDMFEJwiMN770AT4Lno8EBpw==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "xunit.nuspec",
        "lib/net20/xunit.dll",
        "lib/net20/xunit.dll.tdnet",
-        "lib/net20/xunit.xml",
        "lib/net20/xunit.runner.msbuild.dll",
        "lib/net20/xunit.runner.tdnet.dll",
        "lib/net20/xunit.runner.utility.dll",
+        "lib/net20/xunit.xml",
        "package/services/metadata/core-properties/cb77589bcde944baab7b67d60ca583c7.psmdcp",
-        "[Content_Types].xml"
+        "xunit.nuspec"
      ]
    }
  },

--- a/src/Compilers/CSharp/Test/Emit/project.json
+++ b/src/Compilers/CSharp/Test/Emit/project.json
 {
  "dependencies": {
    "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "Microsoft.DiaSymReader": "1.0.5",
+    "Microsoft.DiaSymReader": "1.0.5.1",
    "xunit": "1.9.2",
  },
  "frameworks": {

--- a/src/Compilers/CSharp/Test/Emit/project.lock.json
+++ b/src/Compilers/CSharp/Test/Emit/project.lock.json
@@ -11,14 +11,15 @@
          "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
        }
      },
-      "Microsoft.DiaSymReader/1.0.5": {
+      "Microsoft.DiaSymReader/1.0.5.1": {
        "compile": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        },
        "runtime": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        }
      },
+      "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
      "System.Collections.Immutable/1.1.36": {
        "compile": {
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
@@ -53,74 +54,86 @@
      "sha512": "mQa72JIzSdIC7wOcW8vl1izgZ+GSeTRrYYpbPKPvrX/PeygTd4SRxord7PL+fTb1q3YjlwMBSqgJsDXVa99fUA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
        "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll",
-        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp",
-        "[Content_Types].xml"
+        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
+        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp"
      ]
    },
-    "Microsoft.DiaSymReader/1.0.5": {
-      "sha512": "0Ugv1+34GttdWLdhquMnRCgo4ktDNGQBDDtY+1Jdcuk1jOD0jeeqlR/AZDhxcrV25eOMC3Lwumj353nAYRylqQ==",
+    "Microsoft.DiaSymReader/1.0.5.1": {
+      "sha512": "s3ExUWlfkWt9cHcJQgrm4mS5Lfj91B6o2G9DD1zFA1/7aihXPL8W16Hyix+joyh8g3buxsxb0snwhPKQHb9ApA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.DiaSymReader.nuspec",
-        "lib/net45/Microsoft.DiaSymReader.dll",
-        "lib/net45/Microsoft.DiaSymReader.xml",
        "lib/net20/Microsoft.DiaSymReader.dll",
        "lib/net20/Microsoft.DiaSymReader.xml",
-        "package/services/metadata/core-properties/08003dc206aa4abfa0c6f00c3f91c002.psmdcp",
-        "[Content_Types].xml"
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.dll",
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.xml",
+        "Microsoft.DiaSymReader.nuspec",
+        "package/services/metadata/core-properties/4ff7fb1418cc465f82f38fc19097827f.psmdcp"
+      ]
+    },
+    "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {
+      "sha512": "D9bGkcO1+s5c0jn4R/9BD3pw4gqyaFzC7XdlYBVDTqYMqVITMDpF8xxMXN0F3nZRl1dE54RGWp5k8GVAnMhpgQ==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "Microsoft.DiaSymReader.Native.nuspec",
+        "package/services/metadata/core-properties/e2e1c0f9faac4ddb951a90d33184740b.psmdcp",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll"
      ]
    },
    "System.Collections.Immutable/1.1.36": {
      "sha512": "MOlivTIeAIQPPMUPWIIoMCvZczjFRLYUWSYwqi1szu8QPyeIbsaPeI+hpXe1DzTxNwnRnmfYaoToi6kXIfSPNg==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Collections.Immutable.nuspec",
-        "License-Stable.rtf",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
+        "License-Stable.rtf",
        "package/services/metadata/core-properties/c8b7b781850445db852bd2d848380ca6.psmdcp",
-        "[Content_Types].xml"
+        "System.Collections.Immutable.nuspec"
      ]
    },
    "System.Reflection.Metadata/1.1.0-alpha-00014": {
      "sha512": "rVeIWjVoLQS0aNrGdzndZReskyfxu4EfO9BKqT5GJt0YfGtlsHB1aDPnjl4jIBDTr+WJC9YsnZg8S5sKT1X42g==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Reflection.Metadata.nuspec",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.pdb",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml",
        "package/services/metadata/core-properties/a48ecf967b1540bba8edfe9af3a99ea5.psmdcp",
-        "[Content_Types].xml"
+        "System.Reflection.Metadata.nuspec"
      ]
    },
    "xunit/1.9.2": {
      "sha512": "c1wppJtYPUGPHVP9U1wjmfii4553MuQSXkAt8rudkXW+eUFJxOOfDvhBJ6S0YHHDMFEJwiMN770AT4Lno8EBpw==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "xunit.nuspec",
        "lib/net20/xunit.dll",
        "lib/net20/xunit.dll.tdnet",
-        "lib/net20/xunit.xml",
        "lib/net20/xunit.runner.msbuild.dll",
        "lib/net20/xunit.runner.tdnet.dll",
        "lib/net20/xunit.runner.utility.dll",
+        "lib/net20/xunit.xml",
        "package/services/metadata/core-properties/cb77589bcde944baab7b67d60ca583c7.psmdcp",
-        "[Content_Types].xml"
+        "xunit.nuspec"
      ]
    }
  },
  "projectFileDependencyGroups": {
    "": [
      "Microsoft.CodeAnalysis.Test.Resources.Proprietary >= 1.1.0-beta1-20150824-02",
-      "Microsoft.DiaSymReader >= 1.0.5",
+      "Microsoft.DiaSymReader >= 1.0.5.1",
      "xunit >= 1.9.2"
    ],
    ".NETFramework,Version=v4.5": []

--- a/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.cs
+++ b/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.cs
@@ -1963,6 +1963,64 @@ private static S GetS()
                );
        }

+        [Fact]
+        [WorkItem(2470, "https://github.com/dotnet/roslyn/issues/2470")]
+        public void NoFieldNeverAssignedWarning()
+        {
+            string program = @"
+using System.Threading.Tasks;
+
+internal struct TaskEvent<T>
+{
+    private TaskCompletionSource<T> _tcs;
+
+    public Task<T> Task
+    {
+        get
+        {
+            if (_tcs == null)
+                _tcs = new TaskCompletionSource<T>();
+            return _tcs.Task;
+        }
+    }
+
+    public void Invoke(T result)
+    {
+        if (_tcs != null)
+        {
+            TaskCompletionSource<T> localTcs = _tcs;
+            _tcs = null;
+            localTcs.SetResult(result);
+        }
+    }
+}
+
+public class OperationExecutor
+{
+    private TaskEvent<float?> _nextValueEvent; // Field is never assigned warning
+
+    // Start some async operation
+    public Task<bool> StartOperation()
+    {
+        return null;
+    }
+
+    // Get progress or data during async operation
+    public Task<float?> WaitNextValue()
+    {
+        return _nextValueEvent.Task;
+    }
+
+    // Called externally
+    internal void OnNextValue(float? value)
+    {
+        _nextValueEvent.Invoke(value);
+    }
+}
+";
+            CreateCompilationWithMscorlib45(program).VerifyEmitDiagnostics();
+        }
+
        #endregion

        [Fact, WorkItem(545347, "DevDiv")]

--- a/src/Compilers/CSharp/Test/Semantic/project.lock.json
+++ b/src/Compilers/CSharp/Test/Semantic/project.lock.json
@@ -11,14 +11,15 @@
          "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
        }
      },
-      "Microsoft.DiaSymReader/1.0.5": {
+      "Microsoft.DiaSymReader/1.0.5.1": {
        "compile": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        },
        "runtime": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        }
      },
+      "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
      "System.Collections.Immutable/1.1.36": {
        "compile": {
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
@@ -53,67 +54,79 @@
      "sha512": "mQa72JIzSdIC7wOcW8vl1izgZ+GSeTRrYYpbPKPvrX/PeygTd4SRxord7PL+fTb1q3YjlwMBSqgJsDXVa99fUA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
        "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll",
-        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp",
-        "[Content_Types].xml"
+        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
+        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp"
      ]
    },
-    "Microsoft.DiaSymReader/1.0.5": {
-      "sha512": "0Ugv1+34GttdWLdhquMnRCgo4ktDNGQBDDtY+1Jdcuk1jOD0jeeqlR/AZDhxcrV25eOMC3Lwumj353nAYRylqQ==",
+    "Microsoft.DiaSymReader/1.0.5.1": {
+      "sha512": "s3ExUWlfkWt9cHcJQgrm4mS5Lfj91B6o2G9DD1zFA1/7aihXPL8W16Hyix+joyh8g3buxsxb0snwhPKQHb9ApA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.DiaSymReader.nuspec",
-        "lib/net45/Microsoft.DiaSymReader.dll",
-        "lib/net45/Microsoft.DiaSymReader.xml",
        "lib/net20/Microsoft.DiaSymReader.dll",
        "lib/net20/Microsoft.DiaSymReader.xml",
-        "package/services/metadata/core-properties/08003dc206aa4abfa0c6f00c3f91c002.psmdcp",
-        "[Content_Types].xml"
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.dll",
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.xml",
+        "Microsoft.DiaSymReader.nuspec",
+        "package/services/metadata/core-properties/4ff7fb1418cc465f82f38fc19097827f.psmdcp"
+      ]
+    },
+    "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {
+      "sha512": "D9bGkcO1+s5c0jn4R/9BD3pw4gqyaFzC7XdlYBVDTqYMqVITMDpF8xxMXN0F3nZRl1dE54RGWp5k8GVAnMhpgQ==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "Microsoft.DiaSymReader.Native.nuspec",
+        "package/services/metadata/core-properties/e2e1c0f9faac4ddb951a90d33184740b.psmdcp",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll"
      ]
    },
    "System.Collections.Immutable/1.1.36": {
      "sha512": "MOlivTIeAIQPPMUPWIIoMCvZczjFRLYUWSYwqi1szu8QPyeIbsaPeI+hpXe1DzTxNwnRnmfYaoToi6kXIfSPNg==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Collections.Immutable.nuspec",
-        "License-Stable.rtf",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
+        "License-Stable.rtf",
        "package/services/metadata/core-properties/c8b7b781850445db852bd2d848380ca6.psmdcp",
-        "[Content_Types].xml"
+        "System.Collections.Immutable.nuspec"
      ]
    },
    "System.Reflection.Metadata/1.1.0-alpha-00014": {
      "sha512": "rVeIWjVoLQS0aNrGdzndZReskyfxu4EfO9BKqT5GJt0YfGtlsHB1aDPnjl4jIBDTr+WJC9YsnZg8S5sKT1X42g==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Reflection.Metadata.nuspec",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.pdb",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml",
        "package/services/metadata/core-properties/a48ecf967b1540bba8edfe9af3a99ea5.psmdcp",
-        "[Content_Types].xml"
+        "System.Reflection.Metadata.nuspec"
      ]
    },
    "xunit/1.9.2": {
      "sha512": "c1wppJtYPUGPHVP9U1wjmfii4553MuQSXkAt8rudkXW+eUFJxOOfDvhBJ6S0YHHDMFEJwiMN770AT4Lno8EBpw==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "xunit.nuspec",
        "lib/net20/xunit.dll",
        "lib/net20/xunit.dll.tdnet",
-        "lib/net20/xunit.xml",
        "lib/net20/xunit.runner.msbuild.dll",
        "lib/net20/xunit.runner.tdnet.dll",
        "lib/net20/xunit.runner.utility.dll",
+        "lib/net20/xunit.xml",
        "package/services/metadata/core-properties/cb77589bcde944baab7b67d60ca583c7.psmdcp",
-        "[Content_Types].xml"
+        "xunit.nuspec"
      ]
    }
  },

--- a/src/Compilers/CSharp/Test/Symbol/project.lock.json
+++ b/src/Compilers/CSharp/Test/Symbol/project.lock.json
@@ -11,14 +11,15 @@
          "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
        }
      },
-      "Microsoft.DiaSymReader/1.0.5": {
+      "Microsoft.DiaSymReader/1.0.5.1": {
        "compile": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        },
        "runtime": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        }
      },
+      "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
      "System.Collections.Immutable/1.1.36": {
        "compile": {
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
@@ -53,67 +54,79 @@
      "sha512": "mQa72JIzSdIC7wOcW8vl1izgZ+GSeTRrYYpbPKPvrX/PeygTd4SRxord7PL+fTb1q3YjlwMBSqgJsDXVa99fUA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
        "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll",
-        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp",
-        "[Content_Types].xml"
+        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
+        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp"
      ]
    },
-    "Microsoft.DiaSymReader/1.0.5": {
-      "sha512": "0Ugv1+34GttdWLdhquMnRCgo4ktDNGQBDDtY+1Jdcuk1jOD0jeeqlR/AZDhxcrV25eOMC3Lwumj353nAYRylqQ==",
+    "Microsoft.DiaSymReader/1.0.5.1": {
+      "sha512": "s3ExUWlfkWt9cHcJQgrm4mS5Lfj91B6o2G9DD1zFA1/7aihXPL8W16Hyix+joyh8g3buxsxb0snwhPKQHb9ApA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.DiaSymReader.nuspec",
-        "lib/net45/Microsoft.DiaSymReader.dll",
-        "lib/net45/Microsoft.DiaSymReader.xml",
        "lib/net20/Microsoft.DiaSymReader.dll",
        "lib/net20/Microsoft.DiaSymReader.xml",
-        "package/services/metadata/core-properties/08003dc206aa4abfa0c6f00c3f91c002.psmdcp",
-        "[Content_Types].xml"
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.dll",
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.xml",
+        "Microsoft.DiaSymReader.nuspec",
+        "package/services/metadata/core-properties/4ff7fb1418cc465f82f38fc19097827f.psmdcp"
+      ]
+    },
+    "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {
+      "sha512": "D9bGkcO1+s5c0jn4R/9BD3pw4gqyaFzC7XdlYBVDTqYMqVITMDpF8xxMXN0F3nZRl1dE54RGWp5k8GVAnMhpgQ==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "Microsoft.DiaSymReader.Native.nuspec",
+        "package/services/metadata/core-properties/e2e1c0f9faac4ddb951a90d33184740b.psmdcp",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll"
      ]
    },
    "System.Collections.Immutable/1.1.36": {
      "sha512": "MOlivTIeAIQPPMUPWIIoMCvZczjFRLYUWSYwqi1szu8QPyeIbsaPeI+hpXe1DzTxNwnRnmfYaoToi6kXIfSPNg==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Collections.Immutable.nuspec",
-        "License-Stable.rtf",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
+        "License-Stable.rtf",
        "package/services/metadata/core-properties/c8b7b781850445db852bd2d848380ca6.psmdcp",
-        "[Content_Types].xml"
+        "System.Collections.Immutable.nuspec"
      ]
    },
    "System.Reflection.Metadata/1.1.0-alpha-00014": {
      "sha512": "rVeIWjVoLQS0aNrGdzndZReskyfxu4EfO9BKqT5GJt0YfGtlsHB1aDPnjl4jIBDTr+WJC9YsnZg8S5sKT1X42g==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Reflection.Metadata.nuspec",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.pdb",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml",
        "package/services/metadata/core-properties/a48ecf967b1540bba8edfe9af3a99ea5.psmdcp",
-        "[Content_Types].xml"
+        "System.Reflection.Metadata.nuspec"
      ]
    },
    "xunit/1.9.2": {
      "sha512": "c1wppJtYPUGPHVP9U1wjmfii4553MuQSXkAt8rudkXW+eUFJxOOfDvhBJ6S0YHHDMFEJwiMN770AT4Lno8EBpw==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "xunit.nuspec",
        "lib/net20/xunit.dll",
        "lib/net20/xunit.dll.tdnet",
-        "lib/net20/xunit.xml",
        "lib/net20/xunit.runner.msbuild.dll",
        "lib/net20/xunit.runner.tdnet.dll",
        "lib/net20/xunit.runner.utility.dll",
+        "lib/net20/xunit.xml",
        "package/services/metadata/core-properties/cb77589bcde944baab7b67d60ca583c7.psmdcp",
-        "[Content_Types].xml"
+        "xunit.nuspec"
      ]
    }
  },

--- a/src/Compilers/CSharp/Test/Syntax/project.lock.json
+++ b/src/Compilers/CSharp/Test/Syntax/project.lock.json
@@ -11,14 +11,15 @@
          "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll": {}
        }
      },
-      "Microsoft.DiaSymReader/1.0.5": {
+      "Microsoft.DiaSymReader/1.0.5.1": {
        "compile": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        },
        "runtime": {
-          "lib/net45/Microsoft.DiaSymReader.dll": {}
+          "lib/net20/Microsoft.DiaSymReader.dll": {}
        }
      },
+      "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
      "System.Collections.Immutable/1.1.36": {
        "compile": {
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
@@ -53,67 +54,79 @@
      "sha512": "mQa72JIzSdIC7wOcW8vl1izgZ+GSeTRrYYpbPKPvrX/PeygTd4SRxord7PL+fTb1q3YjlwMBSqgJsDXVa99fUA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
        "lib/net45/Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll",
-        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp",
-        "[Content_Types].xml"
+        "Microsoft.CodeAnalysis.Test.Resources.Proprietary.nuspec",
+        "package/services/metadata/core-properties/58b0e57bbbed434fb2c05b7ef3a926cc.psmdcp"
      ]
    },
-    "Microsoft.DiaSymReader/1.0.5": {
-      "sha512": "0Ugv1+34GttdWLdhquMnRCgo4ktDNGQBDDtY+1Jdcuk1jOD0jeeqlR/AZDhxcrV25eOMC3Lwumj353nAYRylqQ==",
+    "Microsoft.DiaSymReader/1.0.5.1": {
+      "sha512": "s3ExUWlfkWt9cHcJQgrm4mS5Lfj91B6o2G9DD1zFA1/7aihXPL8W16Hyix+joyh8g3buxsxb0snwhPKQHb9ApA==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "Microsoft.DiaSymReader.nuspec",
-        "lib/net45/Microsoft.DiaSymReader.dll",
-        "lib/net45/Microsoft.DiaSymReader.xml",
        "lib/net20/Microsoft.DiaSymReader.dll",
        "lib/net20/Microsoft.DiaSymReader.xml",
-        "package/services/metadata/core-properties/08003dc206aa4abfa0c6f00c3f91c002.psmdcp",
-        "[Content_Types].xml"
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.dll",
+        "lib/portable-net45+win8/Microsoft.DiaSymReader.xml",
+        "Microsoft.DiaSymReader.nuspec",
+        "package/services/metadata/core-properties/4ff7fb1418cc465f82f38fc19097827f.psmdcp"
+      ]
+    },
+    "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {
+      "sha512": "D9bGkcO1+s5c0jn4R/9BD3pw4gqyaFzC7XdlYBVDTqYMqVITMDpF8xxMXN0F3nZRl1dE54RGWp5k8GVAnMhpgQ==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "Microsoft.DiaSymReader.Native.nuspec",
+        "package/services/metadata/core-properties/e2e1c0f9faac4ddb951a90d33184740b.psmdcp",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll"
      ]
    },
    "System.Collections.Immutable/1.1.36": {
      "sha512": "MOlivTIeAIQPPMUPWIIoMCvZczjFRLYUWSYwqi1szu8QPyeIbsaPeI+hpXe1DzTxNwnRnmfYaoToi6kXIfSPNg==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Collections.Immutable.nuspec",
-        "License-Stable.rtf",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
+        "License-Stable.rtf",
        "package/services/metadata/core-properties/c8b7b781850445db852bd2d848380ca6.psmdcp",
-        "[Content_Types].xml"
+        "System.Collections.Immutable.nuspec"
      ]
    },
    "System.Reflection.Metadata/1.1.0-alpha-00014": {
      "sha512": "rVeIWjVoLQS0aNrGdzndZReskyfxu4EfO9BKqT5GJt0YfGtlsHB1aDPnjl4jIBDTr+WJC9YsnZg8S5sKT1X42g==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Reflection.Metadata.nuspec",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.pdb",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml",
        "package/services/metadata/core-properties/a48ecf967b1540bba8edfe9af3a99ea5.psmdcp",
-        "[Content_Types].xml"
+        "System.Reflection.Metadata.nuspec"
      ]
    },
    "xunit/1.9.2": {
      "sha512": "c1wppJtYPUGPHVP9U1wjmfii4553MuQSXkAt8rudkXW+eUFJxOOfDvhBJ6S0YHHDMFEJwiMN770AT4Lno8EBpw==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "xunit.nuspec",
        "lib/net20/xunit.dll",
        "lib/net20/xunit.dll.tdnet",
-        "lib/net20/xunit.xml",
        "lib/net20/xunit.runner.msbuild.dll",
        "lib/net20/xunit.runner.tdnet.dll",
        "lib/net20/xunit.runner.utility.dll",
+        "lib/net20/xunit.xml",
        "package/services/metadata/core-properties/cb77589bcde944baab7b67d60ca583c7.psmdcp",
-        "[Content_Types].xml"
+        "xunit.nuspec"
      ]
    }
  },

--- a/src/Compilers/CSharp/Test/WinRT/project.lock.json
+++ b/src/Compilers/CSharp/Test/WinRT/project.lock.json
--- a/src/Compilers/CSharp/csc/project.lock.json
+++ b/src/Compilers/CSharp/csc/project.lock.json
@@ -3,6 +3,7 @@
  "version": 1,
  "targets": {
    ".NETFramework,Version=v4.5": {
+      "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
      "System.Collections.Immutable/1.1.36": {
        "compile": {
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
@@ -24,6 +25,7 @@
      }
    },
    ".NETFramework,Version=v4.5/win-anycpu": {
+      "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
      "System.Collections.Immutable/1.1.36": {
        "compile": {
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
@@ -46,30 +48,42 @@
    }
  },
  "libraries": {
+    "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {
+      "sha512": "D9bGkcO1+s5c0jn4R/9BD3pw4gqyaFzC7XdlYBVDTqYMqVITMDpF8xxMXN0F3nZRl1dE54RGWp5k8GVAnMhpgQ==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "Microsoft.DiaSymReader.Native.nuspec",
+        "package/services/metadata/core-properties/e2e1c0f9faac4ddb951a90d33184740b.psmdcp",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.amd64.dll",
+        "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll"
+      ]
+    },
    "System.Collections.Immutable/1.1.36": {
      "sha512": "MOlivTIeAIQPPMUPWIIoMCvZczjFRLYUWSYwqi1szu8QPyeIbsaPeI+hpXe1DzTxNwnRnmfYaoToi6kXIfSPNg==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Collections.Immutable.nuspec",
-        "License-Stable.rtf",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
+        "License-Stable.rtf",
        "package/services/metadata/core-properties/c8b7b781850445db852bd2d848380ca6.psmdcp",
-        "[Content_Types].xml"
+        "System.Collections.Immutable.nuspec"
      ]
    },
    "System.Reflection.Metadata/1.1.0-alpha-00014": {
      "sha512": "rVeIWjVoLQS0aNrGdzndZReskyfxu4EfO9BKqT5GJt0YfGtlsHB1aDPnjl4jIBDTr+WJC9YsnZg8S5sKT1X42g==",
      "type": "Package",
      "files": [
+        "[Content_Types].xml",
        "_rels/.rels",
-        "System.Reflection.Metadata.nuspec",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.pdb",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml",
        "package/services/metadata/core-properties/a48ecf967b1540bba8edfe9af3a99ea5.psmdcp",
-        "[Content_Types].xml"
+        "System.Reflection.Metadata.nuspec"
      ]
    }
  },

--- a/src/Compilers/CSharp/csc2/project.lock.json
+++ b/src/Compilers/CSharp/csc2/project.lock.json
--- a/src/Compilers/Core/CodeAnalysisTest/project.lock.json
+++ b/src/Compilers/Core/CodeAnalysisTest/project.lock.json
--- a/src/Compilers/Core/MSBuildTask/project.lock.json
+++ b/src/Compilers/Core/MSBuildTask/project.lock.json
--- a/src/Compilers/Core/MSBuildTaskTests/project.json
+++ b/src/Compilers/Core/MSBuildTaskTests/project.json
--- a/src/Compilers/Core/MSBuildTaskTests/project.lock.json
+++ b/src/Compilers/Core/MSBuildTaskTests/project.lock.json
--- a/src/Compilers/Core/Portable/project.json
+++ b/src/Compilers/Core/Portable/project.json
--- a/src/Compilers/Core/Portable/project.lock.json
+++ b/src/Compilers/Core/Portable/project.lock.json
--- a/src/Compilers/Core/VBCSCompiler/project.lock.json
+++ b/src/Compilers/Core/VBCSCompiler/project.lock.json
--- a/src/Compilers/Core/VBCSCompilerTests/project.json
+++ b/src/Compilers/Core/VBCSCompilerTests/project.json
--- a/src/Compilers/Core/VBCSCompilerTests/project.lock.json
+++ b/src/Compilers/Core/VBCSCompilerTests/project.lock.json
--- a/src/Compilers/Test/Resources/Core/project.lock.json
+++ b/src/Compilers/Test/Resources/Core/project.lock.json
--- a/src/Compilers/Test/Utilities/CSharp/project.lock.json
+++ b/src/Compilers/Test/Utilities/CSharp/project.lock.json
--- a/src/Compilers/Test/Utilities/VisualBasic/project.lock.json
+++ b/src/Compilers/Test/Utilities/VisualBasic/project.lock.json
--- a/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicCompilerDiagnosticAnalyzer.vb
+++ b/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicCompilerDiagnosticAnalyzer.vb
--- a/src/Compilers/VisualBasic/Portable/project.lock.json
+++ b/src/Compilers/VisualBasic/Portable/project.lock.json
--- a/src/Compilers/VisualBasic/Test/CommandLine/project.lock.json
+++ b/src/Compilers/VisualBasic/Test/CommandLine/project.lock.json
--- a/src/Compilers/VisualBasic/Test/Emit/project.json
+++ b/src/Compilers/VisualBasic/Test/Emit/project.json
--- a/src/Compilers/VisualBasic/Test/Emit/project.lock.json
+++ b/src/Compilers/VisualBasic/Test/Emit/project.lock.json
--- a/src/Compilers/VisualBasic/Test/Semantic/project.lock.json
+++ b/src/Compilers/VisualBasic/Test/Semantic/project.lock.json
--- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb
+++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb
--- a/src/Compilers/VisualBasic/Test/Symbol/project.lock.json
+++ b/src/Compilers/VisualBasic/Test/Symbol/project.lock.json
--- a/src/Compilers/VisualBasic/Test/Syntax/project.lock.json
+++ b/src/Compilers/VisualBasic/Test/Syntax/project.lock.json
--- a/src/Compilers/VisualBasic/VbcCore/project.lock.json
+++ b/src/Compilers/VisualBasic/VbcCore/project.lock.json
--- a/src/Compilers/VisualBasic/vbc/project.lock.json
+++ b/src/Compilers/VisualBasic/vbc/project.lock.json
--- a/src/Compilers/VisualBasic/vbc2/project.lock.json
+++ b/src/Compilers/VisualBasic/vbc2/project.lock.json
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/Microsoft.DiaSymReader.PortablePdb.UnitTests.csproj
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/Microsoft.DiaSymReader.PortablePdb.UnitTests.csproj
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.lock.json
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.lock.json
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.csproj
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.csproj
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.lock.json
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.lock.json
--- a/src/EditorFeatures/CSharp/project.lock.json
+++ b/src/EditorFeatures/CSharp/project.lock.json
--- a/src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionTests.cs
+++ b/src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionTests.cs
--- a/src/EditorFeatures/CSharpTest/project.lock.json
+++ b/src/EditorFeatures/CSharpTest/project.lock.json
--- a/src/EditorFeatures/Core/EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/EditorFeatures.csproj
--- a/src/EditorFeatures/Core/EditorFeaturesResources.Designer.cs
+++ b/src/EditorFeatures/Core/EditorFeaturesResources.Designer.cs
--- a/src/EditorFeatures/Core/EditorFeaturesResources.resx
+++ b/src/EditorFeatures/Core/EditorFeaturesResources.resx
--- a/src/EditorFeatures/Core/Implementation/CallHierarchy/CallHierarchyProvider.cs
+++ b/src/EditorFeatures/Core/Implementation/CallHierarchy/CallHierarchyProvider.cs
--- a/src/EditorFeatures/Core/Implementation/EditAndContinue/EditAndContinueDiagnosticUpdateSource.cs
+++ b/src/EditorFeatures/Core/Implementation/EditAndContinue/EditAndContinueDiagnosticUpdateSource.cs
--- a/src/EditorFeatures/Core/Implementation/GoToDefinition/GoToDefinitionHelpers.cs
+++ b/src/EditorFeatures/Core/Implementation/GoToDefinition/GoToDefinitionHelpers.cs
--- a/src/EditorFeatures/Core/Implementation/Suggestions/CodeFixSuggestedAction.cs
+++ b/src/EditorFeatures/Core/Implementation/Suggestions/CodeFixSuggestedAction.cs
--- a/src/EditorFeatures/Core/Implementation/Suggestions/FixAllGetFixesService.cs
+++ b/src/EditorFeatures/Core/Implementation/Suggestions/FixAllGetFixesService.cs
--- a/src/EditorFeatures/Core/Implementation/Suggestions/FixAllSuggestedAction.cs
+++ b/src/EditorFeatures/Core/Implementation/Suggestions/FixAllSuggestedAction.cs
--- a/src/EditorFeatures/Core/Implementation/Suggestions/FixMultipleOccurrencesService.cs
+++ b/src/EditorFeatures/Core/Implementation/Suggestions/FixMultipleOccurrencesService.cs
--- a/src/EditorFeatures/Core/Implementation/Suggestions/FixMultipleSuggestedAction.cs
+++ b/src/EditorFeatures/Core/Implementation/Suggestions/FixMultipleSuggestedAction.cs
--- a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedAction.cs
+++ b/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedAction.cs
--- a/src/EditorFeatures/Core/Implementation/TodoComment/AbstractTodoCommentIncrementalAnalyzer.cs
+++ b/src/EditorFeatures/Core/Implementation/TodoComment/AbstractTodoCommentIncrementalAnalyzer.cs
--- a/src/EditorFeatures/Core/project.lock.json
+++ b/src/EditorFeatures/Core/project.lock.json
--- a/src/EditorFeatures/Test/Diagnostics/DiagnosticProviderTestUtilities.cs
+++ b/src/EditorFeatures/Test/Diagnostics/DiagnosticProviderTestUtilities.cs
--- a/src/EditorFeatures/Test/Diagnostics/DiagnosticServiceTests.cs
+++ b/src/EditorFeatures/Test/Diagnostics/DiagnosticServiceTests.cs
--- a/src/EditorFeatures/Test/Diagnostics/TestDiagnosticAnalyzerDriver.cs
+++ b/src/EditorFeatures/Test/Diagnostics/TestDiagnosticAnalyzerDriver.cs
--- a/src/EditorFeatures/Test/Diagnostics/TestDiagnosticAnalyzerService.cs
+++ b/src/EditorFeatures/Test/Diagnostics/TestDiagnosticAnalyzerService.cs
--- a/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs
+++ b/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs
--- a/src/EditorFeatures/Test/Squiggles/AbstractSquiggleProducerTests.cs
+++ b/src/EditorFeatures/Test/Squiggles/AbstractSquiggleProducerTests.cs
--- a/src/EditorFeatures/Test/project.lock.json
+++ b/src/EditorFeatures/Test/project.lock.json
--- a/src/EditorFeatures/Test2/CodeFixes/CodeFixServiceTests.vb
+++ b/src/EditorFeatures/Test2/CodeFixes/CodeFixServiceTests.vb
--- a/src/EditorFeatures/Test2/Diagnostics/DiagnosticServiceTests.vb
+++ b/src/EditorFeatures/Test2/Diagnostics/DiagnosticServiceTests.vb
--- a/src/EditorFeatures/Test2/Simplification/CastSimplificationTests.vb
+++ b/src/EditorFeatures/Test2/Simplification/CastSimplificationTests.vb
--- a/src/EditorFeatures/Test2/Utilities/MockSymbolNavigationServiceProvider.vb
+++ b/src/EditorFeatures/Test2/Utilities/MockSymbolNavigationServiceProvider.vb
--- a/src/EditorFeatures/Test2/project.lock.json
+++ b/src/EditorFeatures/Test2/project.lock.json
--- a/src/EditorFeatures/TestUtilities/project.lock.json
+++ b/src/EditorFeatures/TestUtilities/project.lock.json
--- a/src/EditorFeatures/Text/project.lock.json
+++ b/src/EditorFeatures/Text/project.lock.json
--- a/src/EditorFeatures/VisualBasic/project.lock.json
+++ b/src/EditorFeatures/VisualBasic/project.lock.json
--- a/src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionTests.vb
--- a/src/EditorFeatures/VisualBasicTest/project.lock.json
+++ b/src/EditorFeatures/VisualBasicTest/project.lock.json
--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj
--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.lock.json
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.lock.json
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/project.lock.json
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/project.lock.json
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.lock.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.lock.json
--- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.lock.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.lock.json
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.lock.json
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.lock.json
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/project.lock.json
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/project.lock.json
--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.lock.json
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.lock.json
--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.lock.json
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.lock.json
--- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj
--- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.lock.json
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.lock.json
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/project.lock.json
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/project.lock.json
--- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
--- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.lock.json
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.lock.json
--- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.lock.json
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.lock.json
--- a/src/Features/CSharp/Portable/project.lock.json
+++ b/src/Features/CSharp/Portable/project.lock.json
--- a/src/Features/Core/Portable/CodeFixes/CodeFixService.cs
+++ b/src/Features/Core/Portable/CodeFixes/CodeFixService.cs
--- a/src/Features/Core/Portable/CodeFixes/FixAllOccurrences/FixAllCodeAction.cs
+++ b/src/Features/Core/Portable/CodeFixes/FixAllOccurrences/FixAllCodeAction.cs
--- a/src/Features/Core/Portable/CodeFixes/FixAllOccurrences/FixMultipleCodeAction.cs
+++ b/src/Features/Core/Portable/CodeFixes/FixAllOccurrences/FixMultipleCodeAction.cs
--- a/src/Features/Core/Portable/CodeFixes/FixAllOccurrences/IFixAllGetFixesService.cs
+++ b/src/Features/Core/Portable/CodeFixes/FixAllOccurrences/IFixAllGetFixesService.cs
--- a/src/Features/Core/Portable/CodeFixes/FixAllOccurrences/IFixMultipleOccurrencesService.cs
+++ b/src/Features/Core/Portable/CodeFixes/FixAllOccurrences/IFixMultipleOccurrencesService.cs
--- a/src/Features/Core/Portable/CodeFixes/ICodeFixService.cs
+++ b/src/Features/Core/Portable/CodeFixes/ICodeFixService.cs
--- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.FixAllProvider.cs
+++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.FixAllProvider.cs
--- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.PragmaWarningBatchFixAllProvider.cs
+++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.PragmaWarningBatchFixAllProvider.cs
--- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.PragmaWarningCodeAction.cs
+++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.PragmaWarningCodeAction.cs
--- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.cs
+++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.cs
--- a/src/Features/Core/Portable/CodeFixes/Suppression/SuppressionHelpers.cs
+++ b/src/Features/Core/Portable/CodeFixes/Suppression/SuppressionHelpers.cs
--- a/src/Features/Core/Portable/Diagnostics/AbstractHostDiagnosticUpdateSource.cs
+++ b/src/Features/Core/Portable/Diagnostics/AbstractHostDiagnosticUpdateSource.cs
--- a/src/Features/Core/Portable/Diagnostics/BaseDiagnosticIncrementalAnalyzer.cs
+++ b/src/Features/Core/Portable/Diagnostics/BaseDiagnosticIncrementalAnalyzer.cs
--- a/src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService.cs
+++ b/src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService.cs
--- a/src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService_IncrementalAnalyzer.cs
+++ b/src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService_IncrementalAnalyzer.cs
--- a/src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService_UpdateSource.cs
+++ b/src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService_UpdateSource.cs
--- a/src/Features/Core/Portable/Diagnostics/DiagnosticData.cs
+++ b/src/Features/Core/Portable/Diagnostics/DiagnosticData.cs
--- a/src/Features/Core/Portable/Diagnostics/DiagnosticService.cs
+++ b/src/Features/Core/Portable/Diagnostics/DiagnosticService.cs
--- a/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticAnalyzerDriver.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticAnalyzerDriver.cs
--- a/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticIncrementalAnalyzer.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticIncrementalAnalyzer.cs
--- a/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticIncrementalAnalyzer_BuildSynchronization.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticIncrementalAnalyzer_BuildSynchronization.cs
--- a/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticIncrementalAnalyzer_GetDiagnostics.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticIncrementalAnalyzer_GetDiagnostics.cs
--- a/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticIncrementalAnalyzer_GetLatestDiagnosticsForSpan.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV1/DiagnosticIncrementalAnalyzer_GetLatestDiagnosticsForSpan.cs
--- a/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.cs
+++ b/src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.cs
--- a/src/Features/Core/Portable/Diagnostics/Extensions.cs
+++ b/src/Features/Core/Portable/Diagnostics/Extensions.cs
--- a/src/Features/Core/Portable/Diagnostics/IDiagnosticAnalyzerService.cs
+++ b/src/Features/Core/Portable/Diagnostics/IDiagnosticAnalyzerService.cs
--- a/src/Features/Core/Portable/Diagnostics/IDiagnosticService.cs
+++ b/src/Features/Core/Portable/Diagnostics/IDiagnosticService.cs
--- a/src/Features/Core/Portable/Diagnostics/IDiagnosticUpdateSource.cs
+++ b/src/Features/Core/Portable/Diagnostics/IDiagnosticUpdateSource.cs
--- a/src/Features/Core/Portable/Diagnostics/InternalDiagnosticsOptions.cs
+++ b/src/Features/Core/Portable/Diagnostics/InternalDiagnosticsOptions.cs
--- a/src/Features/Core/Portable/Features.csproj
+++ b/src/Features/Core/Portable/Features.csproj
--- a/src/Features/Core/Portable/FeaturesResources.Designer.cs
+++ b/src/Features/Core/Portable/FeaturesResources.Designer.cs
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
--- a/src/Features/Core/Portable/MetadataAsSource/AbstractMetadataAsSourceService.cs
+++ b/src/Features/Core/Portable/MetadataAsSource/AbstractMetadataAsSourceService.cs
--- a/src/Features/Core/Portable/Navigation/DefaultSymbolNavigationService.cs
+++ b/src/Features/Core/Portable/Navigation/DefaultSymbolNavigationService.cs
--- a/src/Features/Core/Portable/Navigation/ISymbolNavigationService.cs
+++ b/src/Features/Core/Portable/Navigation/ISymbolNavigationService.cs
--- a/src/Features/Core/Portable/project.lock.json
+++ b/src/Features/Core/Portable/project.lock.json
--- a/src/Features/VisualBasic/Portable/project.lock.json
+++ b/src/Features/VisualBasic/Portable/project.lock.json
--- a/src/Interactive/EditorFeatures/CSharp/project.lock.json
+++ b/src/Interactive/EditorFeatures/CSharp/project.lock.json
--- a/src/Interactive/EditorFeatures/Core/project.lock.json
+++ b/src/Interactive/EditorFeatures/Core/project.lock.json
--- a/src/Interactive/EditorFeatures/VisualBasic/project.lock.json
+++ b/src/Interactive/EditorFeatures/VisualBasic/project.lock.json
--- a/src/Interactive/Features/project.lock.json
+++ b/src/Interactive/Features/project.lock.json
--- a/src/Interactive/Host/project.lock.json
+++ b/src/Interactive/Host/project.lock.json
--- a/src/Interactive/HostTest/project.lock.json
+++ b/src/Interactive/HostTest/project.lock.json
--- a/src/Interactive/csi/project.lock.json
+++ b/src/Interactive/csi/project.lock.json
--- a/src/Interactive/vbi/project.lock.json
+++ b/src/Interactive/vbi/project.lock.json
--- a/src/InteractiveWindow/Editor/InteractiveWindow.csproj
+++ b/src/InteractiveWindow/Editor/InteractiveWindow.csproj
--- a/src/InteractiveWindow/EditorTest/project.lock.json
+++ b/src/InteractiveWindow/EditorTest/project.lock.json
--- a/src/InteractiveWindow/VisualStudio/InteractiveWindowPackage.cs
+++ b/src/InteractiveWindow/VisualStudio/InteractiveWindowPackage.cs
--- a/src/InteractiveWindow/VisualStudio/VisualStudioInteractiveWindow.csproj
+++ b/src/InteractiveWindow/VisualStudio/VisualStudioInteractiveWindow.csproj
--- a/src/InteractiveWindow/VisualStudio/project.lock.json
+++ b/src/InteractiveWindow/VisualStudio/project.lock.json
--- a/src/Samples/CSharp/APISampleUnitTests/project.lock.json
+++ b/src/Samples/CSharp/APISampleUnitTests/project.lock.json
--- a/src/Samples/CSharp/ConsoleClassifier/project.lock.json
+++ b/src/Samples/CSharp/ConsoleClassifier/project.lock.json
--- a/src/Samples/CSharp/ConvertToAutoProperty/Impl/project.lock.json
+++ b/src/Samples/CSharp/ConvertToAutoProperty/Impl/project.lock.json
--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.lock.json
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.lock.json
--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.lock.json
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.lock.json
--- a/src/Samples/CSharp/MakeConst/Impl/project.lock.json
+++ b/src/Samples/CSharp/MakeConst/Impl/project.lock.json
--- a/src/Samples/CSharp/MakeConst/Test/project.lock.json
+++ b/src/Samples/CSharp/MakeConst/Test/project.lock.json
--- a/src/Samples/Shared/UnitTestFramework/project.lock.json
+++ b/src/Samples/Shared/UnitTestFramework/project.lock.json
--- a/src/Samples/VisualBasic/APISampleUnitTests/project.lock.json
+++ b/src/Samples/VisualBasic/APISampleUnitTests/project.lock.json
--- a/src/Samples/VisualBasic/ConsoleClassifier/project.lock.json
+++ b/src/Samples/VisualBasic/ConsoleClassifier/project.lock.json
--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.lock.json
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.lock.json
--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.lock.json
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.lock.json
--- a/src/Samples/VisualBasic/FormatSolution/project.lock.json
+++ b/src/Samples/VisualBasic/FormatSolution/project.lock.json
--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.lock.json
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.lock.json
--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.lock.json
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.lock.json
--- a/src/Samples/VisualBasic/MakeConst/Impl/project.lock.json
+++ b/src/Samples/VisualBasic/MakeConst/Impl/project.lock.json
--- a/src/Samples/VisualBasic/MakeConst/Test/project.lock.json
+++ b/src/Samples/VisualBasic/MakeConst/Test/project.lock.json
--- a/src/Scripting/CSharp/project.lock.json
+++ b/src/Scripting/CSharp/project.lock.json
--- a/src/Scripting/CSharpTest.Desktop/project.lock.json
+++ b/src/Scripting/CSharpTest.Desktop/project.lock.json
--- a/src/Scripting/CSharpTest/project.lock.json
+++ b/src/Scripting/CSharpTest/project.lock.json
--- a/src/Scripting/Core/project.lock.json
+++ b/src/Scripting/Core/project.lock.json
--- a/src/Scripting/CoreTest.Desktop/project.lock.json
+++ b/src/Scripting/CoreTest.Desktop/project.lock.json
--- a/src/Scripting/CoreTest/project.lock.json
+++ b/src/Scripting/CoreTest/project.lock.json
--- a/src/Scripting/VisualBasic/project.lock.json
+++ b/src/Scripting/VisualBasic/project.lock.json
--- a/src/Scripting/VisualBasicTest.Desktop/project.lock.json
+++ b/src/Scripting/VisualBasicTest.Desktop/project.lock.json
--- a/src/Scripting/VisualBasicTest/project.lock.json
+++ b/src/Scripting/VisualBasicTest/project.lock.json
--- a/src/Test/Diagnostics/project.lock.json
+++ b/src/Test/Diagnostics/project.lock.json
--- a/src/Test/PdbUtilities/PdbUtilities.csproj
+++ b/src/Test/PdbUtilities/PdbUtilities.csproj
--- a/src/Test/PdbUtilities/project.json
+++ b/src/Test/PdbUtilities/project.json
--- a/src/Test/PdbUtilities/project.lock.json
+++ b/src/Test/PdbUtilities/project.lock.json
--- a/src/Test/Utilities/Desktop/project.json
+++ b/src/Test/Utilities/Desktop/project.json
--- a/src/Test/Utilities/Desktop/project.lock.json
+++ b/src/Test/Utilities/Desktop/project.lock.json
--- a/src/Test/Utilities/Portable.FX45/project.json
+++ b/src/Test/Utilities/Portable.FX45/project.json
--- a/src/Test/Utilities/Portable.FX45/project.lock.json
+++ b/src/Test/Utilities/Portable.FX45/project.lock.json
--- a/src/Test/Utilities/Portable/TestUtilities.csproj
+++ b/src/Test/Utilities/Portable/TestUtilities.csproj
--- a/src/Test/Utilities/Portable/project.lock.json
+++ b/src/Test/Utilities/Portable/project.lock.json
--- a/src/Test/Utilities/Runtime.FX46/project.lock.json
+++ b/src/Test/Utilities/Runtime.FX46/project.lock.json
--- a/src/Tools/Source/FakeSign/project.lock.json
+++ b/src/Tools/Source/FakeSign/project.lock.json
--- a/src/Tools/Source/MetadataVisualizer/project.lock.json
+++ b/src/Tools/Source/MetadataVisualizer/project.lock.json
--- a/src/Tools/Source/Pdb2Xml/project.json
+++ b/src/Tools/Source/Pdb2Xml/project.json
--- a/src/Tools/Source/Pdb2Xml/project.lock.json
+++ b/src/Tools/Source/Pdb2Xml/project.lock.json
--- a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs
+++ b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs
--- a/src/VisualStudio/CSharp/Impl/project.lock.json
+++ b/src/VisualStudio/CSharp/Impl/project.lock.json
--- a/src/VisualStudio/CSharp/Repl/project.lock.json
+++ b/src/VisualStudio/CSharp/Repl/project.lock.json
--- a/src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs
+++ b/src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs
--- a/src/VisualStudio/CSharp/Test/project.lock.json
+++ b/src/VisualStudio/CSharp/Test/project.lock.json
--- a/src/VisualStudio/Core/Def/Commands.vsct
+++ b/src/VisualStudio/Core/Def/Commands.vsct
--- a/src/VisualStudio/Core/Def/ID.RoslynCommands.cs
+++ b/src/VisualStudio/Core/Def/ID.RoslynCommands.cs
--- a/src/VisualStudio/Core/Def/Implementation/Diagnostics/MiscellaneousDiagnosticAnalyzerService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Diagnostics/MiscellaneousDiagnosticAnalyzerService.cs
--- a/src/VisualStudio/Core/Def/Implementation/Library/FindResults/TreeItems/MetadataDefinitionTreeItem.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Library/FindResults/TreeItems/MetadataDefinitionTreeItem.cs
--- a/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPaneService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPaneService.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/AbstractTableControlEventProcessorProvider.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/AbstractTableControlEventProcessorProvider.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/AbstractTableEntriesSnapshot.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/AbstractTableEntriesSnapshot.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/DiagnosticTableControlEventProcessorProvider.AggregateDiagnosticTableControlEventProcessor.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/DiagnosticTableControlEventProcessorProvider.AggregateDiagnosticTableControlEventProcessor.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/DiagnosticTableControlEventProcessorProvider.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/DiagnosticTableControlEventProcessorProvider.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/DiagnosticTableControlEventProcessorProvider.SuppressionStateProcessor.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/DiagnosticTableControlEventProcessorProvider.SuppressionStateProcessor.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/IVisualStudioDiagnosticListSuppressionStateService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/IVisualStudioDiagnosticListSuppressionStateService.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/IVisualStudioSuppressionFixService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/IVisualStudioSuppressionFixService.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/SuppressionStateColumnDefinition.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/SuppressionStateColumnDefinition.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioDiagnosticListSuppressionStateService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioDiagnosticListSuppressionStateService.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioDiagnosticListTableCommandHandler.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioDiagnosticListTableCommandHandler.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioSuppressionFixService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioSuppressionFixService.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioBaseDiagnosticListTable.LiveTableDataSource.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioBaseDiagnosticListTable.LiveTableDataSource.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioBaseDiagnosticListTable.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioBaseDiagnosticListTable.cs
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs
--- a/src/VisualStudio/Core/Def/Implementation/TaskList/ExternalErrorDiagnosticUpdateSource.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TaskList/ExternalErrorDiagnosticUpdateSource.cs
--- a/src/VisualStudio/Core/Def/Implementation/Utilities/BrowserHelper.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Utilities/BrowserHelper.cs
--- a/src/VisualStudio/Core/Def/Implementation/Watson/WatsonErrorReport.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Watson/WatsonErrorReport.cs
--- a/src/VisualStudio/Core/Def/Implementation/Watson/WatsonReporter.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Watson/WatsonReporter.cs
--- a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioSymbolNavigationService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioSymbolNavigationService.cs
--- a/src/VisualStudio/Core/Def/RoslynPackage.cs
+++ b/src/VisualStudio/Core/Def/RoslynPackage.cs
--- a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
--- a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
+++ b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
--- a/src/VisualStudio/Core/Def/project.json
+++ b/src/VisualStudio/Core/Def/project.json
--- a/src/VisualStudio/Core/Def/project.lock.json
+++ b/src/VisualStudio/Core/Def/project.lock.json
--- a/src/VisualStudio/Core/Impl/project.lock.json
+++ b/src/VisualStudio/Core/Impl/project.lock.json
--- a/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.cs
+++ b/src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItem.cs
--- a/src/VisualStudio/Core/SolutionExplorerShim/project.lock.json
+++ b/src/VisualStudio/Core/SolutionExplorerShim/project.lock.json
--- a/src/VisualStudio/Core/Test/Diagnostics/DiagnosticTableDataSourceTests.vb
+++ b/src/VisualStudio/Core/Test/Diagnostics/DiagnosticTableDataSourceTests.vb
--- a/src/VisualStudio/Core/Test/Diagnostics/ExternalDiagnosticUpdateSourceTests.vb
+++ b/src/VisualStudio/Core/Test/Diagnostics/ExternalDiagnosticUpdateSourceTests.vb
--- a/src/VisualStudio/Core/Test/EditAndContinue/EditAndContinueTestHelper.vb
+++ b/src/VisualStudio/Core/Test/EditAndContinue/EditAndContinueTestHelper.vb
--- a/src/VisualStudio/Core/Test/Help/HelpTests.vb
+++ b/src/VisualStudio/Core/Test/Help/HelpTests.vb
--- a/src/VisualStudio/Core/Test/project.lock.json
+++ b/src/VisualStudio/Core/Test/project.lock.json
--- a/src/VisualStudio/InteractiveServices/Interactive/VsInteractiveWindowPackage.cs
+++ b/src/VisualStudio/InteractiveServices/Interactive/VsInteractiveWindowPackage.cs
--- a/src/VisualStudio/InteractiveServices/project.lock.json
+++ b/src/VisualStudio/InteractiveServices/project.lock.json
--- a/src/VisualStudio/Setup/project.lock.json
+++ b/src/VisualStudio/Setup/project.lock.json
--- a/src/VisualStudio/SetupInteractive/project.lock.json
+++ b/src/VisualStudio/SetupInteractive/project.lock.json
--- a/src/VisualStudio/VisualBasic/Impl/Help/VisualBasicHelpContextService.Visitor.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Help/VisualBasicHelpContextService.Visitor.vb
--- a/src/VisualStudio/VisualBasic/Impl/Help/VisualBasicHelpContextService.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Help/VisualBasicHelpContextService.vb
--- a/src/VisualStudio/VisualBasic/Impl/project.lock.json
+++ b/src/VisualStudio/VisualBasic/Impl/project.lock.json
--- a/src/VisualStudio/VisualBasic/Repl/project.lock.json
+++ b/src/VisualStudio/VisualBasic/Repl/project.lock.json
--- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/project.lock.json
+++ b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/project.lock.json
--- a/src/VisualStudio/VisualStudioInteractiveComponents/project.lock.json
+++ b/src/VisualStudio/VisualStudioInteractiveComponents/project.lock.json
--- a/src/Workspaces/CSharp/Portable/CodeGeneration/CSharpCodeGenerationService.cs
+++ b/src/Workspaces/CSharp/Portable/CodeGeneration/CSharpCodeGenerationService.cs
--- a/src/Workspaces/CSharp/Portable/CodeGeneration/NamedTypeGenerator.cs
+++ b/src/Workspaces/CSharp/Portable/CodeGeneration/NamedTypeGenerator.cs
--- a/src/Workspaces/CSharp/Portable/CodeGeneration/NamespaceGenerator.cs
+++ b/src/Workspaces/CSharp/Portable/CodeGeneration/NamespaceGenerator.cs
--- a/src/Workspaces/CSharp/Portable/Utilities/SpeculationAnalyzer.cs
+++ b/src/Workspaces/CSharp/Portable/Utilities/SpeculationAnalyzer.cs
--- a/src/Workspaces/CSharp/Portable/project.lock.json
+++ b/src/Workspaces/CSharp/Portable/project.lock.json
--- a/src/Workspaces/CSharpTest/project.lock.json
+++ b/src/Workspaces/CSharpTest/project.lock.json
--- a/src/Workspaces/Core/Desktop/project.lock.json
+++ b/src/Workspaces/Core/Desktop/project.lock.json
--- a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixAllContext.cs
+++ b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixAllContext.cs
--- a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixMultipleContext.DiagnosticProvider.cs
+++ b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixMultipleContext.DiagnosticProvider.cs
--- a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixMultipleContext.cs
+++ b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixMultipleContext.cs
--- a/src/Workspaces/Core/Portable/CodeGeneration/AbstractCodeGenerationService.cs
+++ b/src/Workspaces/Core/Portable/CodeGeneration/AbstractCodeGenerationService.cs
--- a/src/Workspaces/Core/Portable/CodeGeneration/ICodeGenerationService.cs
+++ b/src/Workspaces/Core/Portable/CodeGeneration/ICodeGenerationService.cs
--- a/src/Workspaces/Core/Portable/Log/FunctionId.cs
+++ b/src/Workspaces/Core/Portable/Log/FunctionId.cs
--- a/src/Workspaces/Core/Portable/Workspaces.csproj
+++ b/src/Workspaces/Core/Portable/Workspaces.csproj
--- a/src/Workspaces/Core/Portable/project.lock.json
+++ b/src/Workspaces/Core/Portable/project.lock.json
--- a/src/Workspaces/CoreTest/project.lock.json
+++ b/src/Workspaces/CoreTest/project.lock.json
--- a/src/Workspaces/VisualBasic/Portable/CodeGeneration/NamedTypeGenerator.vb
+++ b/src/Workspaces/VisualBasic/Portable/CodeGeneration/NamedTypeGenerator.vb
--- a/src/Workspaces/VisualBasic/Portable/CodeGeneration/NamespaceGenerator.vb
+++ b/src/Workspaces/VisualBasic/Portable/CodeGeneration/NamespaceGenerator.vb
--- a/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationService.vb
+++ b/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationService.vb
--- a/src/Workspaces/VisualBasic/Portable/project.lock.json
+++ b/src/Workspaces/VisualBasic/Portable/project.lock.json
--- a/src/Workspaces/VisualBasicTest/project.lock.json
+++ b/src/Workspaces/VisualBasicTest/project.lock.json