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] 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 06ce4974..82f82eba 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 00000000..f1e934be
--- /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