Merge pull request #9081 from Pilchie/UseVsMefNuGet

Use VsMEF via NuGet

src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj

@@ -8,11 +8,6 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <ItemGroup Label="File References">
-    <Reference Include="Microsoft.VisualStudio.Composition, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
@@ -534,4 +529,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

src/EditorFeatures/CSharpTest/project.lock.json

@@ -63,6 +63,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -444,6 +467,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -952,6 +998,34 @@
         "ref/wpa81/_._"
       ]
     },
+    "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+      "sha512": "iW0ZItSqec+q0wmUHbFCDb/kxdKqa5LaoLYRso7sbnnx8DZst/WGc86ooxBg+P6imWVV69a5ABUAE14EIkDzHw==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Composition.dll",
+        "lib/net45/Microsoft.VisualStudio.Composition.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.xml",
+        "Microsoft.VisualStudio.Composition.nuspec",
+        "package/services/metadata/core-properties/49476b50df234fd0aa965545b1ff4537.psmdcp"
+      ]
+    },
+    "Microsoft.VisualStudio.Validation/14.0.50702": {
+      "sha512": "+fqBUMqpfk8b1BwegIalBHoNzfnJUWFI/qrOGD6xEfhEH+732zZGlzO3Kuci+wiVX1NCD6HW5jZDEePVejGHcg==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Validation.dll",
+        "lib/net45/Microsoft.VisualStudio.Validation.xml",
+        "Microsoft.VisualStudio.Validation.nuspec",
+        "package/services/metadata/core-properties/bc0320ca467749b1ac7a79765ec3e8cb.psmdcp"
+      ]
+    },
     "Moq/4.2.1402.2112": {
       "sha512": "/TWoXE2OIjJjSvcxER7HMoZwpgETSGlKbLZiME7sVVoPMoqgLvDyjSISveTyHxNoDXd18cZlM8aHdS9ZOAbjMw==",
       "type": "Package",

src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj

@@ -8,11 +8,6 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <ItemGroup Label="File References">
-    <Reference Include="Microsoft.VisualStudio.Composition, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
@@ -287,4 +282,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

src/EditorFeatures/CSharpTest2/project.lock.json

@@ -63,6 +63,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -444,6 +467,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -952,6 +998,34 @@
         "ref/wpa81/_._"
       ]
     },
+    "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+      "sha512": "iW0ZItSqec+q0wmUHbFCDb/kxdKqa5LaoLYRso7sbnnx8DZst/WGc86ooxBg+P6imWVV69a5ABUAE14EIkDzHw==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Composition.dll",
+        "lib/net45/Microsoft.VisualStudio.Composition.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.xml",
+        "Microsoft.VisualStudio.Composition.nuspec",
+        "package/services/metadata/core-properties/49476b50df234fd0aa965545b1ff4537.psmdcp"
+      ]
+    },
+    "Microsoft.VisualStudio.Validation/14.0.50702": {
+      "sha512": "+fqBUMqpfk8b1BwegIalBHoNzfnJUWFI/qrOGD6xEfhEH+732zZGlzO3Kuci+wiVX1NCD6HW5jZDEePVejGHcg==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Validation.dll",
+        "lib/net45/Microsoft.VisualStudio.Validation.xml",
+        "Microsoft.VisualStudio.Validation.nuspec",
+        "package/services/metadata/core-properties/bc0320ca467749b1ac7a79765ec3e8cb.psmdcp"
+      ]
+    },
     "Moq/4.2.1402.2112": {
       "sha512": "/TWoXE2OIjJjSvcxER7HMoZwpgETSGlKbLZiME7sVVoPMoqgLvDyjSISveTyHxNoDXd18cZlM8aHdS9ZOAbjMw==",
       "type": "Package",

src/EditorFeatures/Test/EditorServicesTest.csproj

@@ -19,14 +19,6 @@
     <CopyNuGetImplementations>true</CopyNuGetImplementations>
   </PropertyGroup>
   <ItemGroup Label="File References">
-    <Reference Include="Microsoft.VisualStudio.Composition, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
-      <CopyLocal>True</CopyLocal>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Composition.Configuration, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.Configuration.dll</HintPath>
-      <CopyLocal>True</CopyLocal>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.Platform.VSEditor.Interop.dll">
       <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll</HintPath>
     </Reference>
@@ -376,4 +368,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

src/EditorFeatures/Test/project.json

@@ -10,7 +10,8 @@
     "System.Runtime.Extensions": "4.0.10",
     "System.Threading": "4.0.10",
     "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
+    "xunit.runner.console": "2.1.0",
+    "Microsoft.VisualStudio.Composition": "14.0.50715-pre"
   },
   "frameworks": {
     "net46": {}
@@ -19,4 +20,4 @@
     "win7": { },
     "win7-anycpu": { }
   }
-}
\ No newline at end of file
+}

src/EditorFeatures/Test/project.lock.json

@@ -63,6 +63,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -411,6 +434,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -759,6 +805,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -1234,6 +1303,34 @@
         "ref/wpa81/_._"
       ]
     },
+    "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+      "sha512": "iW0ZItSqec+q0wmUHbFCDb/kxdKqa5LaoLYRso7sbnnx8DZst/WGc86ooxBg+P6imWVV69a5ABUAE14EIkDzHw==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Composition.dll",
+        "lib/net45/Microsoft.VisualStudio.Composition.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.xml",
+        "Microsoft.VisualStudio.Composition.nuspec",
+        "package/services/metadata/core-properties/49476b50df234fd0aa965545b1ff4537.psmdcp"
+      ]
+    },
+    "Microsoft.VisualStudio.Validation/14.0.50702": {
+      "sha512": "+fqBUMqpfk8b1BwegIalBHoNzfnJUWFI/qrOGD6xEfhEH+732zZGlzO3Kuci+wiVX1NCD6HW5jZDEePVejGHcg==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Validation.dll",
+        "lib/net45/Microsoft.VisualStudio.Validation.xml",
+        "Microsoft.VisualStudio.Validation.nuspec",
+        "package/services/metadata/core-properties/bc0320ca467749b1ac7a79765ec3e8cb.psmdcp"
+      ]
+    },
     "Moq/4.2.1402.2112": {
       "sha512": "/TWoXE2OIjJjSvcxER7HMoZwpgETSGlKbLZiME7sVVoPMoqgLvDyjSISveTyHxNoDXd18cZlM8aHdS9ZOAbjMw==",
       "type": "Package",
@@ -2153,6 +2250,7 @@
     "": [
       "BasicUndo >= 0.9.3",
       "Microsoft.Composition >= 1.0.27",
+      "Microsoft.VisualStudio.Composition >= 14.0.50715-pre",
       "Moq >= 4.2.1402.2112",
       "System.Collections >= 4.0.10",
       "System.Diagnostics.Debug >= 4.0.10",

src/EditorFeatures/Test2/EditorServicesTest2.vbproj

@@ -15,9 +15,6 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <ItemGroup Label="File References">
-    <Reference Include="Microsoft.VisualStudio.Composition, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>

src/EditorFeatures/Test2/project.lock.json

@@ -63,6 +63,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -411,6 +434,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -886,6 +932,34 @@
         "ref/wpa81/_._"
       ]
     },
+    "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+      "sha512": "iW0ZItSqec+q0wmUHbFCDb/kxdKqa5LaoLYRso7sbnnx8DZst/WGc86ooxBg+P6imWVV69a5ABUAE14EIkDzHw==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Composition.dll",
+        "lib/net45/Microsoft.VisualStudio.Composition.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.xml",
+        "Microsoft.VisualStudio.Composition.nuspec",
+        "package/services/metadata/core-properties/49476b50df234fd0aa965545b1ff4537.psmdcp"
+      ]
+    },
+    "Microsoft.VisualStudio.Validation/14.0.50702": {
+      "sha512": "+fqBUMqpfk8b1BwegIalBHoNzfnJUWFI/qrOGD6xEfhEH+732zZGlzO3Kuci+wiVX1NCD6HW5jZDEePVejGHcg==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Validation.dll",
+        "lib/net45/Microsoft.VisualStudio.Validation.xml",
+        "Microsoft.VisualStudio.Validation.nuspec",
+        "package/services/metadata/core-properties/bc0320ca467749b1ac7a79765ec3e8cb.psmdcp"
+      ]
+    },
     "Moq/4.2.1402.2112": {
       "sha512": "/TWoXE2OIjJjSvcxER7HMoZwpgETSGlKbLZiME7sVVoPMoqgLvDyjSISveTyHxNoDXd18cZlM8aHdS9ZOAbjMw==",
       "type": "Package",

src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj

@@ -15,11 +15,6 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <ItemGroup Label="File References">
-    <Reference Include="Microsoft.VisualStudio.Composition, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>

src/EditorFeatures/VisualBasicTest/project.lock.json

@@ -63,6 +63,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -411,6 +434,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -886,6 +932,34 @@
         "ref/wpa81/_._"
       ]
     },
+    "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+      "sha512": "iW0ZItSqec+q0wmUHbFCDb/kxdKqa5LaoLYRso7sbnnx8DZst/WGc86ooxBg+P6imWVV69a5ABUAE14EIkDzHw==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Composition.dll",
+        "lib/net45/Microsoft.VisualStudio.Composition.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.xml",
+        "Microsoft.VisualStudio.Composition.nuspec",
+        "package/services/metadata/core-properties/49476b50df234fd0aa965545b1ff4537.psmdcp"
+      ]
+    },
+    "Microsoft.VisualStudio.Validation/14.0.50702": {
+      "sha512": "+fqBUMqpfk8b1BwegIalBHoNzfnJUWFI/qrOGD6xEfhEH+732zZGlzO3Kuci+wiVX1NCD6HW5jZDEePVejGHcg==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Validation.dll",
+        "lib/net45/Microsoft.VisualStudio.Validation.xml",
+        "Microsoft.VisualStudio.Validation.nuspec",
+        "package/services/metadata/core-properties/bc0320ca467749b1ac7a79765ec3e8cb.psmdcp"
+      ]
+    },
     "Moq/4.2.1402.2112": {
       "sha512": "/TWoXE2OIjJjSvcxER7HMoZwpgETSGlKbLZiME7sVVoPMoqgLvDyjSISveTyHxNoDXd18cZlM8aHdS9ZOAbjMw==",
       "type": "Package",

src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj

@@ -16,9 +16,6 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <ItemGroup Label="File References">
-    <Reference Include="Microsoft.VisualStudio.Composition, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.Language.StandardClassification, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -245,4 +242,4 @@
     <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

src/VisualStudio/CSharp/Test/project.lock.json

@@ -71,6 +71,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -427,6 +450,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -917,6 +963,34 @@
         "ref/wpa81/_._"
       ]
     },
+    "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+      "sha512": "iW0ZItSqec+q0wmUHbFCDb/kxdKqa5LaoLYRso7sbnnx8DZst/WGc86ooxBg+P6imWVV69a5ABUAE14EIkDzHw==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Composition.dll",
+        "lib/net45/Microsoft.VisualStudio.Composition.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.xml",
+        "Microsoft.VisualStudio.Composition.nuspec",
+        "package/services/metadata/core-properties/49476b50df234fd0aa965545b1ff4537.psmdcp"
+      ]
+    },
+    "Microsoft.VisualStudio.Validation/14.0.50702": {
+      "sha512": "+fqBUMqpfk8b1BwegIalBHoNzfnJUWFI/qrOGD6xEfhEH+732zZGlzO3Kuci+wiVX1NCD6HW5jZDEePVejGHcg==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Validation.dll",
+        "lib/net45/Microsoft.VisualStudio.Validation.xml",
+        "Microsoft.VisualStudio.Validation.nuspec",
+        "package/services/metadata/core-properties/bc0320ca467749b1ac7a79765ec3e8cb.psmdcp"
+      ]
+    },
     "Moq/4.2.1402.2112": {
       "sha512": "/TWoXE2OIjJjSvcxER7HMoZwpgETSGlKbLZiME7sVVoPMoqgLvDyjSISveTyHxNoDXd18cZlM8aHdS9ZOAbjMw==",
       "type": "Package",

src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj

@@ -15,13 +15,6 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <ItemGroup Label="File References">
-    <Reference Include="Microsoft.VisualStudio.Composition, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Composition.Configuration, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.Configuration.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>

src/VisualStudio/Core/Test/project.lock.json

@@ -71,6 +71,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -427,6 +450,29 @@
           "lib/net45/_._": {}
         }
       },
+      "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+        "dependencies": {
+          "Microsoft.Composition": "[1.0.27, )",
+          "Microsoft.VisualStudio.Validation": "[14.0.50702, )",
+          "System.Collections.Immutable": "[1.1.36, )"
+        },
+        "compile": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        },
+        "runtime": {
+          "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll": {},
+          "lib/net451/Microsoft.VisualStudio.Composition.dll": {}
+        }
+      },
+      "Microsoft.VisualStudio.Validation/14.0.50702": {
+        "compile": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.VisualStudio.Validation.dll": {}
+        }
+      },
       "Moq/4.2.1402.2112": {
         "compile": {
           "lib/net40/Moq.dll": {}
@@ -917,6 +963,34 @@
         "ref/wpa81/_._"
       ]
     },
+    "Microsoft.VisualStudio.Composition/14.0.50715-pre": {
+      "sha512": "iW0ZItSqec+q0wmUHbFCDb/kxdKqa5LaoLYRso7sbnnx8DZst/WGc86ooxBg+P6imWVV69a5ABUAE14EIkDzHw==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Composition.dll",
+        "lib/net45/Microsoft.VisualStudio.Composition.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.Configuration.xml",
+        "lib/net451/Microsoft.VisualStudio.Composition.dll",
+        "lib/net451/Microsoft.VisualStudio.Composition.xml",
+        "Microsoft.VisualStudio.Composition.nuspec",
+        "package/services/metadata/core-properties/49476b50df234fd0aa965545b1ff4537.psmdcp"
+      ]
+    },
+    "Microsoft.VisualStudio.Validation/14.0.50702": {
+      "sha512": "+fqBUMqpfk8b1BwegIalBHoNzfnJUWFI/qrOGD6xEfhEH+732zZGlzO3Kuci+wiVX1NCD6HW5jZDEePVejGHcg==",
+      "type": "Package",
+      "files": [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "lib/net45/Microsoft.VisualStudio.Validation.dll",
+        "lib/net45/Microsoft.VisualStudio.Validation.xml",
+        "Microsoft.VisualStudio.Validation.nuspec",
+        "package/services/metadata/core-properties/bc0320ca467749b1ac7a79765ec3e8cb.psmdcp"
+      ]
+    },
     "Moq/4.2.1402.2112": {
       "sha512": "/TWoXE2OIjJjSvcxER7HMoZwpgETSGlKbLZiME7sVVoPMoqgLvDyjSISveTyHxNoDXd18cZlM8aHdS9ZOAbjMw==",
       "type": "Package",