From 7ebd363ca2ab8515905d0c0e12cdc42f6e45998f Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 25 Apr 2017 13:10:15 -0700
Subject: [PATCH 1/2] Generating the Microsoft.NETCoreSdk.BundledVersions.props
 file in the CLI folder, so that it can be picked up by the SDK.

---
 build/DependencyVersions.props  | 2 +-
 build/MSBuildExtensions.targets | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index b2a603cdc..47d029a9b 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -4,7 +4,7 @@
     <CLI_SharedFrameworkVersion>2.0.0-preview1-002061-00</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.2.0-preview-000093-02</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-    <CLI_NETSDK_Version>2.0.0-alpha-20170420-1</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>2.0.0-alpha-20170425-6</CLI_NETSDK_Version>
     <CLI_NuGet_Version>4.3.0-beta1-2418</CLI_NuGet_Version>
     <CLI_WEBSDK_Version>1.0.0-rel-20170413-451</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.1.0-preview-20170414-04</CLI_TestPlatform_Version>
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index edacdf01d..2dafac76f 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -63,6 +63,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <WriteLinesToFile File="$(GeneratedMSBuildExtensionsDirectory)/$(BundledVersionsPropsFolder)/$(BundledVersionsPropsFileName)"
                       Lines="$(BundledVersionsPropsContent)"
                       Overwrite="true" />
-
+    <Copy
+      DestinationFiles="$(SdkOutputDirectory)/$(BundledVersionsPropsFileName)"
+      SourceFiles="$(GeneratedMSBuildExtensionsDirectory)/$(BundledVersionsPropsFolder)/$(BundledVersionsPropsFileName)" />
   </Target>
 </Project>

From 339bfe0168f9d079f0898fc31f286223471f76bb Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 25 Apr 2017 15:03:07 -0700
Subject: [PATCH 2/2] Adding a work around for a test failure.

---
 TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj | 2 ++
 build/MSBuildExtensions.targets                            | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
index 542dd829a..4f0d4e8e5 100755
--- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
+++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
@@ -5,5 +5,7 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
+    <!-- Issue: https://github.com/dotnet/sdk/issues/1150 -->
+    <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 2dafac76f..9b99b96b9 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -64,7 +64,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                       Lines="$(BundledVersionsPropsContent)"
                       Overwrite="true" />
     <Copy
-      DestinationFiles="$(SdkOutputDirectory)/$(BundledVersionsPropsFileName)"
-      SourceFiles="$(GeneratedMSBuildExtensionsDirectory)/$(BundledVersionsPropsFolder)/$(BundledVersionsPropsFileName)" />
+      SourceFiles="$(GeneratedMSBuildExtensionsDirectory)/$(BundledVersionsPropsFolder)/$(BundledVersionsPropsFileName)"
+      DestinationFiles="$(SdkOutputDirectory)/$(BundledVersionsPropsFileName)" />
   </Target>
 </Project>