Removing project.json from msbuild template and msbuild test app.

TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj

@@ -4,14 +4,21 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+    <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
     <OutputPath>bin\$(Configuration)\netcoreapp1.0</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="**\*.cs" />
-    <None Include="project.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App">
+      <Version>1.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.Sdk">
+      <Version>1.0.0-alpha-20160927-2</Version>
+    </PackageReference>
   </ItemGroup>
 
   <Import Project="$(MSBuildExtensionsPath)\Microsoft.CSharp.targets" />

TestAssets/TestProjects/MSBuildTestApp/project.json

@@ -1,13 +0,0 @@
-{
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
-        "Microsoft.NETCore.App": {
-          "version": "1.0.1",
-          "type": "platform"
-        }
-      }
-    }
-  }
-}

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

@@ -12,8 +12,7 @@
           "type": "platform",
           "version": "1.0.1"
         }
-      },
+      }
-      "imports": "dnxcore50"
     }
   }
 }

src/dotnet/commands/dotnet-new/CSharp_MSBuild/$projectName$.csproj

@@ -3,14 +3,21 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+    <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
     <EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
-    <None Include="project.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App">
+      <Version>1.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.Sdk">
+      <Version>1.0.0-alpha-20160927-2</Version>
+    </PackageReference>
   </ItemGroup>
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -1,14 +0,0 @@
-{
-  "dependencies": {},
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.Sdk": "1.0.0-alpha-20160923-4",
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.1"
-        }
-      }
-    }
-  }
-}

test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/Restore3Command.cs

@@ -0,0 +1,27 @@
+// 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.Cli.Utils;
+
+namespace Microsoft.DotNet.Tools.Test.Utilities
+{
+    public sealed class Restore3Command : TestCommand
+    {
+        public Restore3Command()
+            : base("dotnet")
+        {
+        }
+
+        public override CommandResult Execute(string args = "")
+        {
+            args = $"restore3 {args}";
+            return base.Execute(args);
+        }
+
+        public override CommandResult ExecuteWithCapturedOutput(string args = "")
+        {
+            args = $"restore3 {args}";
+            return base.ExecuteWithCapturedOutput(args);
+        }
+    }
+}

test/dotnet-build3.Tests/GivenDotnetBuild3BuildsCsproj.cs

@@ -16,11 +16,16 @@ namespace Microsoft.DotNet.Cli.Build3.Tests
         {
             var testAppName = "MSBuildTestApp";
             var testInstance = TestAssetsManager
-                .CreateTestInstance(testAppName)
+                .CreateTestInstance(testAppName);
-                .WithLockFiles();
 
             var testProjectDirectory = testInstance.TestRoot;
 
+            new Restore3Command()
+                .WithWorkingDirectory(testProjectDirectory)
+                .Execute()
+                .Should()
+                .Pass();
+
             new Build3Command()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()

test/dotnet-publish3.Tests/GivenDotnetPublish3PublishesProjects.cs

@@ -16,11 +16,16 @@ namespace Microsoft.DotNet.Cli.Publish3.Tests
         {
             var testAppName = "MSBuildTestApp";
             var testInstance = TestAssetsManager
-                .CreateTestInstance(testAppName)
+                .CreateTestInstance(testAppName);
-                .WithLockFiles();
 
             var testProjectDirectory = testInstance.TestRoot;
 
+            new Restore3Command()
+                .WithWorkingDirectory(testProjectDirectory)
+                .Execute()
+                .Should()
+                .Pass();
+
             new Publish3Command()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()

test/dotnet-run3.Tests/GivenDotnetRun3RunsCsProj.cs

@@ -13,11 +13,16 @@ namespace Microsoft.DotNet.Cli.Run3.Tests
         {
             var testAppName = "MSBuildTestApp";
             var testInstance = TestAssetsManager
-                .CreateTestInstance(testAppName)
+                .CreateTestInstance(testAppName);
-                .WithLockFiles();
 
             var testProjectDirectory = testInstance.TestRoot;
 
+            new Restore3Command()
+                .WithWorkingDirectory(testProjectDirectory)
+                .Execute()
+                .Should()
+                .Pass();
+
             new Build3Command()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
@@ -38,11 +43,16 @@ namespace Microsoft.DotNet.Cli.Run3.Tests
         {
             var testAppName = "MSBuildTestApp";
             var testInstance = TestAssetsManager
-                .CreateTestInstance(testAppName)
+                .CreateTestInstance(testAppName);
-                .WithLockFiles();
 
             var testProjectDirectory = testInstance.TestRoot;
 
+            new Restore3Command()
+                .WithWorkingDirectory(testProjectDirectory)
+                .Execute()
+                .Should()
+                .Pass();
+
             new Run3Command()
                 .WithWorkingDirectory(testProjectDirectory)
                 .ExecuteWithCapturedOutput()
@@ -57,11 +67,16 @@ namespace Microsoft.DotNet.Cli.Run3.Tests
         {
             var testAppName = "MSBuildTestApp";
             var testInstance = TestAssetsManager
-                .CreateTestInstance(testAppName)
+                .CreateTestInstance(testAppName);
-                .WithLockFiles();
 
             var testProjectDirectory = testInstance.TestRoot;
 
+            new Restore3Command()
+                .WithWorkingDirectory(testProjectDirectory)
+                .Execute()
+                .Should()
+                .Pass();
+
             new Run3Command()
                 .WithWorkingDirectory(testProjectDirectory)
                 .ExecuteWithCapturedOutput("--framework netcoreapp1.0")