Merge pull request #5212 from livarcocc/update_sdk_with_globbing

Updating the SDK to an SDK that includes globing for source and resources
2017-01-05 13:49:32 -08:00 · 2017-01-05 13:49:32 -08:00 · 8effe48566
commit 8effe48566
parent bf47363a5f 72cd3d7c43
75 changed files with 83 additions and 357 deletions
--- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
+++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
@ -5,11 +5,7 @@
    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+  
  <ItemGroup>
    <PackageReference Include="dotnet-desktop-and-portable">
      <Version>1.0.0-*</Version>
--- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
+++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
@ -7,10 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
    <Compile Include="..\src\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" />
-    <EmbeddedResource Include="compiler\resources\**\*" />
  </ItemGroup>

  <ItemGroup>
--- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
+++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
@ -7,10 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
    <Compile Include="..\src\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" />
-    <EmbeddedResource Include="compiler\resources\**\*" />
  </ItemGroup>

  <ItemGroup>
--- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
+++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
@ -4,11 +4,7 @@
    <OutputType>Library</OutputType>
    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.0</PackageTargetFallback>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="dotnet-desktop-and-portable">
      <Version>1.0.0-*</Version>
--- a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
+++ b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
@ -5,11 +5,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
  </ItemGroup>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
@ -3,10 +3,7 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
+
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
@ -3,10 +3,7 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net451;netcoreapp1.0;netstandard1.4</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
+
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net45</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net451;netcoreapp1.0;netstandard1.4</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
+++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
@ -3,10 +3,6 @@
    <OutputType>Library</OutputType>
    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj
@ -4,11 +4,6 @@
    <TargetFramework>netstandard1.4</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj
+++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj
@ -4,11 +4,6 @@
    <OutputType>Exe</OutputType>
    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem">
      <Version>1.0.0</Version>
--- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
+++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
@ -6,11 +6,6 @@
    <GeneratedPackageId>random-name</GeneratedPackageId>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
    <DotNetCliToolReference Include="$(GeneratedPackageId)">
--- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj
+++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj
@ -9,12 +9,9 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-    <Content Include="$(OutputPath)\$(AssemblyName).runtimeconfig.json">
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)</PackagePath>
-    </Content>
+    <BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
+      <FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
+    </BuiltProjectOutputGroupOutput>
  </ItemGroup>

  <ItemGroup>
--- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
+++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
@ -3,11 +3,7 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <OutputType>Exe</OutputType>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
+++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
@ -3,11 +3,7 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <OutputType>Exe</OutputType>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
+++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
@ -14,11 +14,7 @@
      <Version>1.0.0</Version>
    </PackageReference>
  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DefineConstants>$(DefineConstants);RELEASE;TRACE</DefineConstants>
    <Optimize>true</Optimize>
--- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
+++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
@ -3,11 +3,7 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <OutputType>Exe</OutputType>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="ToolWithOutputName">
      <Version>1.0.0</Version>
--- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
+++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
@ -21,8 +21,4 @@
    </DotNetCliToolReference>
  </ItemGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
 </Project>
--- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
+++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
@ -3,11 +3,7 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <OutputType>Exe</OutputType>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
+++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
@ -7,11 +7,7 @@
    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/InvalidSolution/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/InvalidSolution/Lib/Lib.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netstandard1.4</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj
+++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj
@ -2,11 +2,7 @@
  <PropertyGroup>
    <TargetFramework>netstandard1.5</TargetFramework>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="NETStandard.Library">
      <Version>1.6.0</Version>
--- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
+++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
@ -10,8 +10,4 @@
    </PackageReference>
  </ItemGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
 </Project>
--- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
+++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
@ -21,8 +21,4 @@
    </DotNetCliToolReference>
  </ItemGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
 </Project>
--- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
+++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@ -5,10 +5,6 @@
    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj
@ -7,8 +7,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
-    <EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
    <None Include="project.json" />
  </ItemGroup>

--- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj
@ -7,8 +7,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
-    <EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
    <None Include="project.json" />
  </ItemGroup>

--- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj
@ -7,8 +7,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="$(GlobalExclude)" />
-    <EmbeddedResource Include="**\*.resx" Exclude="$(GlobalExclude)" />
    <None Include="project.json" />
  </ItemGroup>

--- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
+++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
@ -3,11 +3,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <OutputType>Exe</OutputType>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <ProjectReference Include="..\Lib\Lib.csproj" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netstandard1.4</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
+++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <ProjectReference Include="..\Lib\Lib.csproj" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Lib.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netstandard1.4</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <ProjectReference Include="..\Lib\Lib.csproj" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Lib.csproj
@ -5,10 +5,6 @@
    <ProjectGuid>{84A45D44-B677-492D-A6DA-B3A71135AB8E}</ProjectGuid>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netstandard1.4</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <ProjectReference Include="..\Lib\Lib.csproj" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Lib.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netstandard1.4</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Lib.csproj
+++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Lib.csproj
@ -4,10 +4,6 @@
    <TargetFramework>netstandard1.4</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj
+++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj
@ -4,11 +4,7 @@
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="**\*.resx" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    <EmbeddedResource Include="compiler\resources\**\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="NETStandard.Library">
      <Version>1.6.0</Version>
--- a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
@ -9,10 +9,6 @@
    <DefineConstants>DESKTOP;$(DefineConstants)</DefineConstants>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
@ -5,10 +5,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
@ -1,20 +1,17 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+<Project  Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
+    <RuntimeIdentifiers>win7-x86</RuntimeIdentifiers>
+    <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net46' ">win7-x86</RuntimeIdentifier>
  </PropertyGroup>

  <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
    <DefineConstants>DESKTOP;$(DefineConstants)</DefineConstants>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
-
  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
@ -22,11 +19,6 @@
  </ItemGroup>

  <ItemGroup>    
-    <PackageReference Include="Microsoft.NET.Sdk">
-      <!-- Should be $(CLI_NETSDK_Version) but https://github.com/dotnet/cli/issues/4892 -->
-      <Version>1.0.0-alpha-20161026-2</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="Microsoft.NET.Test.Sdk">
      <Version>$(CLI_TestPlatform_Version)</Version>
    </PackageReference>
@ -37,6 +29,4 @@
      <Version>2.2.0-beta4-build1194</Version>
    </PackageReference>
  </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
@ -5,11 +5,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App">
      <Version>1.0.3</Version>
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@ -2,8 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <CLI_MSBuild_Version>15.1.0-preview-000458-02</CLI_MSBuild_Version>
-    <CLI_NETSDK_Version>1.0.0-alpha-20161230-1</CLI_NETSDK_Version>
-    <CLI_WEBSDK_Version>1.0.0-alpha-20161205-1-154</CLI_WEBSDK_Version>
+    <CLI_NETSDK_Version>1.0.0-alpha-20170105-1</CLI_NETSDK_Version>
+    <CLI_WEBSDK_Version>1.0.0-alpha-20170104-1-189</CLI_WEBSDK_Version>
    <CLI_TestPlatform_Version>15.0.0-preview-20161227-02</CLI_TestPlatform_Version>
  </PropertyGroup>
 </Project>
--- a/build/Microsoft.DotNet.Cli.Test.targets
+++ b/build/Microsoft.DotNet.Cli.Test.targets
@ -42,7 +42,7 @@
          TestProject=%(TestProjects.ProjectPath);
          TestProjectName=%(TestProjects.OutputName);
          TestResultXmlDir=$(TestResultXmlDir);
-          ToolPath=$(Stage2Directory);
+          ToolPath=$(Stage0Directory);
          WorkingDirectory=%(TestProjects.ProjectDir)
        </Properties>
      </ProjectsToTest>
@ -79,7 +79,7 @@
          Outputs="%(TestProjects.BuildOutput)">
    <DotNetBuild  Configuration="$(Configuration)"
                  Framework="%(TestProjects.Framework)"
-                  ToolPath="$(Stage2Directory)"
+                  ToolPath="$(Stage0Directory)"
                  ProjectPath="%(TestProjects.ProjectPath)" />
  </Target>

@ -91,7 +91,7 @@
          Outputs="@(RestoreTestsInputs->'%(RelativeDir)/obj/project.assets.json');@(RestoreTestsInputs->'%(RelativeDir)/obj/%(Filename).csproj.nuget.g.props');@(RestoreTestsInputs->'%(RelativeDir)/obj/%(Filename).csproj.nuget.g.targets')">
    <CallTarget Targets="CleanTestProjectsLockFiles"/>

-    <DotNetRestore ToolPath="$(Stage2Directory)"
+    <DotNetRestore ToolPath="$(Stage0Directory)"
                   ProjectPath="&quot;%(RestoreTestsInputs.FullPath)&quot;" />
  </Target>

@ -217,7 +217,7 @@
    <DotNetPack NoBuild="True"
                Output="$(TestPackagesDir)"
                ProjectPath="%(TestPackageProject.ProjectPath)"
-                ToolPath="$(Stage2Directory)"
+                ToolPath="$(Stage0Directory)"
                VersionSuffix="%(TestPackageProject.VersionSuffix)"
                MsbuildArgs="$(DotNetPackMsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" />
  </Target>
@ -231,7 +231,7 @@
    <DotNetBuild Framework="%(TestPackageProject.Framework)"
                 Runtime="%(TestPackageProject.Runtime)"
                 ProjectPath="%(TestPackageProject.ProjectPath)"
-                 ToolPath="$(Stage2Directory)" />
+                 ToolPath="$(Stage0Directory)" />
  </Target>

  <Target Name="RestoreTestAssetPackageProjects"
--- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
+++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@ -80,12 +80,12 @@

      <Message Text="Publishing Archiver" />

-      <DotNetPublish ToolPath="$(Stage2Directory)"
+      <DotNetPublish ToolPath="$(Stage0Directory)"
                     WorkingDirectory="$(RepoRoot)/tools/Archiver"
                     Output="$(ToolsOutputDirectory)"
                     Configuration="$(Configuration)" />

-      <Exec Command="$(DotnetStage2) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
+      <Exec Command="$(DotnetStage0) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
    </Target>

    <Target Name="SetupNuGetPackagesArchiveInputsOutputs"
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
@ -94,7 +94,7 @@
      <!-- Run E2E -->
      <DotNetTest ProjectPath="$(EndToEndTestProject)"
                  EnvironmentVariables="@(TestSdkDebTaskEnvironmentVariables)"
-                  ToolPath="$(Stage2Directory)" />
+                  ToolPath="$(Stage0Directory)" />

      <!-- Clean up Packages -->
      <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
--- a/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
@ -144,7 +144,7 @@

      <Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
                      -InputMsi '$(SdkInstallerFile)'
-                      -DotnetDir '$(Stage2Directory)'" />
+                      -DotnetDir '$(Stage0Directory)'" />

      <WriteLinesToFile
          File="$(SdkMsiTestedSentinel)"
--- a/build/package/Microsoft.DotNet.Cli.Nupkg.targets
+++ b/build/package/Microsoft.DotNet.Cli.Nupkg.targets
@ -25,7 +25,7 @@
    <DotNetPack NoBuild="True"
                Output="$(NupkgOutputDirectory)"
                ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj"
-                ToolPath="$(Stage2Directory)"
+                ToolPath="$(Stage0Directory)"
                VersionSuffix="preview5-$(NupkgVersionSuffix)"
                Configuration="$(Configuration)" />
  </Target>
@ -36,7 +36,7 @@

    <MakeDir Directories="$(PackagingBuildBasePath)" />

-    <DotNetBuild ToolPath="$(Stage2Directory)"
+    <DotNetBuild ToolPath="$(Stage0Directory)"
                 Configuration="$(Configuration)"
                 ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj" />
  </Target>
--- a/run-build.ps1
+++ b/run-build.ps1
@ -103,8 +103,8 @@ if ($LastExitCode -ne 0)
 # install the post-PJnistic stage0
 $dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"

-Write-Host "$dotnetInstallPath -Version ""latest"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
-Invoke-Expression "$dotnetInstallPath -Version ""latest"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Write-Host "$dotnetInstallPath -Version ""1.0.0-preview5-004392"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Invoke-Expression "$dotnetInstallPath -Version ""1.0.0-preview5-004392"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
 if ($LastExitCode -ne 0)
 {
    Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
--- a/run-build.sh
+++ b/run-build.sh
@ -163,8 +163,8 @@ if [ $? != 0 ]; then
 fi

 # now execute the script
-echo "installing CLI: $dotnetInstallPath --version \"latest\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
-$dotnetInstallPath --version "latest" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
+echo "installing CLI: $dotnetInstallPath --version \"1.0.0-preview5-004392\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
+$dotnetInstallPath --version "1.0.0-preview5-004392" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
 if [ $? != 0 ]; then
    echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
    exit $?
--- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs
+++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs
@ -111,10 +111,10 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
                    compilerOptions => compilerOptions.OutputName != null);

        private IncludeContextTransform CompileFilesTransform =>
-            new IncludeContextTransform("Compile", transformMappings: false);
+            new IncludeContextTransform("Compile", transformMappings: false, condition: ic => ic != null);

        private IncludeContextTransform EmbedFilesTransform =>
-            new IncludeContextTransform("EmbeddedResource", transformMappings: false);
+            new IncludeContextTransform("EmbeddedResource", transformMappings: false, condition: ic => ic != null);

        private IncludeContextTransform CopyToOutputFilesTransform =>
            new IncludeContextTransform("Content", transformMappings: true)
@ -139,11 +139,11 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules

        private Func<CommonCompilerOptions, string, ProjectType, IEnumerable<ProjectItemElement>>CompileFilesTransformExecute =>
            (compilerOptions, projectDirectory, projectType) =>
-                    CompileFilesTransform.Transform(GetCompileIncludeContext(compilerOptions, projectDirectory));
+                    CompileFilesTransform.Transform(compilerOptions.CompileInclude);

        private Func<CommonCompilerOptions, string, ProjectType, IEnumerable<ProjectItemElement>> EmbedFilesTransformExecute =>
            (compilerOptions, projectDirectory, projectType) =>
-                    EmbedFilesTransform.Transform(GetEmbedIncludeContext(compilerOptions, projectDirectory));
+                    EmbedFilesTransform.Transform(GetEmbedIncludeContext(compilerOptions));

        private Func<CommonCompilerOptions, string, ProjectType, IEnumerable<ProjectItemElement>> CopyToOutputFilesTransformExecute =>
            (compilerOptions, projectDirectory, projectType) =>
@ -298,14 +298,13 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
                var configurationOutput =
                    includeContextTransformExecute(configurationCompilerOptions, projectDirectory, projectType);

-                configurationOutput = RemoveDefaultCompileAndEmbeddedResourceForWebProjects(
-                    configurationOutput,
-                    projectType,
-                    csproj);

+                if (configurationOutput != null)
+                {
                    transformApplicator.Execute(configurationOutput, itemGroup, mergeExisting: true);
                }
            }
+        }

        private void RemoveCommonIncludes(IEnumerable<ProjectItemElement> itemsToRemoveFrom,
            IEnumerable<ProjectItemElement> otherItems)
@ -354,36 +353,14 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
            {
                var transform = includeContextTransformExecute(compilerOptions, projectDirectory, projectType);

-                transform = RemoveDefaultCompileAndEmbeddedResourceForWebProjects(
-                    transform,
-                    projectType,
-                    csproj);
-
+                if (transform != null)
+                {
                    transformApplicator.Execute(
                        transform,
                        itemGroup,
                        mergeExisting: true);
                }
            }
-
-        private IEnumerable<ProjectItemElement> RemoveDefaultCompileAndEmbeddedResourceForWebProjects(
-            IEnumerable<ProjectItemElement> transform,
-            ProjectType projectType,
-            ProjectRootElement csproj)
-        {
-            if(projectType == ProjectType.Web)
-            {
-                var itemsToRemove = transform.Where(p => 
-                        p != null && 
-                        p.Include.Contains("**\\*") &&
-                        (p.ItemType == "Compile" || p.ItemType == "EmbeddedResource"));
-
-                CleanExistingItems(csproj, new [] {"Compile", "EmbeddedResource"});
-
-                transform = transform.Where(p => !itemsToRemove.Contains(p));
-            }
-
-            return transform;
        }

        private void CleanExistingProperties(ProjectRootElement csproj)
@ -401,43 +378,11 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
            }
        }

-        private void CleanExistingItems(ProjectRootElement csproj, IEnumerable<string> itemsToRemove)
+        private IncludeContext GetEmbedIncludeContext(CommonCompilerOptions compilerOptions)
        {
-            foreach (var itemName in itemsToRemove)
-            {
-                var items = csproj.Items.Where(i => i.ItemType == itemName);
+            var embedIncludeContext = compilerOptions.EmbedInclude;

-                foreach (var item in items)
-                {
-                    item.Parent.RemoveChild(item);
-                }
-            }
-        }
-
-        private IncludeContext GetCompileIncludeContext(CommonCompilerOptions compilerOptions, string projectDirectory)
-        {
-            // Defaults from src/Microsoft.DotNet.ProjectModel/ProjectReader.cs #L596
-            return compilerOptions.CompileInclude ??
-                new IncludeContext(
-                    projectDirectory,
-                    "compile",
-                    new JObject(),
-                    ProjectFilesCollection.DefaultCompileBuiltInPatterns,
-                    DefaultEmptyExcludeOption);
-        }
-
-        private IncludeContext GetEmbedIncludeContext(CommonCompilerOptions compilerOptions, string projectDirectory)
-        {
-            // Defaults from src/Microsoft.DotNet.ProjectModel/ProjectReader.cs #L602
-            var embedIncludeContext = compilerOptions.EmbedInclude ??
-                new IncludeContext(
-                    projectDirectory,
-                    "embed",
-                    new JObject(),
-                    ProjectFilesCollection.DefaultResourcesBuiltInPatterns,
-                    DefaultEmptyExcludeOption);
-
-            embedIncludeContext.BuiltInsExclude.Add("@(EmbeddedResource)");
+            embedIncludeContext?.BuiltInsExclude.Add("@(EmbeddedResource)");

            return embedIncludeContext;
        }
--- a/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj
+++ b/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj
@ -5,11 +5,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
  </ItemGroup>
--- a/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj
+++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj
@ -4,11 +4,6 @@
    <TargetFramework>netstandard1.4</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="NETStandard.Library" Version="1.6" />
  </ItemGroup>
--- a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj
+++ b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj
@ -5,11 +5,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161227-02" />
--- a/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj
+++ b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj
@ -5,11 +5,6 @@
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161227-02" />
--- a/src/dotnet/commands/dotnet-new/FSharp_Console/$projectName$.fsproj
+++ b/src/dotnet/commands/dotnet-new/FSharp_Console/$projectName$.fsproj
@ -4,6 +4,7 @@
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <Version>1.0.0-alpha</Version>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  </PropertyGroup>

  <ItemGroup>
--- a/src/dotnet/commands/dotnet-new/FSharp_Lib/$projectName$.fsproj
+++ b/src/dotnet/commands/dotnet-new/FSharp_Lib/$projectName$.fsproj
@ -3,6 +3,7 @@
  <PropertyGroup>
    <TargetFramework>netstandard1.6</TargetFramework>
    <Version>1.0.0-alpha</Version>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  </PropertyGroup>

  <ItemGroup>
--- a/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj
+++ b/src/dotnet/commands/dotnet-new/FSharp_Mstest/$projectName$.fsproj
@ -3,6 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  </PropertyGroup>

  <ItemGroup>
--- a/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj
+++ b/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj
@ -4,6 +4,7 @@
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  </PropertyGroup>

  <PropertyGroup>
--- a/src/dotnet/commands/dotnet-new/FSharp_Xunittest/$projectName$.fsproj
+++ b/src/dotnet/commands/dotnet-new/FSharp_Xunittest/$projectName$.fsproj
@ -3,6 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  </PropertyGroup>

  <ItemGroup>
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs
@ -49,18 +49,14 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
        }

        [Fact]
-        public void MigratingEmptyBuildOptionsPopulatesOnlyCompileAndEmbeddedResource()
+        public void MigratingEmptyBuildOptionsGeneratesAnEmptyCSProj()
        {
            var mockProj = RunBuildOptionsRuleOnPj(@"
                {
                    ""buildOptions"": { }
                }");

-            mockProj.Items.Count().Should().Be(2);
-            mockProj.Items.First(i => i.ItemType == "Compile").Include.Should().Be(@"**\*.cs");
-            mockProj.Items.First(i => i.ItemType == "Compile").Exclude.Should().BeEmpty();
-            mockProj.Items.First(i => i.ItemType == "EmbeddedResource").Include.Should().Be(@"compiler\resources\**\*;**\*.resx");
-            mockProj.Items.First(i => i.ItemType == "EmbeddedResource").Exclude.Should().Be("@(EmbeddedResource)");
+            mockProj.Items.Count().Should().Be(0);
        }

        [Fact]
@ -84,6 +80,22 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
            mockProj.Items.Count().Should().Be(0);
        }

+        [Fact]
+        public void MigratingConsoleProjectWithoutCustomSourcesOrResourcesDoesNotEmitCompileAndEmbeddedResource()
+        {
+            var mockProj = RunBuildOptionsRuleOnPj(@"
+                {
+                    ""buildOptions"": {
+                        ""emitEntryPoint"": true
+                    },
+                    ""frameworks"": {
+                        ""netcoreapp1.0"": {}
+                    }
+                }");
+
+            mockProj.Items.Count().Should().Be(0);
+        }
+
        public void MigratingOutputNamePopulatesAssemblyName()
        {
            var mockProj = RunBuildOptionsRuleOnPj(@"
--- a/test/dotnet-vstest.Tests/VSTestTests.cs
+++ b/test/dotnet-vstest.Tests/VSTestTests.cs
@ -19,12 +19,17 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests
            var testAppName = "VSTestDotNetCore";
            var testRoot = TestAssets.Get(testAppName)
                .CreateInstance()
+                .WithSourceFiles()
                .WithRestoreFiles()
-                .WithBuildFiles()
                .Root;

            var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";

+            new BuildCommand()
+                .WithWorkingDirectory(testRoot)
+                .Execute()
+                .Should().Pass();
+
            var outputDll = testRoot
                .GetDirectory("bin", configuration, "netcoreapp1.0")
                .GetFile($"{testAppName}.dll");