From 1b5445c7fbbe3cc5409208bd2bc8f6504bf12135 Mon Sep 17 00:00:00 2001
From: "Harish S. Kulkarni" <harishsk@microsoft.com>
Date: Thu, 11 Jul 2019 15:35:35 -0700
Subject: [PATCH 1/5] Initial commit for redistributing TF binaries as a nuget
 package

---
 src/TensorFlowNET.Redist/CommonPackage.props  |  24 +++
 .../TensorFlowNET.Redist.nupkgproj            | 195 ++++++++++++++++++
 ...orflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha |   1 +
 ...sorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha |   1 +
 ...nsorflow-cpu-windows-x86_64-1.14.0.zip.sha |   1 +
 5 files changed, 222 insertions(+)
 create mode 100644 src/TensorFlowNET.Redist/CommonPackage.props
 create mode 100644 src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
 create mode 100644 src/TensorFlowNET.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha
 create mode 100644 src/TensorFlowNET.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha
 create mode 100644 src/TensorFlowNET.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha

diff --git a/src/TensorFlowNET.Redist/CommonPackage.props b/src/TensorFlowNET.Redist/CommonPackage.props
new file mode 100644
index 000000000..08fbb153a
--- /dev/null
+++ b/src/TensorFlowNET.Redist/CommonPackage.props
@@ -0,0 +1,24 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+  NuGet packages.config doesn't support native assemblies automatically,
+  so copy the native assemblies to the output directory.
+  -->
+  <ItemGroup Condition="Exists('packages.config') OR
+                        Exists('$(MSBuildProjectName).packages.config') OR
+                        Exists('packages.$(MSBuildProjectName).config')">
+    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\*.dll"
+             Condition="'$(PlatformTarget)' == 'x64'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+      <Link>%(Filename)%(Extension)</Link>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
+             Condition="'$(PlatformTarget)' == 'x86'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+      <Link>%(Filename)%(Extension)</Link>
+    </Content>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj b/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
new file mode 100644
index 000000000..06ce49745
--- /dev/null
+++ b/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
@@ -0,0 +1,195 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <ProjDir>$(MSBuildThisFileDirectory)</ProjDir>
+    <BinDir>$(ProjRoot)bin\</BinDir>
+    <ObjDir>$(ProjRoot)obj\</ObjDir>
+    <PackageAssetsPath>$(BinDir)packages\</PackageAssetsPath>
+
+
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    
+    <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <TensorFlowVersion>1.14.0</TensorFlowVersion>
+    <TensorFlowMajorVersion>1</TensorFlowMajorVersion>
+
+    <GenerateNuspecDependsOn>CopyFilesFromArchive</GenerateNuspecDependsOn>
+    
+    <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>
+
+    <PackageId>TensorFlowNET.Redist</PackageId>
+    <Authors>The TensorFlow Authors</Authors>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>$(MSBuildProjectName) contains the TensorFlow C library version $(TensorFlowVersion) redistributed as a NuGet package.</PackageDescription>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Copyright>Copyright 2019 The TensorFlow Authors. All rights reserved.</Copyright>
+    <PackageProjectUrl>https://www.tensorflow.org</PackageProjectUrl>
+    <PackageReleaseNotes>https://github.com/tensorflow/tensorflow/releases/tag/v$(TensorFlowVersion)</PackageReleaseNotes>
+    <PackageTags>$(PackageTags) TensorFlow</PackageTags>
+    <!-- TODO: consider PackageIconUrl -->
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IncludeMLNetNotices>false</IncludeMLNetNotices>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Content Include="CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="$(PackageAssetsPath)$(PackageId)\LICENSE.txt" Pack="true" PackagePath="" />
+    <Content Condition="Exists('$(PackageAssetsPath)\$(PackageId)\THIRD_PARTY_NOTICES.txt')" Include="$(PackageAssetsPath)\$(PackageId)\THIRD_PARTY_NOTICES.txt" Pack="true" PackagePath="" />
+    <Content Include="$(PackageAssetsPath)$(PackageId)\runtimes\**\*" Pack="true" PackagePath="runtimes" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <TensorFlowConfig Include="windows"
+                      FileExtension=".zip"
+                      FilesFromArchive="lib\tensorflow.dll;
+                                        include\tensorflow\c\LICENSE"
+                      Runtime="win-x64"/>
+
+    <TensorFlowConfig Condition="'$(OS)' != 'Windows_NT'"
+                      Include="linux"
+                      FileExtension=".tar.gz"
+                      FilesFromArchive="lib\libtensorflow.so;
+                                        lib\libtensorflow_framework.so.$(TensorFlowMajorVersion);
+                                        include\tensorflow\c\LICENSE"
+                      Runtime="linux-x64" />
+
+    <TensorFlowConfig Condition="'$(OS)' != 'Windows_NT'"
+                      Include="darwin" FileExtension=".tar.gz"
+                      FilesFromArchive="lib\libtensorflow.dylib;
+                                        lib\libtensorflow_framework.$(TensorFlowMajorVersion).dylib;
+                                        include\tensorflow\c\LICENSE"
+                      Runtime="osx-x64" />
+
+    <AdditionalDownloadFile Include="https://raw.githubusercontent.com/tensorflow/tensorflow/master/LICENSE"
+                            DownloadFile="$(BinDir)LICENSE" />
+  </ItemGroup>
+
+  <Target Name="PrepareArchives">
+    <ItemGroup>
+      <!-- although we could extract all archives on all machines, mac requires a fixup which can only be run on mac 
+           so we split these per-rid and join during the official build packaging.  -->
+      <TensorFlowArchive
+                         Include="@(TensorFlowConfig->'https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-%(Identity)-x86_64-$(TensorFlowVersion)%(FileExtension)')" />
+      <!-- set up metdata used by all targets -->
+      <TensorFlowArchive DownloadFile="$(BinDir)%(FileName)%(Extension)"
+                         DownloadShaFile="$(BinDir)%(FileName)%(Extension).sha"
+                         ExtractDirectory="$(BinDir)%(FileName)"
+                         ExtractSemaphore="$(BinDir)%(FileName)\.extracted"
+                         LocalShaFile="$(MSBuildProjectDirectory)\%(FileName)%(Extension).sha"/>
+    </ItemGroup>
+    <Message Importance="high" Text="%(TensorFlowConfig.Runtime)"/>
+  </Target>
+
+  <Target Name="DownloadArchives"
+          DependsOnTargets="PrepareArchives"
+          Inputs="$(MSBuildProjectFile)"
+          Outputs="@(TensorFlowArchive->'%(DownloadFile)');@(AdditionalDownloadFile->'%(DownloadFile)')">
+    <MakeDir Directories="$(BinDir)" />
+    <ItemGroup>
+      <_downloadFiles Include="@(TensorFlowArchive);@(AdditionalDownloadFile)" Url="%(Identity)" DestinationFile="%(DownloadFile)" />
+    </ItemGroup>
+    <Message Importance="High" Text="Downloading '%(_downloadFiles.Identity)' to '$(BinDir)'." />
+    <DownloadFile SourceUrl="%(_downloadFiles.Identity)" DestinationFolder="$(BinDir)">
+      <Output TaskParameter="DownloadedFile" ItemName="Content" />
+    </DownloadFile>
+  </Target>
+
+
+  <Target Name="ValidateAndExtractArchives"
+          DependsOnTargets="DownloadArchives"
+          Inputs="@(TensorFlowArchive->'%(DownloadFile)')"
+          Outputs="@(TensorFlowArchive->'%(ExtractSemaphore)')">
+
+    <GetFileHash Files="@(TensorFlowArchive->'%(DownloadFile)')" Algorithm="SHA512">
+      <Output
+          TaskParameter="Items"
+          ItemName="FilesWithHashes" />
+    </GetFileHash>
+
+    <Message Importance="High"
+             Text="%(FilesWithHashes.Identity): %(FilesWithHashes.FileHash)" />
+
+    <ItemGroup>
+      <TensorFlowArchive>
+        <DownloadSha>@(FilesWithHashes->'%(FileHash)')</DownloadSha>
+        <LocalSha>$([System.IO.File]::ReadAllText('%(LocalShaFile)'))</LocalSha>
+      </TensorFlowArchive>
+    </ItemGroup>
+
+    <!-- If specified we'll update the checked in SHAs with the downloaded ones. -->
+    <!--<WriteLinesToFile  Condition="'$(UpdateSHA)' == 'true'"
+          File="@(TensorFlowArchive->'%(LocalShaFile)')"
+          Lines="@(TensorFlowArchive->'%(LocalShaFile)')" />-->
+
+    <Error Condition="!Exists('%(TensorFlowArchive.LocalShaFile)')" Text="SHA file '%(TensorFlowArchive.LocalShaFile)' does not exist.  Build with /p:UpdateSHA=true to save it." />
+
+    <Message Importance="High" Text="@TensorFlowArchive->'%(TensorFlowArchive.DownloadFile) - %(TensorFlowArchive.LocalSha) - %(TensorFlowArchive.DownloadSha)"/>
+
+    <!-- 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)')" />
+
+    <Message Importance="High" Text="Decompressing '%(TensorFlowArchive.DownloadFile)' to '%(TensorFlowArchive.ExtractDirectory)'." />
+
+    <Unzip Condition="'$(PackageRid)' == 'win-x64'"
+                               SourceFiles="%(TensorFlowArchive.DownloadFile)"
+                               DestinationFolder="%(TensorFlowArchive.ExtractDirectory)" />
+
+    <Exec Condition="'$(OS)' != 'Windows_NT'"
+          WorkingDirectory="%(TensorFlowArchive.ExtractDirectory)"
+          Command="tar -xzmf %(TensorFlowArchive.DownloadFile) -C %(TensorFlowArchive.ExtractDirectory)" />
+
+    <Touch Files="@(TensorFlowArchive->'%(ExtractSemaphore)')" AlwaysCreate="true" />
+  </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)"/>
+      <_fileFromArchive PackagePath="runtimes\%(_fileFromArchive.Runtime)\native\%(_fileFromArchive.DestinationFile)" />
+
+      <!-- LICENSE from the package is actually THIRD_PARTY_NOTICES-->
+      <_fileFromArchive Condition="'%(DestinationFile)' == 'LICENSE'" PackagePath="THIRD_PARTY_NOTICES.txt" Runtime="" />
+
+      <!-- copy to packaging location -->
+      <FilesFromArchive Include="@(_fileFromArchive->'%(ExtractDirectory)\%(Identity)')"
+                        TargetPath="$(PackageAssetsPath)$(MSBuildProjectName)\%(PackagePath)" />
+      <!-- include LICENSE that was downloaded from GitHub -->
+      <FilesFromArchive Include="$(BinDir)\LICENSE"
+                        TargetPath="$(PackageAssetsPath)$(MSBuildProjectName)\LICENSE.txt" />
+
+      <!-- copy to NativeAssets location, only for current RID, so that they may be used by tests -->
+      <FilesFromArchive Condition="'$(PackageRID)' == '%(_fileFromArchive.Runtime)'"
+                        Include="@(_fileFromArchive->'%(ExtractDirectory)\%(Identity)')"
+                        TargetPath="$(NativeAssetsBuiltPath)\%(_fileFromArchive.DestinationFile)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="CopyFilesFromArchive"
+          DependsOnTargets="GetFilesFromArchive">
+    <Message Importance="High" Text="@(FilesFromArchive) -> %(FilesFromArchive.TargetPath)" />
+    <Copy SourceFiles="@(FilesFromArchive)"
+          DestinationFiles="@(FilesFromArchive->'%(TargetPath)')" />
+  </Target>
+
+  <Target Name="Clean">
+    <Message Importance="High" Text="Deleting $(BinDir);$(ObjDir)" />
+    <RemoveDir Directories="$(BinDir);$(ObjDir)" />
+  </Target>
+  
+</Project>
diff --git a/src/TensorFlowNET.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha b/src/TensorFlowNET.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha
new file mode 100644
index 000000000..951c4556e
--- /dev/null
+++ b/src/TensorFlowNET.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha
@@ -0,0 +1 @@
+7002EF701BD23C5EF5FF94192E935F0DDF960A21BE2531CEE158586830C00E0BA889900F7F6E8AB568BEE0ACF1F5A6A246BB43D11C4109E9DC782B46377D8142
\ No newline at end of file
diff --git a/src/TensorFlowNET.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha b/src/TensorFlowNET.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha
new file mode 100644
index 000000000..784640a02
--- /dev/null
+++ b/src/TensorFlowNET.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha
@@ -0,0 +1 @@
+E3F6D0309117E9E45780ECF8BC4D0268B3FC9F12E3E38FFE58496789330A4ACD2DC8FF721F3B8900357F6155F8A54000E45B99495F823486B558E8B42532392D
\ No newline at end of file
diff --git a/src/TensorFlowNET.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha b/src/TensorFlowNET.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha
new file mode 100644
index 000000000..b7d6402c4
--- /dev/null
+++ b/src/TensorFlowNET.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha
@@ -0,0 +1 @@
+59A2B80B441439B851202358CE4A65BA0DDDB319A8A29E87B135DCD9954BC5B0628F2C0C8E72D6942EA3CDCE172805C2BD5421815B3D0210B62BC0936DC59A08
\ No newline at end of file

From bc7026fea14cb7272f453f5edc6f3ce75bfb3107 Mon Sep 17 00:00:00 2001
From: "Harish S. Kulkarni" <harishsk@microsoft.com>
Date: Fri, 12 Jul 2019 13:40:27 -0700
Subject: [PATCH 2/5] Changed project file to use nuspec file

---
 .../TensorFlowNET.Redist.nupkgproj            | 53 ++++++++-----------
 src/TensorFlowNET.Redist/redist.nuspec        | 26 +++++++++
 2 files changed, 47 insertions(+), 32 deletions(-)
 create mode 100644 src/TensorFlowNET.Redist/redist.nuspec

diff --git a/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj b/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
index 06ce49745..82f82ebac 100644
--- a/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
+++ b/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
@@ -2,50 +2,38 @@
   
   <PropertyGroup>
     <ProjDir>$(MSBuildThisFileDirectory)</ProjDir>
-    <BinDir>$(ProjRoot)bin\</BinDir>
-    <ObjDir>$(ProjRoot)obj\</ObjDir>
-    <PackageAssetsPath>$(BinDir)packages\</PackageAssetsPath>
-
+    <BinDir>$(ProjDir)bin\</BinDir>
+    <ObjDir>$(ProjDir)obj\</ObjDir>
 
-    <NoBuild>true</NoBuild>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    
     <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
     <TargetFramework>netstandard2.0</TargetFramework>
     <TensorFlowVersion>1.14.0</TensorFlowVersion>
     <TensorFlowMajorVersion>1</TensorFlowMajorVersion>
 
+    <PackageAssetsPath>$(BinDir)packages\</PackageAssetsPath>
+    <PackageId>$(MSBuildProjectName)</PackageId>
+    <PackageVersion>0.15.0</PackageVersion>
+
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+
+    <NuspecFile>Redist.nuspec</NuspecFile>
+    <NuspecProperties>packageId=$(PackageId);version=$(PackageVersion)</NuspecProperties>
+    <NuspecBasePath>$(ProjDir)</NuspecBasePath>
+
     <GenerateNuspecDependsOn>CopyFilesFromArchive</GenerateNuspecDependsOn>
-    
+
     <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>
 
-    <PackageId>TensorFlowNET.Redist</PackageId>
-    <Authors>The TensorFlow Authors</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>$(MSBuildProjectName) contains the TensorFlow C library version $(TensorFlowVersion) redistributed as a NuGet package.</PackageDescription>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Copyright>Copyright 2019 The TensorFlow Authors. All rights reserved.</Copyright>
-    <PackageProjectUrl>https://www.tensorflow.org</PackageProjectUrl>
-    <PackageReleaseNotes>https://github.com/tensorflow/tensorflow/releases/tag/v$(TensorFlowVersion)</PackageReleaseNotes>
-    <PackageTags>$(PackageTags) TensorFlow</PackageTags>
-    <!-- TODO: consider PackageIconUrl -->
   </PropertyGroup>
 
   <PropertyGroup>
     <IncludeMLNetNotices>false</IncludeMLNetNotices>
   </PropertyGroup>
   
-  <ItemGroup>
-    <Content Include="CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
-    <Content Include="$(PackageAssetsPath)$(PackageId)\LICENSE.txt" Pack="true" PackagePath="" />
-    <Content Condition="Exists('$(PackageAssetsPath)\$(PackageId)\THIRD_PARTY_NOTICES.txt')" Include="$(PackageAssetsPath)\$(PackageId)\THIRD_PARTY_NOTICES.txt" Pack="true" PackagePath="" />
-    <Content Include="$(PackageAssetsPath)$(PackageId)\runtimes\**\*" Pack="true" PackagePath="runtimes" />
-  </ItemGroup>
-
   <ItemGroup>
     <TensorFlowConfig Include="windows"
                       FileExtension=".zip"
@@ -143,13 +131,13 @@
 
     <Message Importance="High" Text="Decompressing '%(TensorFlowArchive.DownloadFile)' to '%(TensorFlowArchive.ExtractDirectory)'." />
 
-    <Unzip Condition="'$(PackageRid)' == 'win-x64'"
+    <Unzip Condition="'%(TensorFlowArchive.FileExtension)' == '.zip'"
                                SourceFiles="%(TensorFlowArchive.DownloadFile)"
                                DestinationFolder="%(TensorFlowArchive.ExtractDirectory)" />
 
-    <Exec Condition="'$(OS)' != 'Windows_NT'"
-          WorkingDirectory="%(TensorFlowArchive.ExtractDirectory)"
-          Command="tar -xzmf %(TensorFlowArchive.DownloadFile) -C %(TensorFlowArchive.ExtractDirectory)" />
+    <Exec Condition="'$(OS)' != 'Windows_NT' AND '%(TensorFlowArchive.FileExtension)' == '.tar.gz'"
+          WorkingDirectory="$(MSBuildThisFileDirectory)"
+          Command="tar -xzmv --hard-dereference -f %(TensorFlowArchive.DownloadFile) -C %(TensorFlowArchive.ExtractDirectory)" />
 
     <Touch Files="@(TensorFlowArchive->'%(ExtractSemaphore)')" AlwaysCreate="true" />
   </Target>
@@ -174,14 +162,15 @@
                         TargetPath="$(PackageAssetsPath)$(MSBuildProjectName)\LICENSE.txt" />
 
       <!-- copy to NativeAssets location, only for current RID, so that they may be used by tests -->
-      <FilesFromArchive Condition="'$(PackageRID)' == '%(_fileFromArchive.Runtime)'"
+      <!--<FilesFromArchive Condition="'$(PackageRID)' == '%(_fileFromArchive.Runtime)'"
                         Include="@(_fileFromArchive->'%(ExtractDirectory)\%(Identity)')"
-                        TargetPath="$(NativeAssetsBuiltPath)\%(_fileFromArchive.DestinationFile)" />
+                        TargetPath="$(NativeAssetsBuiltPath)\%(_fileFromArchive.DestinationFile)" />-->
     </ItemGroup>
   </Target>
 
   <Target Name="CopyFilesFromArchive"
           DependsOnTargets="GetFilesFromArchive">
+
     <Message Importance="High" Text="@(FilesFromArchive) -> %(FilesFromArchive.TargetPath)" />
     <Copy SourceFiles="@(FilesFromArchive)"
           DestinationFiles="@(FilesFromArchive->'%(TargetPath)')" />
diff --git a/src/TensorFlowNET.Redist/redist.nuspec b/src/TensorFlowNET.Redist/redist.nuspec
new file mode 100644
index 000000000..f1e934be5
--- /dev/null
+++ b/src/TensorFlowNET.Redist/redist.nuspec
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>$packageId$</id>
+    <version>$version$</version>
+    <authors>The TensorFlow Authors</authors>
+    <owners>The TensorFlow Authors</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="file">LICENSE.txt</license>
+    <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
+    <projectUrl>https://www.tensorflow.org/</projectUrl>
+    <description>TensorFlowNET.Redist contains the TensorFlow C library version 1.14.0 redistributed as a NuGet package.</description>
+    <releaseNotes>https://github.com/tensorflow/tensorflow/releases/tag/v1.14.0</releaseNotes>
+    <copyright>Copyright 2019 The TensorFlow Authors. All rights reserved.</copyright>
+    <tags>TensorFlow</tags>
+    <dependencies>
+      <group targetFramework=".NETStandard2.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="CommonPackage.props" target="build\netstandard2.0\TensorFlowNET.Redist.props" />
+    <file src="bin\packages\TensorFlowNET.Redist\LICENSE.txt" target="LICENSE.txt" />
+    <file src="bin\packages\TensorFlowNET.Redist\THIRD_PARTY_NOTICES.txt" target="THIRD_PARTY_NOTICES.txt" />
+    <file src="bin\packages\TensorFlowNET.Redist\runtimes\**\*" target="runtimes" />
+  </files>
+</package>
\ No newline at end of file

From a2dceb5b919c2aa9ef7d1193efeb177c4f6bc001 Mon Sep 17 00:00:00 2001
From: Harish Kulkarni <harish.kulkarni@microsoft.com>
Date: Fri, 12 Jul 2019 15:01:21 -0700
Subject: [PATCH 3/5] Made extracted files writeables to permit repeated
 running of pack command

---
 src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj b/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
index 82f82ebac..622b9d12c 100644
--- a/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
+++ b/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
@@ -139,6 +139,9 @@
           WorkingDirectory="$(MSBuildThisFileDirectory)"
           Command="tar -xzmv --hard-dereference -f %(TensorFlowArchive.DownloadFile) -C %(TensorFlowArchive.ExtractDirectory)" />
 
+    <Exec Condition="'$(OS)' != 'Windows_NT'"
+          Command="chmod -R +w %(TensorFlowArchive.ExtractDirectory)" />
+
     <Touch Files="@(TensorFlowArchive->'%(ExtractSemaphore)')" AlwaysCreate="true" />
   </Target>
 
@@ -174,6 +177,7 @@
     <Message Importance="High" Text="@(FilesFromArchive) -> %(FilesFromArchive.TargetPath)" />
     <Copy SourceFiles="@(FilesFromArchive)"
           DestinationFiles="@(FilesFromArchive->'%(TargetPath)')" />
+
   </Target>
 
   <Target Name="Clean">

From 7a8e007e5473b51eb66dcac67aedb0a2c3ff88a7 Mon Sep 17 00:00:00 2001
From: "Harish S. Kulkarni" <harishsk@microsoft.com>
Date: Fri, 12 Jul 2019 15:46:11 -0700
Subject: [PATCH 4/5] Renamed package to SciSharp.TensorFlow.Redist

---
 .../CommonPackage.props                              |  0
 .../SciSharp.TensorFlow.Redist.nupkgproj}            |  0
 ...libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha |  0
 .../libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha |  0
 .../libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha  |  0
 .../redist.nuspec                                    | 12 ++++++------
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{TensorFlowNET.Redist => SciSharp.TensorFlow.Redist}/CommonPackage.props (100%)
 rename src/{TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj => SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj} (100%)
 rename src/{TensorFlowNET.Redist => SciSharp.TensorFlow.Redist}/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha (100%)
 rename src/{TensorFlowNET.Redist => SciSharp.TensorFlow.Redist}/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha (100%)
 rename src/{TensorFlowNET.Redist => SciSharp.TensorFlow.Redist}/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha (100%)
 rename src/{TensorFlowNET.Redist => SciSharp.TensorFlow.Redist}/redist.nuspec (64%)

diff --git a/src/TensorFlowNET.Redist/CommonPackage.props b/src/SciSharp.TensorFlow.Redist/CommonPackage.props
similarity index 100%
rename from src/TensorFlowNET.Redist/CommonPackage.props
rename to src/SciSharp.TensorFlow.Redist/CommonPackage.props
diff --git a/src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj b/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
similarity index 100%
rename from src/TensorFlowNET.Redist/TensorFlowNET.Redist.nupkgproj
rename to src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
diff --git a/src/TensorFlowNET.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha b/src/SciSharp.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha
similarity index 100%
rename from src/TensorFlowNET.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha
rename to src/SciSharp.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz.sha
diff --git a/src/TensorFlowNET.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha b/src/SciSharp.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha
similarity index 100%
rename from src/TensorFlowNET.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha
rename to src/SciSharp.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz.sha
diff --git a/src/TensorFlowNET.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha b/src/SciSharp.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha
similarity index 100%
rename from src/TensorFlowNET.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha
rename to src/SciSharp.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.14.0.zip.sha
diff --git a/src/TensorFlowNET.Redist/redist.nuspec b/src/SciSharp.TensorFlow.Redist/redist.nuspec
similarity index 64%
rename from src/TensorFlowNET.Redist/redist.nuspec
rename to src/SciSharp.TensorFlow.Redist/redist.nuspec
index f1e934be5..d2527c8bd 100644
--- a/src/TensorFlowNET.Redist/redist.nuspec
+++ b/src/SciSharp.TensorFlow.Redist/redist.nuspec
@@ -9,8 +9,8 @@
     <license type="file">LICENSE.txt</license>
     <licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
     <projectUrl>https://www.tensorflow.org/</projectUrl>
-    <description>TensorFlowNET.Redist contains the TensorFlow C library version 1.14.0 redistributed as a NuGet package.</description>
-    <releaseNotes>https://github.com/tensorflow/tensorflow/releases/tag/v1.14.0</releaseNotes>
+    <description>$packageId$ contains the TensorFlow C library version $version$ redistributed as a NuGet package.</description>
+    <releaseNotes>https://github.com/tensorflow/tensorflow/releases/tag/v$version$</releaseNotes>
     <copyright>Copyright 2019 The TensorFlow Authors. All rights reserved.</copyright>
     <tags>TensorFlow</tags>
     <dependencies>
@@ -18,9 +18,9 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="CommonPackage.props" target="build\netstandard2.0\TensorFlowNET.Redist.props" />
-    <file src="bin\packages\TensorFlowNET.Redist\LICENSE.txt" target="LICENSE.txt" />
-    <file src="bin\packages\TensorFlowNET.Redist\THIRD_PARTY_NOTICES.txt" target="THIRD_PARTY_NOTICES.txt" />
-    <file src="bin\packages\TensorFlowNET.Redist\runtimes\**\*" target="runtimes" />
+    <file src="CommonPackage.props" target="build\netstandard2.0\$packageId$.props" />
+    <file src="bin\packages\$packageId$\LICENSE.txt" target="LICENSE.txt" />
+    <file src="bin\packages\$packageId$\THIRD_PARTY_NOTICES.txt" target="THIRD_PARTY_NOTICES.txt" />
+    <file src="bin\packages\$packageId$\runtimes\**\*" target="runtimes" />
   </files>
 </package>
\ No newline at end of file

From 580ae1a5e55ae28cdc8ce22413b9a12c80cde193 Mon Sep 17 00:00:00 2001
From: Harish Kulkarni <harish.kulkarni@microsoft.com>
Date: Fri, 12 Jul 2019 16:26:04 -0700
Subject: [PATCH 5/5] Changed version to match tensorflow version and reduced
 verbosity in tar command

---
 .../SciSharp.TensorFlow.Redist.nupkgproj                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj b/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
index 622b9d12c..79eaa5648 100644
--- a/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
+++ b/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
@@ -12,7 +12,7 @@
 
     <PackageAssetsPath>$(BinDir)packages\</PackageAssetsPath>
     <PackageId>$(MSBuildProjectName)</PackageId>
-    <PackageVersion>0.15.0</PackageVersion>
+    <PackageVersion>$(TensorFlowVersion)</PackageVersion>
 
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -137,7 +137,7 @@
 
     <Exec Condition="'$(OS)' != 'Windows_NT' AND '%(TensorFlowArchive.FileExtension)' == '.tar.gz'"
           WorkingDirectory="$(MSBuildThisFileDirectory)"
-          Command="tar -xzmv --hard-dereference -f %(TensorFlowArchive.DownloadFile) -C %(TensorFlowArchive.ExtractDirectory)" />
+          Command="tar -xzm --hard-dereference -f %(TensorFlowArchive.DownloadFile) -C %(TensorFlowArchive.ExtractDirectory)" />
 
     <Exec Condition="'$(OS)' != 'Windows_NT'"
           Command="chmod -R +w %(TensorFlowArchive.ExtractDirectory)" />