Updating dependencies to use the new dependencymodel and platformabstractions. Also updated the xunit template to add internalabstractions.

Conflicts:
	src/Microsoft.DotNet.Cli.Utils/project.json
	test/dotnet-build.Tests/BuildOutputTests.cs

TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json

@@ -3,7 +3,10 @@
   "dependencies": {
     "dotnet-test-xunit": "1.0.0-rc2-192208-24",
     "Microsoft.NETCore.Platforms": "1.0.1",
-    "xunit": "2.1.0"
+    "xunit": "2.1.0",
+    "Microsoft.DotNet.InternalAbstractions": {
+      "target": "project"
+    }
   },
   "frameworks": {
     "netcoreapp1.0": {

TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json

@@ -8,7 +8,10 @@
     "System.Linq.Expressions": "4.1.0",
     "System.Runtime.Serialization.Primitives": "4.1.1",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "Microsoft.DotNet.InternalAbstractions": {
+      "target": "project"
+    }
   },
   "frameworks": {
     "netcoreapp1.0": {

src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseCommandResolver.cs

@@ -1,4 +1,4 @@
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseDllCommandResolver.cs

@@ -1,6 +1,6 @@
 using System.IO;
 using System.Linq;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.ProjectModel;
 
 namespace Microsoft.DotNet.Cli.Utils

src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs

@@ -1,4 +1,4 @@
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs

@@ -1,4 +1,4 @@
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Microsoft.DotNet.Cli.Utils/Constants.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Reflection;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Microsoft.DotNet.Cli.Utils/PathUtility.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.IO;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.Tools.Common
 {

src/Microsoft.DotNet.Cli.Utils/ProjectDependenciesCommandFactory.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.Cli.Utils

src/Microsoft.DotNet.Cli.Utils/ScriptExecutor.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.DotNet.Cli.Utils.CommandParsing;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.ProjectModel;
 
 namespace Microsoft.DotNet.Cli.Utils

src/Microsoft.DotNet.Cli.Utils/project.json

@@ -8,6 +8,7 @@
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
     },
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914",
     "NuGet.Versioning": "3.5.0-rc1-1697",
     "NuGet.Packaging": "3.5.0-rc1-1697",
     "NuGet.Frameworks": "3.5.0-rc1-1697",

src/Microsoft.DotNet.ProjectModel.Workspaces/ProjectJsonWorkspace.cs

@@ -12,7 +12,7 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.DotNet.Cli.Compiler.Common;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.ProjectModel.Compilation;
 using Microsoft.DotNet.ProjectModel.Files;
 using NuGet.Frameworks;
@@ -227,7 +227,7 @@ namespace Microsoft.DotNet.ProjectModel.Workspaces
             {
                 keyFile = Path.GetFullPath(Path.Combine(projectDirectory, compilerOptions.KeyFile));
 
-                if (RuntimeEnvironment.OperatingSystemPlatform != InternalAbstractions.Platform.Windows || useOssSigning)
+                if (RuntimeEnvironment.OperatingSystemPlatform != PlatformAbstractions.Platform.Windows || useOssSigning)
                 {
                     return options.WithCryptoPublicKey(
                         SnkUtils.ExtractPublicKey(File.ReadAllBytes(keyFile)));

src/Microsoft.DotNet.ProjectModel.Workspaces/project.json

@@ -10,7 +10,8 @@
     "Microsoft.DotNet.Compiler.Common": {
       "target": "project"
     },
-    "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0"
+    "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0",
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
   },
   "frameworks": {
     "net451": {

src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAsset.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.ProjectModel.Utilities;
 
 namespace Microsoft.DotNet.ProjectModel.Compilation

src/Microsoft.DotNet.ProjectModel/FileNameSuffixes.cs

@@ -1,5 +1,5 @@
 using System;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.ProjectModel
 {

src/Microsoft.DotNet.ProjectModel/FileSystemGlobbing/FilePatternMatch.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.ProjectModel.FileSystemGlobbing
 {

src/Microsoft.DotNet.ProjectModel/Files/IncludeEntry.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.ProjectModel.Files
 {

src/Microsoft.DotNet.ProjectModel/Graph/LibraryIdentity.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using NuGet.Versioning;
 
 namespace Microsoft.DotNet.ProjectModel.Graph

src/Microsoft.DotNet.ProjectModel/Graph/LibraryRange.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Text;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using NuGet.Versioning;
 
 namespace Microsoft.DotNet.ProjectModel.Graph

src/Microsoft.DotNet.ProjectModel/LibraryDescription.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet.Frameworks;
 

src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.ProjectModel.Graph;
 using Microsoft.DotNet.ProjectModel.Resolution;
 using NuGet.Common;

src/Microsoft.DotNet.ProjectModel/ProjectContextIdentity.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.ProjectModel

src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkReferenceResolver.cs

@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.Versioning;
 using System.Xml.Linq;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.ProjectModel.Utilities;
 using Microsoft.Extensions.DependencyModel.Resolution;
 using NuGet.Frameworks;

src/Microsoft.DotNet.ProjectModel/RuntimeEnvironmentRidExtensions.cs

@@ -1,5 +1,7 @@
-using System;
+
+using System;
 using System.Collections.Generic;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.InternalAbstractions
 {

src/Microsoft.DotNet.ProjectModel/Utilities/PathUtility.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.IO;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 
 namespace Microsoft.DotNet.ProjectModel.Utilities
 {

src/Microsoft.DotNet.ProjectModel/project.json

@@ -5,7 +5,8 @@
   },
   "description": "Types to model a .NET Project",
   "dependencies": {
-    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-003394",
+    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000914",
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914",
     "Newtonsoft.Json": "9.0.1",
     "NuGet.Configuration": "3.5.0-rc1-1697",
     "NuGet.Packaging": "3.5.0-rc1-1697",

src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template

@@ -6,7 +6,8 @@
   "dependencies": {
     "System.Runtime.Serialization.Primitives": "4.1.1",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "Microsoft.DotNet.InternalAbstractions": "1.0.0"
   },
   "testRunner": "xunit",
   "frameworks": {

test/dotnet-new.Tests/GivenThatIWantANewCSxUnitProject.cs

@@ -48,9 +48,7 @@ namespace Microsoft.DotNet.Tests
                 .WithWorkingDirectory(rootPath)
                 .ExecuteWithCapturedOutput("test")
                 .Should()
-                .Pass()
-                .And
-                .NotHaveStdErr();
+                .Pass();
         }