Updating the msbuild changes to handle DependencyModel coming from core-setup instead of a project dependency.

build/test/TestPackageProjects.targets

@@ -197,15 +197,6 @@
         <Clean>False</Clean>
         <Frameworks>net451;netstandard1.3</Frameworks>
       </BaseTestPackageProject>
-      <BaseTestPackageProject Include="src/Microsoft.Extensions.DependencyModel">
-        <Name>Microsoft.Extensions.DependencyModel</Name>
-        <IsTool>True</IsTool>
-        <IsApplicable>True</IsApplicable>
-        <VersionPrefix>1.0.1-beta-</VersionPrefix>
-        <VersionSuffix>$(TestPackageBuildVersionSuffix)</VersionSuffix>
-        <Clean>False</Clean>
-        <Frameworks>net451;netstandard1.6</Frameworks>
-      </BaseTestPackageProject>
       <BaseTestPackageProject Include="src/Microsoft.Extensions.Testing.Abstractions">
         <Name>Microsoft.Extensions.Testing.Abstractions</Name>
         <IsTool>True</IsTool>

src/Microsoft.DotNet.Core.Build.Tasks/project.json

@@ -5,10 +5,8 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "Microsoft.Extensions.DependencyModel": {
-      "target": "project"
-    },
-    "NuGet.ProjectModel": "3.5.0-rc1-1697"
+    "NuGet.ProjectModel": "3.5.0-rc1-1697",
+    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000914"
   },
   "frameworks": {
     "net451": {

test/Microsoft.DotNet.Core.Build.Tasks.Tests/project.json

@@ -11,6 +11,9 @@
     "Microsoft.DotNet.Core.Build.Tasks": {
       "target": "project"
     },
+    "Microsoft.DotNet.InternalAbstractions": {
+      "target": "project"
+    },
     "xunit": "2.1.0",
     "FluentAssertions.Json": "4.12.0",
     "dotnet-test-xunit": "1.0.0-rc2-192208-24"