Merge remote-tracking branch 'origin/v3.5' into mergev3.5

Author: AArnott

src/NerdBank.GitVersioning/ManagedGit/DeltaStreamReader.cs

@@ -84,6 +84,12 @@ public static class DeltaStreamReader
             {
                 value.Size |= (byte)stream.ReadByte() << 16;
             }
+
+            // Size zero is automatically converted to 0x10000.
+            if (value.Size == 0)
+            {
+                value.Size = 0x10000;
+            }
         }
 
         return value;

src/NerdBank.GitVersioning/ManagedGit/GitPackDeltafiedStream.cs

@@ -136,11 +136,7 @@ public override long Seek(long offset, SeekOrigin origin)
         if (origin == SeekOrigin.Begin && offset > this.position)
         {
             // We can optimise this by skipping over instructions rather than executing them
-            int length = (int)(offset - this.position);
-
-            byte[] buffer = ArrayPool<byte>.Shared.Rent(length);
-            this.Read(buffer, 0, length);
-            ArrayPool<byte>.Shared.Return(buffer);
+            this.ReadExactly(checked((int)(offset - this.position)));
             return this.position;
         }
         else

src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheStream.cs

@@ -82,13 +82,9 @@ public override long Seek(long offset, SeekOrigin origin)
 
         if (offset > this.cacheStream.Length)
         {
-            int toRead = (int)(offset - this.cacheStream.Length);
-            byte[] buffer = ArrayPool<byte>.Shared.Rent(toRead);
-            int read = this.stream.Read(buffer, 0, toRead);
             this.cacheStream.Seek(0, SeekOrigin.End);
-            this.cacheStream.Write(buffer, 0, read);
-            ArrayPool<byte>.Shared.Return(buffer);
-
+            int toRead = (int)(offset - this.cacheStream.Length);
+            this.stream.ReadExactly(toRead, this.cacheStream);
             this.DisposeStreamIfRead();
             return this.cacheStream.Position;
         }

src/NerdBank.GitVersioning/ManagedGit/StreamExtensions.cs

@@ -151,4 +151,31 @@ internal static bool TryAdd<TKey, TValue>(this System.Collections.Generic.IDicti
         return true;
     }
 #endif
+
+    /// <summary>
+    /// Reads the specified number of bytes from a stream, or until the end of the stream.
+    /// </summary>
+    /// <param name="readFrom">The stream to read from.</param>
+    /// <param name="length">The number of bytes to be read.</param>
+    /// <param name="copyTo">The stream to copy the read bytes to, if required.</param>
+    /// <returns>The number of bytes actually read. This will be less than <paramref name="length"/> only if the end of <paramref name="readFrom"/> is reached.</returns>
+    internal static int ReadExactly(this Stream readFrom, int length, Stream? copyTo = null)
+    {
+        int bytesRemaining = length;
+        byte[] buffer = ArrayPool<byte>.Shared.Rent(Math.Min(50 * 1024, bytesRemaining));
+        while (bytesRemaining > 0)
+        {
+            int read = readFrom.Read(buffer, 0, Math.Min(buffer.Length, bytesRemaining));
+            if (read == 0)
+            {
+                break;
+            }
+
+            copyTo?.Write(buffer, 0, read);
+            bytesRemaining -= read;
+        }
+
+        ArrayPool<byte>.Shared.Return(buffer);
+        return length - bytesRemaining;
+    }
 }

src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs

@@ -149,11 +149,7 @@ public override long Seek(long offset, SeekOrigin origin)
         if (origin == SeekOrigin.Begin && offset > this.position)
         {
             // We may be able to optimize this by skipping over the compressed data
-            int length = (int)(offset - this.position);
-
-            byte[] buffer = ArrayPool<byte>.Shared.Rent(length);
-            this.Read(buffer, 0, length);
-            ArrayPool<byte>.Shared.Return(buffer);
+            this.ReadExactly(checked((int)(offset - this.position)));
             return this.position;
         }
         else

src/Nerdbank.GitVersioning.Tasks/CompareFiles.cs

@@ -109,38 +109,27 @@ private bool IsContentOfFilesTheSame(string file1, string file2)
                 return true;
             }
 
+            if (new FileInfo(file1).Length != new FileInfo(file2).Length)
+            {
+                return false;
+            }
+
             // If both are present, we need to do a content comparison.
-            using (FileStream fileStream1 = File.OpenRead(file1))
+            // Keep our comparison simple by loading both in memory.
+            byte[] file1Content = File.ReadAllBytes(file1);
+            byte[] file2Content = File.ReadAllBytes(file2);
+
+            // One more sanity check.
+            if (file1Content.Length != file2Content.Length)
             {
-                using (FileStream fileStream2 = File.OpenRead(file2))
+                return false;
+            }
+
+            for (int i = 0; i < file1Content.Length; i++)
+            {
+                if (file1Content[i] != file2Content[i])
                 {
-                    if (fileStream1.Length != fileStream2.Length)
-                    {
-                        return false;
-                    }
-
-                    byte[] buffer1 = new byte[4096];
-                    byte[] buffer2 = new byte[buffer1.Length];
-                    int bytesRead;
-                    do
-                    {
-                        bytesRead = fileStream1.Read(buffer1, 0, buffer1.Length);
-                        if (fileStream2.Read(buffer2, 0, buffer2.Length) != bytesRead)
-                        {
-                            // We should never get here since we compared file lengths, but
-                            // this is a sanity check.
-                            return false;
-                        }
-
-                        for (int i = 0; i < bytesRead; i++)
-                        {
-                            if (buffer1[i] != buffer2[i])
-                            {
-                                return false;
-                            }
-                        }
-                    }
-                    while (bytesRead == buffer1.Length);
+                    return false;
                 }
             }
 

src/Nerdbank.GitVersioning.Tasks/build/PrivateP2PCaching.proj

@@ -22,15 +22,18 @@
   <Target Name="SatelliteDllsProjectOutputGroup" />
   <Target Name="BuiltProjectOutputGroupDependencies" />
   <Target Name="DebugSymbolsProjectOutputGroup" />
-  
+
   <!-- WinUI3 seems to want this target -->
   <Target Name="GetTargetPathWithTargetPlatformMoniker" />
-  
+
   <!-- dotnet watch needs this target -->
   <Target Name="_CollectWatchItems" />
-  
+
   <!-- VS Test wants to see this target -->
   <Target Name="VSTest" />
 
+  <!-- SqlServer projects want this target-->
+  <Target Name="GetTargetPath" />
+
   <Import Project="$(NBGV_PrivateP2PAuxTargets)" Condition=" '$(NBGV_PrivateP2PAuxTargets)' != '' " />
 </Project>