fix merge conflict from stabilization to master

c93ee342 · Heejae Chang · ac7c0663 · 44b03197 · c93ee342 · c93ee342
183 changed file
--- a/build/Targets/VSL.Versions.targets
+++ b/build/Targets/VSL.Versions.targets
@@ -5,7 +5,7 @@
    <SystemCollectionsImmutableAssemblyVersion Condition="'$(SystemCollectionsImmutableAssemblyVersion)' == ''">1.1.37</SystemCollectionsImmutableAssemblyVersion>
    <NuGetCommandLineAssemblyVersion Condition="'$(NuGetCommandLineAssemblyVersion)' == ''">2.8.5</NuGetCommandLineAssemblyVersion>
    <MicrosoftCompositionAssemblyVersion Condition="'$(MicrosoftCompositionAssemblyVersion)' == ''">1.0.27</MicrosoftCompositionAssemblyVersion>
-    <SystemReflectionMetadataVersion>$(SystemReflectionMetadataAssemblyVersion)-rc2-23826</SystemReflectionMetadataVersion>
+    <SystemReflectionMetadataVersion>$(SystemReflectionMetadataAssemblyVersion)</SystemReflectionMetadataVersion>
    <SystemCollectionsImmutableVersion>$(SystemCollectionsImmutableAssemblyVersion)</SystemCollectionsImmutableVersion>
    <MicrosoftDiaSymReaderNativeVersion>1.3.3</MicrosoftDiaSymReaderNativeVersion>
    <NuGetCommandLineVersion>$(NuGetCommandLineAssemblyVersion)</NuGetCommandLineVersion>

--- a/src/Compilers/CSharp/CscCore/project.lock.json
+++ b/src/Compilers/CSharp/CscCore/project.lock.json
@@ -511,7 +511,7 @@
          "lib/DNXCore50/System.Reflection.Extensions.dll": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections": "4.0.0",
          "System.Collections.Immutable": "1.1.37",
@@ -530,10 +530,10 @@
          "System.Threading": "4.0.0"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Reflection.Primitives/4.0.1-beta-23504": {
@@ -1795,7 +1795,7 @@
          "lib/DNXCore50/System.Reflection.Extensions.dll": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections": "4.0.0",
          "System.Collections.Immutable": "1.1.37",
@@ -1814,10 +1814,10 @@
          "System.Threading": "4.0.0"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Reflection.Primitives/4.0.1-beta-23504": {
@@ -3149,7 +3149,7 @@
          "lib/DNXCore50/System.Reflection.Extensions.dll": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections": "4.0.0",
          "System.Collections.Immutable": "1.1.37",
@@ -3168,10 +3168,10 @@
          "System.Threading": "4.0.0"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Reflection.Primitives/4.0.1-beta-23504": {
@@ -4654,7 +4654,7 @@
          "lib/DNXCore50/System.Reflection.Extensions.dll": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections": "4.0.0",
          "System.Collections.Immutable": "1.1.37",
@@ -4673,10 +4673,10 @@
          "System.Threading": "4.0.0"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Reflection.Primitives/4.0.1-beta-23504": {
@@ -7735,16 +7735,16 @@
        "runtimes/win8-aot/lib/netcore50/System.Reflection.Extensions.dll"
      ]
    },
-    "System.Reflection.Metadata/1.2.0-rc2-23826": {
-      "sha512": "iaq5zpluF7mUMd5hFyhmZGyCSzF6glZjvNI2VAhLFQEp8sGA/tROj6NoZL42q6HhoHxi1XyGeoIXPi5hyw0+5w==",
+    "System.Reflection.Metadata/1.2.0": {
+      "sha512": "ubQKFCNYPwhqPXPLjRKCvTDR2UvL5L5+Tm181D/5kl/df7264AuXDi2j2Bf5DxplBxevq8eUH9LRomcFCXTQKw==",
      "type": "package",
      "files": [
-        "System.Reflection.Metadata.1.2.0-rc2-23826.nupkg.sha512",
+        "System.Reflection.Metadata.1.2.0.nupkg.sha512",
        "System.Reflection.Metadata.nuspec",
        "ThirdPartyNotices.txt",
        "dotnet_library_license.txt",
-        "lib/dotnet5.2/System.Reflection.Metadata.dll",
-        "lib/dotnet5.2/System.Reflection.Metadata.xml",
+        "lib/netstandard1.1/System.Reflection.Metadata.dll",
+        "lib/netstandard1.1/System.Reflection.Metadata.xml",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml"
      ]

--- a/src/Compilers/CSharp/Portable/project.lock.json
+++ b/src/Compilers/CSharp/Portable/project.lock.json
@@ -11,9 +11,9 @@
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
-          "System.Collections.Immutable": "[1.1.37, )"
+          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
@@ -27,32 +27,28 @@
  "libraries": {
    "System.Collections.Immutable/1.1.37": {
      "sha512": "fTpqwZYBzoklTT+XjTRK8KxvmrGkYHzBiylCcKyQcxiOM8k+QvhNBxRvFHDWzy4OEP5f8/9n+xQ9mEgEXY+muA==",
-      "type": "Package",
+      "type": "package",
      "files": [
-        "[Content_Types].xml",
-        "_rels/.rels",
+        "System.Collections.Immutable.1.1.37.nupkg.sha512",
+        "System.Collections.Immutable.nuspec",
        "lib/dotnet/System.Collections.Immutable.dll",
        "lib/dotnet/System.Collections.Immutable.xml",
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
-        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
-        "package/services/metadata/core-properties/a02fdeabe1114a24bba55860b8703852.psmdcp",
-        "System.Collections.Immutable.nuspec"
+        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml"
      ]
    },
-    "System.Reflection.Metadata/1.2.0-rc2-23826": {
-      "sha512": "iaq5zpluF7mUMd5hFyhmZGyCSzF6glZjvNI2VAhLFQEp8sGA/tROj6NoZL42q6HhoHxi1XyGeoIXPi5hyw0+5w==",
-      "type": "Package",
+    "System.Reflection.Metadata/1.2.0": {
+      "sha512": "ubQKFCNYPwhqPXPLjRKCvTDR2UvL5L5+Tm181D/5kl/df7264AuXDi2j2Bf5DxplBxevq8eUH9LRomcFCXTQKw==",
+      "type": "package",
      "files": [
-        "[Content_Types].xml",
-        "_rels/.rels",
+        "System.Reflection.Metadata.1.2.0.nupkg.sha512",
+        "System.Reflection.Metadata.nuspec",
+        "ThirdPartyNotices.txt",
        "dotnet_library_license.txt",
-        "lib/dotnet5.2/System.Reflection.Metadata.dll",
-        "lib/dotnet5.2/System.Reflection.Metadata.xml",
+        "lib/netstandard1.1/System.Reflection.Metadata.dll",
+        "lib/netstandard1.1/System.Reflection.Metadata.xml",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
-        "lib/portable-net45+win8/System.Reflection.Metadata.xml",
-        "package/services/metadata/core-properties/26ea3eeed81e48b5a161d7b4bfaa534d.psmdcp",
-        "System.Reflection.Metadata.nuspec",
-        "ThirdPartyNotices.txt"
+        "lib/portable-net45+win8/System.Reflection.Metadata.xml"
      ]
    }
  },

--- a/src/Compilers/CSharp/Test/CommandLine/project.lock.json
+++ b/src/Compilers/CSharp/Test/CommandLine/project.lock.json
--- a/src/Compilers/CSharp/Test/Emit/project.lock.json
+++ b/src/Compilers/CSharp/Test/Emit/project.lock.json
--- a/src/Compilers/CSharp/Test/Performance/project.lock.json
+++ b/src/Compilers/CSharp/Test/Performance/project.lock.json
@@ -156,15 +156,15 @@
          "lib/net46/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -428,15 +428,15 @@
          "lib/net46/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -700,15 +700,15 @@
          "lib/net46/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -1170,16 +1170,16 @@
        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
      ]
    },
-    "System.Reflection.Metadata/1.2.0-rc2-23826": {
-      "sha512": "iaq5zpluF7mUMd5hFyhmZGyCSzF6glZjvNI2VAhLFQEp8sGA/tROj6NoZL42q6HhoHxi1XyGeoIXPi5hyw0+5w==",
+    "System.Reflection.Metadata/1.2.0": {
+      "sha512": "ubQKFCNYPwhqPXPLjRKCvTDR2UvL5L5+Tm181D/5kl/df7264AuXDi2j2Bf5DxplBxevq8eUH9LRomcFCXTQKw==",
      "type": "package",
      "files": [
-        "System.Reflection.Metadata.1.2.0-rc2-23826.nupkg.sha512",
+        "System.Reflection.Metadata.1.2.0.nupkg.sha512",
        "System.Reflection.Metadata.nuspec",
        "ThirdPartyNotices.txt",
        "dotnet_library_license.txt",
-        "lib/dotnet5.2/System.Reflection.Metadata.dll",
-        "lib/dotnet5.2/System.Reflection.Metadata.xml",
+        "lib/netstandard1.1/System.Reflection.Metadata.dll",
+        "lib/netstandard1.1/System.Reflection.Metadata.xml",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml"
      ]

--- a/src/Compilers/CSharp/Test/Semantic/project.lock.json
+++ b/src/Compilers/CSharp/Test/Semantic/project.lock.json
--- a/src/Compilers/CSharp/Test/Symbol/project.lock.json
+++ b/src/Compilers/CSharp/Test/Symbol/project.lock.json
--- a/src/Compilers/CSharp/Test/Syntax/project.lock.json
+++ b/src/Compilers/CSharp/Test/Syntax/project.lock.json
@@ -245,29 +245,15 @@
          "ref/dotnet/System.Reflection.Extensions.dll": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
-          "System.Collections": "4.0.0",
-          "System.Collections.Immutable": "1.1.37",
-          "System.Diagnostics.Debug": "4.0.0",
-          "System.IO": "4.0.0",
-          "System.Linq": "4.0.0",
-          "System.Reflection": "4.0.0",
-          "System.Reflection.Extensions": "4.0.0",
-          "System.Reflection.Primitives": "4.0.0",
-          "System.Resources.ResourceManager": "4.0.0",
-          "System.Runtime": "4.0.0",
-          "System.Runtime.Extensions": "4.0.0",
-          "System.Runtime.InteropServices": "4.0.0",
-          "System.Text.Encoding": "4.0.0",
-          "System.Text.Encoding.Extensions": "4.0.0",
-          "System.Threading": "4.0.0"
+          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Reflection.Primitives/4.0.0": {
@@ -1240,16 +1226,16 @@
        "runtimes/win8-aot/lib/netcore50/System.Reflection.Extensions.dll"
      ]
    },
-    "System.Reflection.Metadata/1.2.0-rc2-23826": {
-      "sha512": "iaq5zpluF7mUMd5hFyhmZGyCSzF6glZjvNI2VAhLFQEp8sGA/tROj6NoZL42q6HhoHxi1XyGeoIXPi5hyw0+5w==",
+    "System.Reflection.Metadata/1.2.0": {
+      "sha512": "ubQKFCNYPwhqPXPLjRKCvTDR2UvL5L5+Tm181D/5kl/df7264AuXDi2j2Bf5DxplBxevq8eUH9LRomcFCXTQKw==",
      "type": "package",
      "files": [
-        "System.Reflection.Metadata.1.2.0-rc2-23826.nupkg.sha512",
+        "System.Reflection.Metadata.1.2.0.nupkg.sha512",
        "System.Reflection.Metadata.nuspec",
        "ThirdPartyNotices.txt",
        "dotnet_library_license.txt",
-        "lib/dotnet5.2/System.Reflection.Metadata.dll",
-        "lib/dotnet5.2/System.Reflection.Metadata.xml",
+        "lib/netstandard1.1/System.Reflection.Metadata.dll",
+        "lib/netstandard1.1/System.Reflection.Metadata.xml",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml"
      ]

--- 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
@@ -54,15 +54,15 @@
          "lib/net45/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -150,15 +150,15 @@
          "lib/net45/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -246,15 +246,15 @@
          "lib/net45/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -342,15 +342,15 @@
          "lib/net45/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -438,15 +438,15 @@
          "lib/net45/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -534,15 +534,15 @@
          "lib/net45/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -630,15 +630,15 @@
          "lib/net45/_._": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
        },
        "compile": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        },
        "runtime": {
-          "lib/dotnet5.2/System.Reflection.Metadata.dll": {}
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
        }
      },
      "System.Resources.ResourceManager/4.0.0": {
@@ -875,16 +875,16 @@
        "ref/wpa81/_._"
      ]
    },
-    "System.Reflection.Metadata/1.2.0-rc2-23826": {
-      "sha512": "iaq5zpluF7mUMd5hFyhmZGyCSzF6glZjvNI2VAhLFQEp8sGA/tROj6NoZL42q6HhoHxi1XyGeoIXPi5hyw0+5w==",
+    "System.Reflection.Metadata/1.2.0": {
+      "sha512": "ubQKFCNYPwhqPXPLjRKCvTDR2UvL5L5+Tm181D/5kl/df7264AuXDi2j2Bf5DxplBxevq8eUH9LRomcFCXTQKw==",
      "type": "package",
      "files": [
-        "System.Reflection.Metadata.1.2.0-rc2-23826.nupkg.sha512",
+        "System.Reflection.Metadata.1.2.0.nupkg.sha512",
        "System.Reflection.Metadata.nuspec",
        "ThirdPartyNotices.txt",
        "dotnet_library_license.txt",
-        "lib/dotnet5.2/System.Reflection.Metadata.dll",
-        "lib/dotnet5.2/System.Reflection.Metadata.xml",
+        "lib/netstandard1.1/System.Reflection.Metadata.dll",
+        "lib/netstandard1.1/System.Reflection.Metadata.xml",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml"
      ]

--- a/src/Compilers/Core/CodeAnalysisTest/project.lock.json
+++ b/src/Compilers/Core/CodeAnalysisTest/project.lock.json
--- a/src/Compilers/Core/MSBuildTask/Desktop/project.lock.json
+++ b/src/Compilers/Core/MSBuildTask/Desktop/project.lock.json
--- a/src/Compilers/Core/MSBuildTask/Portable/project.lock.json
+++ b/src/Compilers/Core/MSBuildTask/Portable/project.lock.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
@@ -2,7 +2,7 @@
  "supports": {},
  "dependencies": {
    "System.Collections.Immutable": "1.1.37",
-    "System.Reflection.Metadata": "1.2.0-rc2-23826"
+    "System.Reflection.Metadata": "1.2.0"
  },
  "frameworks": {
    ".NETPortable,Version=v4.5,Profile=Profile7": {}

--- a/src/Compilers/Core/Portable/project.lock.json
+++ b/src/Compilers/Core/Portable/project.lock.json
@@ -12,7 +12,7 @@
          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
        }
      },
-      "System.Reflection.Metadata/1.2.0-rc2-23826": {
+      "System.Reflection.Metadata/1.2.0": {
        "type": "package",
        "dependencies": {
          "System.Collections.Immutable": "1.1.37"
@@ -39,16 +39,16 @@
        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml"
      ]
    },
-    "System.Reflection.Metadata/1.2.0-rc2-23826": {
-      "sha512": "iaq5zpluF7mUMd5hFyhmZGyCSzF6glZjvNI2VAhLFQEp8sGA/tROj6NoZL42q6HhoHxi1XyGeoIXPi5hyw0+5w==",
+    "System.Reflection.Metadata/1.2.0": {
+      "sha512": "ubQKFCNYPwhqPXPLjRKCvTDR2UvL5L5+Tm181D/5kl/df7264AuXDi2j2Bf5DxplBxevq8eUH9LRomcFCXTQKw==",
      "type": "package",
      "files": [
-        "System.Reflection.Metadata.1.2.0-rc2-23826.nupkg.sha512",
+        "System.Reflection.Metadata.1.2.0.nupkg.sha512",
        "System.Reflection.Metadata.nuspec",
        "ThirdPartyNotices.txt",
        "dotnet_library_license.txt",
-        "lib/dotnet5.2/System.Reflection.Metadata.dll",
-        "lib/dotnet5.2/System.Reflection.Metadata.xml",
+        "lib/netstandard1.1/System.Reflection.Metadata.dll",
+        "lib/netstandard1.1/System.Reflection.Metadata.xml",
        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
        "lib/portable-net45+win8/System.Reflection.Metadata.xml"
      ]
@@ -57,7 +57,7 @@
  "projectFileDependencyGroups": {
    "": [
      "System.Collections.Immutable >= 1.1.37",
-      "System.Reflection.Metadata >= 1.2.0-rc2-23826"
+      "System.Reflection.Metadata >= 1.2.0"
    ],
    ".NETPortable,Version=v4.5,Profile=Profile7": []
  }

--- a/src/Compilers/Extension/project.lock.json
+++ b/src/Compilers/Extension/project.lock.json
--- a/src/Compilers/Server/PortableServer/project.lock.json
+++ b/src/Compilers/Server/PortableServer/project.lock.json
--- a/src/Compilers/Server/VBCSCompiler/project.json
+++ b/src/Compilers/Server/VBCSCompiler/project.json
 {
  "dependencies": { 
    "System.Collections.Immutable": "1.1.37",
-    "System.Reflection.Metadata": "1.2.0-rc2-23826",
+    "System.Reflection.Metadata": "1.2.0",
  },
  "frameworks": {
    "net45": { }

--- a/src/Compilers/Server/VBCSCompiler/project.lock.json
+++ b/src/Compilers/Server/VBCSCompiler/project.lock.json
--- a/src/Compilers/Server/VBCSCompilerTests/project.lock.json
+++ b/src/Compilers/Server/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.Desktop/project.lock.json
+++ b/src/Compilers/Test/Utilities/CSharp.Desktop/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/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.lock.json
+++ b/src/Compilers/VisualBasic/Test/Emit/project.lock.json
--- a/src/Compilers/VisualBasic/Test/Performance/project.lock.json
+++ b/src/Compilers/VisualBasic/Test/Performance/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/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/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
--- 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.nuspec
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.nuspec
--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Version.targets
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Version.targets
--- 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/project.lock.json
+++ b/src/EditorFeatures/CSharpTest/project.lock.json
--- a/src/EditorFeatures/CSharpTest2/project.lock.json
+++ b/src/EditorFeatures/CSharpTest2/project.lock.json
--- a/src/EditorFeatures/Core/project.lock.json
+++ b/src/EditorFeatures/Core/project.lock.json
--- a/src/EditorFeatures/Test/project.lock.json
+++ b/src/EditorFeatures/Test/project.lock.json
--- a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj
+++ b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj
--- a/src/EditorFeatures/Test2/Expansion/LambdaParameterExpansionTests.vb
+++ b/src/EditorFeatures/Test2/Expansion/LambdaParameterExpansionTests.vb
--- a/src/EditorFeatures/Test2/Rename/RenameEngineTests.vb
+++ b/src/EditorFeatures/Test2/Rename/RenameEngineTests.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/project.lock.json
+++ b/src/EditorFeatures/VisualBasicTest/project.lock.json
--- 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.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/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.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/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.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/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/CsiCore/project.lock.json
+++ b/src/Interactive/CsiCore/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/VbiCore/project.lock.json
+++ b/src/Interactive/VbiCore/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/EditorTest/project.lock.json
+++ b/src/InteractiveWindow/EditorTest/project.lock.json
--- a/src/Samples/CSharp/APISampleUnitTests/project.json
+++ b/src/Samples/CSharp/APISampleUnitTests/project.json
--- a/src/Samples/CSharp/APISampleUnitTests/project.lock.json
+++ b/src/Samples/CSharp/APISampleUnitTests/project.lock.json
--- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json
+++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json
--- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.lock.json
+++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.lock.json
--- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json
+++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json
--- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.lock.json
+++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.lock.json
--- a/src/Samples/CSharp/ConsoleClassifier/project.json
+++ b/src/Samples/CSharp/ConsoleClassifier/project.json
--- a/src/Samples/CSharp/ConsoleClassifier/project.lock.json
+++ b/src/Samples/CSharp/ConsoleClassifier/project.lock.json
--- a/src/Samples/CSharp/ConvertToAutoProperty/project.json
+++ b/src/Samples/CSharp/ConvertToAutoProperty/project.json
--- a/src/Samples/CSharp/ConvertToAutoProperty/project.lock.json
+++ b/src/Samples/CSharp/ConvertToAutoProperty/project.lock.json
--- a/src/Samples/CSharp/ConvertToConditional/Impl/project.json
+++ b/src/Samples/CSharp/ConvertToConditional/Impl/project.json
--- a/src/Samples/CSharp/ConvertToConditional/Impl/project.lock.json
+++ b/src/Samples/CSharp/ConvertToConditional/Impl/project.lock.json
--- a/src/Samples/CSharp/ConvertToConditional/Test/project.json
+++ b/src/Samples/CSharp/ConvertToConditional/Test/project.json
--- a/src/Samples/CSharp/ConvertToConditional/Test/project.lock.json
+++ b/src/Samples/CSharp/ConvertToConditional/Test/project.lock.json
--- a/src/Samples/CSharp/CopyPasteWithUsing/project.json
+++ b/src/Samples/CSharp/CopyPasteWithUsing/project.json
--- a/src/Samples/CSharp/CopyPasteWithUsing/project.lock.json
+++ b/src/Samples/CSharp/CopyPasteWithUsing/project.lock.json
--- a/src/Samples/CSharp/FormatSolution/project.json
+++ b/src/Samples/CSharp/FormatSolution/project.json
--- a/src/Samples/CSharp/FormatSolution/project.lock.json
+++ b/src/Samples/CSharp/FormatSolution/project.lock.json
--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.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.json
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.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.json
+++ b/src/Samples/CSharp/MakeConst/Impl/project.json
--- a/src/Samples/CSharp/MakeConst/Impl/project.lock.json
+++ b/src/Samples/CSharp/MakeConst/Impl/project.lock.json
--- a/src/Samples/CSharp/RefOutModifier/project.json
+++ b/src/Samples/CSharp/RefOutModifier/project.json
--- a/src/Samples/CSharp/RefOutModifier/project.lock.json
+++ b/src/Samples/CSharp/RefOutModifier/project.lock.json
--- a/src/Samples/CSharp/TreeTransforms/project.json
+++ b/src/Samples/CSharp/TreeTransforms/project.json
--- a/src/Samples/CSharp/TreeTransforms/project.lock.json
+++ b/src/Samples/CSharp/TreeTransforms/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.json
+++ b/src/Samples/VisualBasic/APISampleUnitTests/project.json
--- a/src/Samples/VisualBasic/APISampleUnitTests/project.lock.json
+++ b/src/Samples/VisualBasic/APISampleUnitTests/project.lock.json
--- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json
+++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json
--- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.lock.json
+++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.lock.json
--- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json
+++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json
--- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.lock.json
+++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.lock.json
--- a/src/Samples/VisualBasic/ConsoleClassifier/project.json
+++ b/src/Samples/VisualBasic/ConsoleClassifier/project.json
--- a/src/Samples/VisualBasic/ConsoleClassifier/project.lock.json
+++ b/src/Samples/VisualBasic/ConsoleClassifier/project.lock.json
--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.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.json
+++ b/src/Samples/VisualBasic/FormatSolution/project.json
--- a/src/Samples/VisualBasic/FormatSolution/project.lock.json
+++ b/src/Samples/VisualBasic/FormatSolution/project.lock.json
--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.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.json
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.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.json
+++ b/src/Samples/VisualBasic/MakeConst/Impl/project.json
--- a/src/Samples/VisualBasic/MakeConst/Impl/project.lock.json
+++ b/src/Samples/VisualBasic/MakeConst/Impl/project.lock.json
--- a/src/Samples/VisualBasic/RemoveByVal/Impl/project.json
+++ b/src/Samples/VisualBasic/RemoveByVal/Impl/project.json
--- a/src/Samples/VisualBasic/RemoveByVal/Impl/project.lock.json
+++ b/src/Samples/VisualBasic/RemoveByVal/Impl/project.lock.json
--- a/src/Samples/VisualBasic/RemoveByVal/Test/project.json
+++ b/src/Samples/VisualBasic/RemoveByVal/Test/project.json
--- a/src/Samples/VisualBasic/RemoveByVal/Test/project.lock.json
+++ b/src/Samples/VisualBasic/RemoveByVal/Test/project.lock.json
--- a/src/Samples/VisualBasic/TreeTransforms/project.json
+++ b/src/Samples/VisualBasic/TreeTransforms/project.json
--- a/src/Samples/VisualBasic/TreeTransforms/project.lock.json
+++ b/src/Samples/VisualBasic/TreeTransforms/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/DeployCoreClrTestRuntime/project.lock.json
+++ b/src/Test/DeployCoreClrTestRuntime/project.lock.json
--- a/src/Test/DeployDesktopTestRuntime/project.lock.json
+++ b/src/Test/DeployDesktopTestRuntime/project.lock.json
--- a/src/Test/Diagnostics/project.lock.json
+++ b/src/Test/Diagnostics/project.lock.json
--- 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/Performance/Fixture/project.lock.json
+++ b/src/Test/Performance/Fixture/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/project.json
+++ b/src/Test/Utilities/Portable/project.json
--- a/src/Test/Utilities/Portable/project.lock.json
+++ b/src/Test/Utilities/Portable/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.lock.json
+++ b/src/Tools/Source/Pdb2Xml/project.lock.json
--- a/src/Tools/Source/RunTests/project.lock.json
+++ b/src/Tools/Source/RunTests/project.lock.json
--- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/packages.config
+++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/packages.config
--- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/packages.config
+++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/packages.config
--- 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/project.lock.json
+++ b/src/VisualStudio/CSharp/Test/project.lock.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/project.lock.json
+++ b/src/VisualStudio/Core/SolutionExplorerShim/project.lock.json
--- a/src/VisualStudio/Core/Test/project.lock.json
+++ b/src/VisualStudio/Core/Test/project.lock.json
--- 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/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/Simplification/CSharpSimplificationService.Expander.cs
+++ b/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.Expander.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/Rename/RenameUtilities.cs
+++ b/src/Workspaces/Core/Portable/Rename/RenameUtilities.cs
--- 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/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