From 792cc7bf2a1bfac4c0ae1c81db7a28114b0ba080 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 1 Mar 2017 22:34:08 -0800
Subject: [PATCH] Fixing a couple of wrong merges.

---
 .../TestPackages/dotnet-portable/dotnet-portable.csproj   | 8 +++++++-
 build/compile/LzmaArchive.targets                         | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
index 3d75f14b6..77a7f0ef8 100644
--- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
+++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
     <AssemblyName>dotnet-portable</AssemblyName>
     <OutputType>Exe</OutputType>
     <VersionSuffix></VersionSuffix>
@@ -13,4 +13,10 @@
       <FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
     </BuiltProjectOutputGroupOutput>
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <PackageReference Include="Microsoft.NETCore.App">
+      <Version>1.0.4</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets
index 77155e5da..27ad0b7d7 100644
--- a/build/compile/LzmaArchive.targets
+++ b/build/compile/LzmaArchive.targets
@@ -112,8 +112,8 @@
     </Target>
 
     <Target Name="SetupNuGetPackagesArchiveInputsOutputs">
-      <GenerateNuGetPackagesArchiveVersion ToolPath="$(OutputDirectory)">
-        <Output TaskParameter="Version" PropertyName="NuGetPackagesArchiveVersion"/>
+      <GenerateNuGetPackagesArchiveVersion ToolPath="$(OutputDirectory)" SDKVersion="$(CLI_NETSDK_Version)">
+        <Output TaskParameter="Version" PropertyName="NuGetPackagesArchiveVersion" />
       </GenerateNuGetPackagesArchiveVersion>
       <PropertyGroup>
         <NugetPackagesArchiveName>nuGetPackagesArchive.$(NuGetPackagesArchiveVersion).lzma</NugetPackagesArchiveName>