From a59b6be86a14ba5224fb215ad50eda33497d29e9 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Tue, 21 Aug 2018 13:47:47 -0700
Subject: [PATCH 1/6] Create a redist package for tensorflow

Create a nuget package that redistributes the TensorFlow C-API.

This is needed because TensorFlow doesn't ship an official NuGet package.

This is a straight up repack of the bits published on tensorflow.org.  I made sure to apply the TensorFlow license to this package and not sign it with our authenticate certificates.
---
 build.proj                                    |   9 ++
 build/Dependencies.props                      |   1 +
 build/sign.proj                               |   5 +-
 .../Microsoft.ML.TensorFlow.Redist.nupkgproj  |  16 +++
 src/Directory.Build.props                     |   9 ++
 src/Native/build.proj                         |  24 ++--
 .../Microsoft.ML.Tensorflow.Redist.proj       | 133 ++++++++++++++++++
 ...orflow-cpu-darwin-x86_64-1.10.0.tar.gz.sha |   1 +
 ...sorflow-cpu-linux-x86_64-1.10.0.tar.gz.sha |   1 +
 ...nsorflow-cpu-windows-x86_64-1.10.0.zip.sha |   1 +
 src/Redist/build.proj                         |   6 +
 11 files changed, 189 insertions(+), 17 deletions(-)
 create mode 100644 pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj
 create mode 100644 src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
 create mode 100644 src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.10.0.tar.gz.sha
 create mode 100644 src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.10.0.tar.gz.sha
 create mode 100644 src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.10.0.zip.sha
 create mode 100644 src/Redist/build.proj

diff --git a/build.proj b/build.proj
index c9be14e930..22aa9588f2 100644
--- a/build.proj
+++ b/build.proj
@@ -31,6 +31,7 @@
     <TraversalBuildDependsOn>
       CreateOrUpdateCurrentVersionFile;
       RestoreProjects;
+      BuildRedist;
       BuildNative;
       $(TraversalBuildDependsOn);
       DownloadExternalTestFiles;
@@ -44,6 +45,14 @@
              Properties="MSBuildWarningsAsMessages=NU1503" />
   </Target>
 
+  <Target Name="BuildRedist"
+          Condition="'$(SkipRedistBuild)' != 'true'"
+          DependsOnTargets="RestoreProjects">
+    <Message Importance="High" Text="Building redist components..." />
+    <MSBuild Projects="src/Redist/build.proj"
+             Targets="Build" />
+  </Target>
+
   <Target Name="BuildNative"
           Condition="'$(SkipNativeBuild)' != 'true'"
           DependsOnTargets="RestoreProjects">
diff --git a/build/Dependencies.props b/build/Dependencies.props
index 3a46917114..0b6af3cdc9 100644
--- a/build/Dependencies.props
+++ b/build/Dependencies.props
@@ -11,5 +11,6 @@
     <MlNetMklDepsPackageVersion>0.0.0.5</MlNetMklDepsPackageVersion>
     <SystemDrawingCommonPackageVersion>4.5.0</SystemDrawingCommonPackageVersion>
     <BenchmarkDotNetVersion>0.11.0</BenchmarkDotNetVersion>
+    <TensorFlowVersion>1.10.0</TensorFlowVersion>
   </PropertyGroup>
 </Project>
diff --git a/build/sign.proj b/build/sign.proj
index 8f8523474c..498ed7b433 100644
--- a/build/sign.proj
+++ b/build/sign.proj
@@ -30,7 +30,10 @@
 
     <!-- If we are not signing nuget packages we default to sign binaries -->
     <ItemGroup Condition="'$(SignNugetPackages)' != 'true'">
-      <FilesToSign Include="$(OutDir)**/*.dll">
+      <!-- Don't sign tensorflow since we don't build it. -->
+      <ExcludeFilesToSign Include="$(OutDir)**/tensorflow.dll" />
+
+      <FilesToSign Include="$(OutDir)**/*.dll" Exclude="@(ExcludeFilesToSign)">
         <Authenticode>Microsoft</Authenticode>
       </FilesToSign>
     </ItemGroup>
diff --git a/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj b/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj
new file mode 100644
index 0000000000..efb2d6d514
--- /dev/null
+++ b/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>$(MSBuildProjectName) contains the TensorFlow C library version $(TensorFlowVersion) redistributed as a NuGet package.</PackageDescription>
+    <PackageLicenseUrl>https://github.com/tensorflow/tensorflow/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://www.tensorflow.org/install/install_c</PackageProjectUrl>
+    <PackageReleaseNotes>https://github.com/tensorflow/tensorflow/releases/tag/v$(TensorFlowVersion)</PackageReleaseNotes>
+    <PackageTags>$(PackageTags) TensorFlow</PackageTags>
+    <!-- TODO: consider PackageIconUrl -->
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Content Include="..\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+  </ItemGroup>
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 113da3575a..ee32523d8e 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -12,6 +12,15 @@
     <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>
 
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>
+
+    <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
+    
+    <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>
+
+    <PackageRid Condition="'$(OS)' == 'Windows_NT'">win</PackageRid>
+    <PackageRid Condition="'$(OS)' != 'Windows_NT'">linux</PackageRid>
+    <PackageRid Condition="$([MSBuild]::IsOSPlatform('osx'))">osx</PackageRid>
+    <PackageRid>$(PackageRid)-$(TargetArchitecture)</PackageRid>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Native/build.proj b/src/Native/build.proj
index ab338ac855..5e9d7989cb 100644
--- a/src/Native/build.proj
+++ b/src/Native/build.proj
@@ -3,7 +3,6 @@
     <!-- versioning.targets will import this file, so don't import it again -->
     <DisableImportVersioningProps>true</DisableImportVersioningProps>
 
-    <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
     <StripNativeSymbols Condition="'$(StripNativeSymbols)' == '' and '$(Configuration)' == 'Release'">True</StripNativeSymbols>
   </PropertyGroup>
 
@@ -26,21 +25,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-     <NativeAssetsBuiltPath>$(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native</NativeAssetsBuiltPath>
-
-     <NativeLibPrefix Condition="'$(OS)' != 'Windows_NT'">lib</NativeLibPrefix>
-     <NativeLibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</NativeLibExtension>
-     <NativeLibExtension Condition="'$(OS)' != 'Windows_NT'">.so</NativeLibExtension>
-     <NativeLibExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib</NativeLibExtension>
-
-     <NativeLibSymbolExtension Condition="'$(OS)' == 'Windows_NT'">.pdb</NativeLibSymbolExtension>
-     <NativeLibSymbolExtension Condition="'$(OS)' != 'Windows_NT'">.so.dbg</NativeLibSymbolExtension>
-     <NativeLibSymbolExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib.dwarf</NativeLibSymbolExtension>
-
-     <PackageRid Condition="'$(OS)' == 'Windows_NT'">win</PackageRid>
-     <PackageRid Condition="'$(OS)' != 'Windows_NT'">linux</PackageRid>
-     <PackageRid Condition="$([MSBuild]::IsOSPlatform('osx'))">osx</PackageRid>
-     <PackageRid>$(PackageRid)-$(TargetArchitecture)</PackageRid>
+    <NativeLibPrefix Condition="'$(OS)' != 'Windows_NT'">lib</NativeLibPrefix>
+    <NativeLibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</NativeLibExtension>
+    <NativeLibExtension Condition="'$(OS)' != 'Windows_NT'">.so</NativeLibExtension>
+    <NativeLibExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib</NativeLibExtension>
+
+    <NativeLibSymbolExtension Condition="'$(OS)' == 'Windows_NT'">.pdb</NativeLibSymbolExtension>
+    <NativeLibSymbolExtension Condition="'$(OS)' != 'Windows_NT'">.so.dbg</NativeLibSymbolExtension>
+    <NativeLibSymbolExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib.dwarf</NativeLibSymbolExtension>
   </PropertyGroup>
 
   <Target Name="BuildNativeUnix"
diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
new file mode 100644
index 0000000000..db6e9b98ce
--- /dev/null
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
@@ -0,0 +1,133 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Restore;Build">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <TensorFlowConfig Include="windows" FileExtension=".zip" FilesFromArchive="lib\tensorflow.dll" Runtime="win-x64"/>
+    <TensorFlowConfig Include="linux" FileExtension=".tar.gz" FilesFromArchive="lib\libtensorflow.so;lib\libtensorflow_framework.so" Runtime="linux-x64" />
+    <TensorFlowConfig Include="darwin" FileExtension=".tar.gz" FilesFromArchive="lib\libtensorflow.so;lib\libtensorflow_framework.so" Runtime="osx-x64" />
+    <TensorFlowArchive Include="@(TensorFlowConfig->'https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-%(Identity)-x86_64-$(TensorFlowVersion)%(FileExtension)')" />
+  </ItemGroup>
+
+  <Target Name="PrepareArchives">
+    <ItemGroup>
+      <!-- set up metdata used by all targets -->
+      <TensorFlowArchive DownloadFile="$(IntermediateOutputPath)%(FileName)%(Extension)"
+                         DownloadShaFile="$(IntermediateOutputPath)%(FileName)%(Extension).sha"
+                         ExtractDirectory="$(IntermediateOutputPath)%(FileName)"
+                         ExtractSemaphore="$(IntermediateOutputPath)%(FileName)\.extracted"
+                         LocalShaFile="$(MSBuildProjectDirectory)\%(FileName)%(Extension).sha"/>
+    </ItemGroup>
+  </Target>
+
+  <UsingTask TaskName="DownloadFilesFromUrl" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
+  <Target Name="DownloadArchives" 
+          DependsOnTargets="PrepareArchives"
+          Inputs="$(MSBuildProjectFile)"
+          Outputs="@(TensorFlowArchive->'%(DownloadFile)')">
+    <MakeDir Directories="$(IntermediateOutputPath)" />
+    <ItemGroup>
+      <!-- DownloadFilesFromUrl requires Url metadata is set and ignores the identity of the item -->
+      <_downloadFiles Include="@(TensorFlowArchive)" Url="%(Identity)" DestinationFile="%(DownloadFile)" />
+    </ItemGroup>
+    <DownloadFilesFromUrl Items="@(_downloadFiles)">
+      <Output TaskParameter="FilesCreated" ItemName="FileWrites" />
+    </DownloadFilesFromUrl>
+  </Target>
+  
+  <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
+  <UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
+  <Target Name="ValidateAndExtractArchives" 
+          DependsOnTargets="DownloadArchives"
+          Inputs="@(TensorFlowArchive->'%(DownloadFile)')"
+          Outputs="@(TensorFlowArchive->'%(ExtractSemaphore)')">
+    <!-- GenerateChecksums writes a sha checksum to the file specified by DestinationPath metadata -->
+    <ItemGroup>
+      <_filesToCheckSum Include="@(TensorFlowArchive->'%(DownloadFile)')" DestinationPath="%(DownloadShaFile)" />
+    </ItemGroup>
+    <GenerateChecksums Items="@(_filesToCheckSum)" />
+    <ItemGroup>
+      <FileWrites Include="@(TensorFlowArchive->'%(DownloadShaFile)')" />
+    </ItemGroup>
+
+    <!-- If specified we'll update the checked in SHAs with the downloaded ones. -->
+    <Copy Condition="'$(UpdateSHA)' == 'true'"
+          SourceFiles="@(TensorFlowArchive->'%(DownloadShaFile)')"
+          DestinationFiles="@(TensorFlowArchive->'%(LocalShaFile)')" />
+
+    <Error Condition="!Exists('%(TensorFlowArchive.LocalShaFile)')" Text="SHA file '%(TensorFlowArchive.LocalShaFile)' does not exist.  Build with /p:UpdateSHA=true to save it." />
+
+    <!-- Read in the SHAs as metadata on the archive items -->
+    <ItemGroup>
+      <TensorFlowArchive>
+        <LocalSha>$([System.IO.File]::ReadAllText('%(LocalShaFile)'))</LocalSha>
+        <DownloadSha>$([System.IO.File]::ReadAllText('%(DownloadShaFile)'))</DownloadSha>
+      </TensorFlowArchive>
+    </ItemGroup>
+    <!-- Validate that the downloaded SHAs match the expected checked in SHAs -->
+    <Error Condition="'%(TensorFlowArchive.LocalSha)' != '%(TensorFlowArchive.DownloadSha)'" Text="Downloaded file '%(TensorFlowArchive.DownloadFile)' has unexpected SHA.%0A  expected: %(_downloadedTensorFlowArchive.LocalSha)%0A  actual: %(_downloadedTensorFlowArchive.DownloadSha)%0ABuild with /p:UpdateSHA=true if you intentionally changed the URL and wish to update the SHAs, otherwise this could indicate an incomplete download or intercerpted URL and should be examined." />
+
+    <!-- The archives are valid, lets extract them, ensuring an empty directory -->
+    <RemoveDir Directories="@(TensorFlowArchive->'%(ExtractDirectory)')" />
+    <MakeDir Directories="@(TensorFlowArchive->'%(ExtractDirectory)')" />
+    <ZipFileExtractToDirectory Condition="'%(FileExtension)' == '.zip'"
+                               SourceArchive="%(TensorFlowArchive.DownloadFile)"
+                               DestinationDirectory="%(TensorFlowArchive.ExtractDirectory)"
+                               OverwriteDestination="true" />
+    <Exec Condition="'%(FileExtension)' == '.tar.gz'"
+          Command="tar -xzmf &quot;%(TensorFlowArchive.DownloadFile)&quot; -C &quot;%(TensorFlowArchive.ExtractDirectory)&quot;" />
+    <Touch Files="@(TensorFlowArchive->'%(ExtractSemaphore)')" AlwaysCreate="true" />
+
+    <ItemGroup>
+      <FileWrites Include="%(TensorFlowArchive.ExtractDirectory)\**\*" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Clean up empty directories left behind by clean, since it otherwise would not do this -->
+  <Target Name="CleanExtractDirectories"
+          BeforeTargets="AfterClean"
+          DependsOnTargets="PrepareArchives">
+    <RemoveDir Directories="@(TensorFlowArchive->'%(ExtractDirectory)')" />
+  </Target>
+
+  <!-- Select the files we want to copy out of each archive. -->
+  <Target Name="GetFilesFromArchive"
+          DependsOnTargets="ValidateAndExtractArchives" >
+    <ItemGroup>
+      <!-- batch rather than transform so that we can split FilesFromArchive metadata -->
+      <_fileFromArchive Include="%(TensorFlowArchive.FilesFromArchive)" ExtractDirectory="%(TensorFlowArchive.ExtractDirectory)" Runtime="%(TensorFlowArchive.Runtime)" />
+      <_fileFromArchive DestinationFile="%(FileName)%(Extension)"/>
+      <!-- rename the .so to .dylib -->
+      <_fileFromArchive Condition="'%(Runtime)' == 'osx-x64'" DestinationFile="%(FileName).dylib" />
+
+      <!-- copy to packaging location -->
+      <FilesFromArchive Include="%(_fileFromArchive.ExtractDirectory)\%(_fileFromArchive.Identity)" 
+                        TargetPath="$(PackageAssetsPath)$(MSBuildProjectName)\runtimes\%(_fileFromArchive.Runtime)\native\%(_fileFromArchive.DestinationFile)" />
+
+      <!-- copy to NativeAssets location, only for current RID, so that they may be used by tests -->
+      <FilesFromArchive Condition="'$(PackageRID)' == '%(_fileFromArchive.Runtime)'"
+                        Include="%(_fileFromArchive.ExtractDirectory)\%(_fileFromArchive.Identity)" 
+                        TargetPath="$(NativeAssetsBuiltPath)\%(_fileFromArchive.DestinationFile)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="CopyFilesFromArchive"
+          DependsOnTargets="GetFilesFromArchive">
+    <Copy SourceFiles="@(FilesFromArchive)"
+          DestinationFiles="@(FilesFromArchive->'%(TargetPath)')">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+  </Target>
+
+  <!-- Define CoreCompile to do the work of downloading and copying assets -->
+  <Target Name="CoreCompile"
+          DependsOnTargets="CopyFilesFromArchive" />
+
+  <!-- required by common targets -->
+  <Target Name="CreateManifestResourceNames" />
+</Project>
diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.10.0.tar.gz.sha b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.10.0.tar.gz.sha
new file mode 100644
index 0000000000..da8b53866b
--- /dev/null
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.10.0.tar.gz.sha
@@ -0,0 +1 @@
+77218EC4DA96A73B15B8AA5637C9F21B389510A9FAF4DCF06DF5B81A5403015C6BA3EEE29BD8BA5B0694F40C671D8E6722D554C4F93F95C33F29AB491C70263C
\ No newline at end of file
diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.10.0.tar.gz.sha b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.10.0.tar.gz.sha
new file mode 100644
index 0000000000..6b865984ec
--- /dev/null
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.10.0.tar.gz.sha
@@ -0,0 +1 @@
+B9E9CD95BC6A28297ACAB0D684FBBFAFF1F9AE893432AC2D208120D767101AC20E2C55BC79E59DBE6E5BD9EC802026694960FA12137BB303061C5A21B62BD29E
\ No newline at end of file
diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.10.0.zip.sha b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.10.0.zip.sha
new file mode 100644
index 0000000000..92ce0db9fb
--- /dev/null
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.10.0.zip.sha
@@ -0,0 +1 @@
+66F3A9522917076038AE9CCA11FE805DD516C60B3A3E156B78C2E4BD0E3E5785A9D0380C5E06411473EF14A72B72FD93F954AA3496A12D1FAF0FA3393970E700
\ No newline at end of file
diff --git a/src/Redist/build.proj b/src/Redist/build.proj
new file mode 100644
index 0000000000..6891516cc0
--- /dev/null
+++ b/src/Redist/build.proj
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <Project Include="*\*proj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>

From ee5f0bfe6c5aadcd4927958651bd280f4a4a73fe Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Thu, 23 Aug 2018 12:31:07 -0700
Subject: [PATCH 2/6] Make TF redist project a normal MSBuild project

Remove the use of the SDK targets, and define our own build and clean.
---
 .../Microsoft.ML.Tensorflow.Redist.proj       | 41 +++++--------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
index db6e9b98ce..3798e6336c 100644
--- a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
@@ -1,10 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Restore;Build">
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
   </PropertyGroup>
   
   <ItemGroup>
@@ -35,9 +33,7 @@
       <!-- DownloadFilesFromUrl requires Url metadata is set and ignores the identity of the item -->
       <_downloadFiles Include="@(TensorFlowArchive)" Url="%(Identity)" DestinationFile="%(DownloadFile)" />
     </ItemGroup>
-    <DownloadFilesFromUrl Items="@(_downloadFiles)">
-      <Output TaskParameter="FilesCreated" ItemName="FileWrites" />
-    </DownloadFilesFromUrl>
+    <DownloadFilesFromUrl Items="@(_downloadFiles)" />
   </Target>
   
   <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
@@ -51,9 +47,6 @@
       <_filesToCheckSum Include="@(TensorFlowArchive->'%(DownloadFile)')" DestinationPath="%(DownloadShaFile)" />
     </ItemGroup>
     <GenerateChecksums Items="@(_filesToCheckSum)" />
-    <ItemGroup>
-      <FileWrites Include="@(TensorFlowArchive->'%(DownloadShaFile)')" />
-    </ItemGroup>
 
     <!-- If specified we'll update the checked in SHAs with the downloaded ones. -->
     <Copy Condition="'$(UpdateSHA)' == 'true'"
@@ -75,24 +68,13 @@
     <!-- The archives are valid, lets extract them, ensuring an empty directory -->
     <RemoveDir Directories="@(TensorFlowArchive->'%(ExtractDirectory)')" />
     <MakeDir Directories="@(TensorFlowArchive->'%(ExtractDirectory)')" />
-    <ZipFileExtractToDirectory Condition="'%(FileExtension)' == '.zip'"
+    <ZipFileExtractToDirectory Condition="'%(TensorFlowArchive.FileExtension)' == '.zip'"
                                SourceArchive="%(TensorFlowArchive.DownloadFile)"
                                DestinationDirectory="%(TensorFlowArchive.ExtractDirectory)"
                                OverwriteDestination="true" />
-    <Exec Condition="'%(FileExtension)' == '.tar.gz'"
+    <Exec Condition="'%(TensorFlowArchive.FileExtension)' == '.tar.gz'"
           Command="tar -xzmf &quot;%(TensorFlowArchive.DownloadFile)&quot; -C &quot;%(TensorFlowArchive.ExtractDirectory)&quot;" />
     <Touch Files="@(TensorFlowArchive->'%(ExtractSemaphore)')" AlwaysCreate="true" />
-
-    <ItemGroup>
-      <FileWrites Include="%(TensorFlowArchive.ExtractDirectory)\**\*" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Clean up empty directories left behind by clean, since it otherwise would not do this -->
-  <Target Name="CleanExtractDirectories"
-          BeforeTargets="AfterClean"
-          DependsOnTargets="PrepareArchives">
-    <RemoveDir Directories="@(TensorFlowArchive->'%(ExtractDirectory)')" />
   </Target>
 
   <!-- Select the files we want to copy out of each archive. -->
@@ -119,15 +101,14 @@
   <Target Name="CopyFilesFromArchive"
           DependsOnTargets="GetFilesFromArchive">
     <Copy SourceFiles="@(FilesFromArchive)"
-          DestinationFiles="@(FilesFromArchive->'%(TargetPath)')">
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
+          DestinationFiles="@(FilesFromArchive->'%(TargetPath)')" />
   </Target>
 
-  <!-- Define CoreCompile to do the work of downloading and copying assets -->
-  <Target Name="CoreCompile"
+  <!-- Define Build to do the work of downloading and copying assets -->
+  <Target Name="Build"
           DependsOnTargets="CopyFilesFromArchive" />
 
-  <!-- required by common targets -->
-  <Target Name="CreateManifestResourceNames" />
+  <Target Name="Clean">
+    <RemoveDir Directories="$(IntermediateOutputPath)" />
+  </Target>
 </Project>

From cba17afd8dd7181dc4e614bc552bd83cfa2c45ca Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Thu, 23 Aug 2018 13:28:23 -0700
Subject: [PATCH 3/6] Add TF License file to package

---
 .../Microsoft.ML.TensorFlow.Redist.nupkgproj              | 1 +
 .../Microsoft.ML.Tensorflow.Redist.proj                   | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj b/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj
index efb2d6d514..af34bb4f81 100644
--- a/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj
+++ b/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj
@@ -12,5 +12,6 @@
   
   <ItemGroup>
     <Content Include="..\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\LICENSE" Pack="true" PackagePath=".\" />
   </ItemGroup>
 </Project>
diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
index 3798e6336c..64c8ae7261 100644
--- a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <TensorFlowConfig Include="windows" FileExtension=".zip" FilesFromArchive="lib\tensorflow.dll" Runtime="win-x64"/>
+    <TensorFlowConfig Include="windows" FileExtension=".zip" FilesFromArchive="lib\tensorflow.dll;include\tensorflow\c\LICENSE" Runtime="win-x64"/>
     <TensorFlowConfig Include="linux" FileExtension=".tar.gz" FilesFromArchive="lib\libtensorflow.so;lib\libtensorflow_framework.so" Runtime="linux-x64" />
     <TensorFlowConfig Include="darwin" FileExtension=".tar.gz" FilesFromArchive="lib\libtensorflow.so;lib\libtensorflow_framework.so" Runtime="osx-x64" />
     <TensorFlowArchive Include="@(TensorFlowConfig->'https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-%(Identity)-x86_64-$(TensorFlowVersion)%(FileExtension)')" />
@@ -86,10 +86,14 @@
       <_fileFromArchive DestinationFile="%(FileName)%(Extension)"/>
       <!-- rename the .so to .dylib -->
       <_fileFromArchive Condition="'%(Runtime)' == 'osx-x64'" DestinationFile="%(FileName).dylib" />
+      <_fileFromArchive PackagePath="runtimes\%(_fileFromArchive.Runtime)\native\%(_fileFromArchive.DestinationFile)" />
+
+      <!-- put the LICENSE in the root -->
+      <_fileFromArchive Condition="'%(DestinationFile)' == 'LICENSE'" PackagePath="%(_fileFromArchive.DestinationFile)" Runtime="" />
 
       <!-- copy to packaging location -->
       <FilesFromArchive Include="%(_fileFromArchive.ExtractDirectory)\%(_fileFromArchive.Identity)" 
-                        TargetPath="$(PackageAssetsPath)$(MSBuildProjectName)\runtimes\%(_fileFromArchive.Runtime)\native\%(_fileFromArchive.DestinationFile)" />
+                        TargetPath="$(PackageAssetsPath)$(MSBuildProjectName)\%(_fileFromArchive.PackagePath)" />
 
       <!-- copy to NativeAssets location, only for current RID, so that they may be used by tests -->
       <FilesFromArchive Condition="'$(PackageRID)' == '%(_fileFromArchive.Runtime)'"

From 69aca5d08d7562a9e77bf58ad3f5971c1eda8c94 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Thu, 23 Aug 2018 13:46:07 -0700
Subject: [PATCH 4/6] Don't use fullpaths when un-tar'ing

Tar on windows was failing when msbuild passed it a full path.  Workaround by using relative
paths and running where we extract to.
---
 .../Microsoft.ML.Tensorflow.Redist.proj                       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
index 64c8ae7261..f4971ee3a4 100644
--- a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
@@ -72,8 +72,10 @@
                                SourceArchive="%(TensorFlowArchive.DownloadFile)"
                                DestinationDirectory="%(TensorFlowArchive.ExtractDirectory)"
                                OverwriteDestination="true" />
+
     <Exec Condition="'%(TensorFlowArchive.FileExtension)' == '.tar.gz'"
-          Command="tar -xzmf &quot;%(TensorFlowArchive.DownloadFile)&quot; -C &quot;%(TensorFlowArchive.ExtractDirectory)&quot;" />
+          WorkingDirectory="%(TensorFlowArchive.ExtractDirectory)"
+          Command="tar -xzmf &quot;$([MSBuild]::MakeRelative('%(TensorFlowArchive.ExtractDirectory)', '%(TensorFlowArchive.DownloadFile)'))&quot;" />
     <Touch Files="@(TensorFlowArchive->'%(ExtractSemaphore)')" AlwaysCreate="true" />
   </Target>
 

From c7172d6b4e586c1b8c77d48091d1485d14f0c3da Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Thu, 23 Aug 2018 16:10:19 -0700
Subject: [PATCH 5/6] Add some logging to TF redist project

---
 .../Microsoft.ML.Tensorflow.Redist.proj                        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
index f4971ee3a4..8e4128ec98 100644
--- a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
@@ -33,6 +33,7 @@
       <!-- DownloadFilesFromUrl requires Url metadata is set and ignores the identity of the item -->
       <_downloadFiles Include="@(TensorFlowArchive)" Url="%(Identity)" DestinationFile="%(DownloadFile)" />
     </ItemGroup>
+    <Message Importance="High" Text="Downloading '%(_downloadFiles.Url)' to '%(_downloadFiles.DestinationFile)'." />
     <DownloadFilesFromUrl Items="@(_downloadFiles)" />
   </Target>
   
@@ -73,6 +74,7 @@
                                DestinationDirectory="%(TensorFlowArchive.ExtractDirectory)"
                                OverwriteDestination="true" />
 
+    <Message Importance="High" Condition="'%(TensorFlowArchive.FileExtension)' == '.tar.gz'" Text="Decompressing '%(TensorFlowArchive.DownloadFile)' to '%(TensorFlowArchive.ExtractDirectory)'." />
     <Exec Condition="'%(TensorFlowArchive.FileExtension)' == '.tar.gz'"
           WorkingDirectory="%(TensorFlowArchive.ExtractDirectory)"
           Command="tar -xzmf &quot;$([MSBuild]::MakeRelative('%(TensorFlowArchive.ExtractDirectory)', '%(TensorFlowArchive.DownloadFile)'))&quot;" />
@@ -106,6 +108,7 @@
 
   <Target Name="CopyFilesFromArchive"
           DependsOnTargets="GetFilesFromArchive">
+    <Message Importance="High" Text="@(FilesFromArchive) -> %(FilesFromArchive.TargetPath)" />
     <Copy SourceFiles="@(FilesFromArchive)"
           DestinationFiles="@(FilesFromArchive->'%(TargetPath)')" />
   </Target>

From e0e439d1c13eab5955f7c162d3b422bcca6320cb Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Thu, 23 Aug 2018 21:42:38 -0700
Subject: [PATCH 6/6] Fix casing of TF redist proj

---
 ...Tensorflow.Redist.proj => Microsoft.ML.TensorFlow.Redist.proj} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Redist/Microsoft.ML.TensorFlow.Redist/{Microsoft.ML.Tensorflow.Redist.proj => Microsoft.ML.TensorFlow.Redist.proj} (100%)

diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.proj
similarity index 100%
rename from src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.Tensorflow.Redist.proj
rename to src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.proj