From ee155a40ccf31a8dc76b00f376766a676431b5d1 Mon Sep 17 00:00:00 2001
From: Harish Kulkarni <harish.kulkarni@microsoft.com>
Date: Mon, 15 Jul 2019 13:48:07 -0700
Subject: [PATCH 1/2] Fixed behavior of UpdateSHA

---
 .../SciSharp.TensorFlow.Redist.nupkgproj        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj b/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
index 79eaa564..0c066b01 100644
--- a/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
+++ b/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
@@ -102,27 +102,26 @@
           ItemName="FilesWithHashes" />
     </GetFileHash>
 
-    <Message Importance="High"
-             Text="%(FilesWithHashes.Identity): %(FilesWithHashes.FileHash)" />
+    <WriteLinesToFile File="%(FilesWithHashes.Identity).sha" Lines="%(FilesWithHashes.FileHash)" Overwrite="true"/>
+
+    <!-- If specified we'll update the checked in SHAs with the downloaded ones. -->
+    <Copy Condition="'$(UpdateSHA)' == 'true'"
+          SourceFiles="@(TensorFlowArchive->'%(DownloadShaFile)')"
+          DestinationFiles="@(TensorFlowArchive->'%(LocalShaFile)')" />
 
     <ItemGroup>
       <TensorFlowArchive>
         <DownloadSha>@(FilesWithHashes->'%(FileHash)')</DownloadSha>
-        <LocalSha>$([System.IO.File]::ReadAllText('%(LocalShaFile)'))</LocalSha>
+        <LocalSha>$([System.IO.File]::ReadAllText('%(LocalShaFile)').Replace("%0A", ""))</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." />
+    <Error Condition="'%(TensorFlowArchive.LocalSha)' != '%(TensorFlowArchive.DownloadSha)'" Text="Downloaded file '%(TensorFlowArchive.DownloadFile)' has unexpected SHA.%0A  expected: %(TensorFlowArchive.LocalSha)%0A  --actual: %(TensorFlowArchive.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 -->

From f0c318621adfbd1566043228649d6425b8c83d39 Mon Sep 17 00:00:00 2001
From: "Harish S. Kulkarni" <harishsk@microsoft.com>
Date: Mon, 15 Jul 2019 13:59:54 -0700
Subject: [PATCH 2/2] Fixed compare bug on Windows

---
 .../SciSharp.TensorFlow.Redist.nupkgproj                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj b/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
index 0c066b01..a0ca0a0a 100644
--- a/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
+++ b/src/SciSharp.TensorFlow.Redist/SciSharp.TensorFlow.Redist.nupkgproj
@@ -112,7 +112,7 @@
     <ItemGroup>
       <TensorFlowArchive>
         <DownloadSha>@(FilesWithHashes->'%(FileHash)')</DownloadSha>
-        <LocalSha>$([System.IO.File]::ReadAllText('%(LocalShaFile)').Replace("%0A", ""))</LocalSha>
+        <LocalSha>$([System.IO.File]::ReadAllText('%(LocalShaFile)').Replace("%0A", "").Replace("%0D", ""))</LocalSha>
       </TensorFlowArchive>
     </ItemGroup>