Merge pull request #661 from dotnet/preprocessorChanges

AArnott · web-flow · commit 9c1d6c6c9b7a · 2021-09-22T22:21:07.000-06:00
Revise the preprocessor symbols we use
diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitPack.cs b/src/NerdBank.GitVersioning/ManagedGit/GitPack.cs
@@ -39,7 +39,7 @@ public class GitPack : IDisposable
 
         // A histogram which tracks the objects which have been retrieved from this GitPack. The key is the offset
         // of the object. Used to get some insights in usage patterns.
-#if DEBUG && !NETSTANDARD
+#if DEBUG
         private readonly Dictionary<long, int> histogram = new Dictionary<long, int>();
 #endif
 
@@ -172,7 +172,7 @@ public bool TryGetObject(GitObjectId objectId, string objectType, out Stream? va
         /// </returns>
         public Stream GetObject(long offset, string objectType)
         {
-#if DEBUG && !NETSTANDARD
+#if DEBUG
             if (!this.histogram.TryAdd(offset, 1))
             {
                 this.histogram[offset] += 1;
@@ -230,7 +230,7 @@ public void GetCacheStatistics(StringBuilder builder)
         {
             builder.AppendLine($"Git Pack:");
 
-#if DEBUG && !NETSTANDARD
+#if DEBUG
             int histogramCount = 25;
             builder.AppendLine($"Top {histogramCount} / {this.histogram.Count} items:");
 
diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitPackDeltafiedStream.cs b/src/NerdBank.GitVersioning/ManagedGit/GitPackDeltafiedStream.cs
@@ -64,7 +64,7 @@ public override long Position
             set => throw new NotImplementedException();
         }
 
-#if NETSTANDARD
+#if NETSTANDARD2_0
         /// <summary>
         /// Reads a sequence of bytes from the current <see cref="GitPackDeltafiedStream"/> and advances the position
         /// within the stream by the number of bytes read.
diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheStream.cs b/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheStream.cs
@@ -37,7 +37,7 @@ public override void Flush()
             throw new NotSupportedException();
         }
 
-#if NETSTANDARD
+#if NETSTANDARD2_0
         public int Read(Span<byte> buffer)
 #else
         /// <inheritdoc/>
diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheViewStream.cs b/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheViewStream.cs
@@ -37,7 +37,7 @@ public override int Read(byte[] buffer, int offset, int count)
             return this.Read(buffer.AsSpan(offset, count));
         }
 
-#if NETSTANDARD
+#if NETSTANDARD2_0
         public int Read(Span<byte> buffer)
 #else
         /// <inheritdoc/>
diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitPackPooledStream.cs b/src/NerdBank.GitVersioning/ManagedGit/GitPackPooledStream.cs
@@ -62,7 +62,7 @@ public override void Flush()
             this.stream.Flush();
         }
 
-#if !NETSTANDARD
+#if !NETSTANDARD2_0
         /// <inheritdoc/>
         public override int Read(Span<byte> buffer)
         {
diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitRepository.cs b/src/NerdBank.GitVersioning/ManagedGit/GitRepository.cs
@@ -28,7 +28,7 @@ public class GitRepository : IDisposable
 
         private readonly List<GitRepository> alternates = new List<GitRepository>();
 
-#if DEBUG && !NETSTANDARD
+#if DEBUG
         private Dictionary<GitObjectId, int> histogram = new Dictionary<GitObjectId, int>();
 #endif
 
@@ -524,7 +524,7 @@ public GitObjectId GetTreeEntry(GitObjectId treeId, ReadOnlySpan<byte> nodeName)
         /// </returns>
         public bool TryGetObjectBySha(GitObjectId sha, string objectType, out Stream? value)
         {
-#if DEBUG && !NETSTANDARD
+#if DEBUG
             if (!this.histogram.TryAdd(sha, 1))
             {
                 this.histogram[sha] += 1;
@@ -566,7 +566,7 @@ public string GetCacheStatistics()
         {
             StringBuilder builder = new StringBuilder();
 
-#if DEBUG && !NETSTANDARD
+#if DEBUG
             int histogramCount = 25;
 
             builder.AppendLine("Overall repository:");
@@ -659,7 +659,7 @@ private ReadOnlyMemory<GitPack> LoadPacks()
 
         private static string TrimEndingDirectorySeparator(string path)
         {
-#if NETSTANDARD
+#if NETSTANDARD2_0
             if (string.IsNullOrEmpty(path) || path.Length == 1)
             {
                 return path;
@@ -690,7 +690,7 @@ private static bool TryConvertHexStringToByteArray(string hexString, Span<byte>
             Requires.Argument(data.Length == hexString.Length / 2, nameof(data), "Length must be exactly half that of " + nameof(hexString) + ".");
             for (int index = 0; index < data.Length; index++)
             {
-#if NETCOREAPP3_1_OR_GREATER
+#if !NETSTANDARD2_0
                 ReadOnlySpan<char> byteValue = hexString.AsSpan(index * 2, 2);
                 if (!byte.TryParse(byteValue, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out data[index]))
                 {
diff --git a/src/NerdBank.GitVersioning/ManagedGit/MemoryMappedStream.cs b/src/NerdBank.GitVersioning/ManagedGit/MemoryMappedStream.cs
@@ -72,7 +72,7 @@ public override int Read(byte[] buffer, int offset, int count)
             return read;
         }
 
-#if !NETSTANDARD
+#if !NETSTANDARD2_0
         /// <inheritdoc/>
         public override int Read(Span<byte> buffer)
         {
diff --git a/src/NerdBank.GitVersioning/ManagedGit/StreamExtensions.cs b/src/NerdBank.GitVersioning/ManagedGit/StreamExtensions.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Buffers;
-using System.Diagnostics;
 using System.IO;
 
 namespace Nerdbank.GitVersioning.ManagedGit
@@ -78,7 +77,7 @@ public static int ReadMbsInt(this Stream stream)
             return value;
         }
 
-#if NETSTANDARD
+#if NETSTANDARD2_0
         /// <summary>
         /// Reads a sequence of bytes from the current stream and advances the position within the stream by
         /// the number of bytes read.
@@ -139,6 +138,17 @@ public static void Write(this Stream stream, Span<byte> span)
                 ArrayPool<byte>.Shared.Return(buffer);
             }
         }
+
+        internal static bool TryAdd<TKey, TValue>(this System.Collections.Generic.IDictionary<TKey, TValue> dictionary, TKey key, TValue value)
+        {
+            if (dictionary.ContainsKey(key))
+            {
+                return false;
+            }
+
+            dictionary.Add(key, value);
+            return true;
+        }
 #endif
     }
 }
diff --git a/src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs b/src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs
@@ -94,7 +94,7 @@ public override int Read(byte[] array, int offset, int count)
             return read;
         }
 
-#if !NETSTANDARD
+#if !NETSTANDARD2_0
         /// <inheritdoc/>
         public override int Read(Span<byte> buffer)
         {
@@ -112,7 +112,7 @@ public override async Task<int> ReadAsync(byte[] array, int offset, int count, C
             return read;
         }
 
-#if !NETSTANDARD
+#if !NETSTANDARD2_0
         /// <inheritdoc/>
         public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
         {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public override long Position`
`64`	`64`	`set => throw new NotImplementedException();`
`65`	`65`	`}`
`66`	`66`
`67`		`-#if NETSTANDARD`
	`67`	`+#if NETSTANDARD2_0`
`68`	`68`	`/// <summary>`
`69`	`69`	`/// Reads a sequence of bytes from the current <see cref="GitPackDeltafiedStream"/> and advances the position`
`70`	`70`	`/// within the stream by the number of bytes read.`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public override void Flush()`
`37`	`37`	`throw new NotSupportedException();`
`38`	`38`	`}`
`39`	`39`
`40`		`-#if NETSTANDARD`
	`40`	`+#if NETSTANDARD2_0`
`41`	`41`	`public int Read(Span<byte> buffer)`
`42`	`42`	`#else`
`43`	`43`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public override int Read(byte[] buffer, int offset, int count)`
`37`	`37`	`return this.Read(buffer.AsSpan(offset, count));`
`38`	`38`	`}`
`39`	`39`
`40`		`-#if NETSTANDARD`
	`40`	`+#if NETSTANDARD2_0`
`41`	`41`	`public int Read(Span<byte> buffer)`
`42`	`42`	`#else`
`43`	`43`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public override void Flush()`
`62`	`62`	`this.stream.Flush();`
`63`	`63`	`}`
`64`	`64`
`65`		`-#if !NETSTANDARD`
	`65`	`+#if !NETSTANDARD2_0`
`66`	`66`	`/// <inheritdoc/>`
`67`	`67`	`public override int Read(Span<byte> buffer)`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class GitRepository : IDisposable`
`28`	`28`
`29`	`29`	`private readonly List<GitRepository> alternates = new List<GitRepository>();`
`30`	`30`
`31`		`-#if DEBUG && !NETSTANDARD`
	`31`	`+#if DEBUG`
`32`	`32`	`private Dictionary<GitObjectId, int> histogram = new Dictionary<GitObjectId, int>();`
`33`	`33`	`#endif`
`34`	`34`
`@@ -524,7 +524,7 @@ public GitObjectId GetTreeEntry(GitObjectId treeId, ReadOnlySpan<byte> nodeName)`
`524`	`524`	`/// </returns>`
`525`	`525`	`public bool TryGetObjectBySha(GitObjectId sha, string objectType, out Stream? value)`
`526`	`526`	`{`
`527`		`-#if DEBUG && !NETSTANDARD`
	`527`	`+#if DEBUG`
`528`	`528`	`if (!this.histogram.TryAdd(sha, 1))`
`529`	`529`	`{`
`530`	`530`	`this.histogram[sha] += 1;`
`@@ -566,7 +566,7 @@ public string GetCacheStatistics()`
`566`	`566`	`{`
`567`	`567`	`StringBuilder builder = new StringBuilder();`
`568`	`568`
`569`		`-#if DEBUG && !NETSTANDARD`
	`569`	`+#if DEBUG`
`570`	`570`	`int histogramCount = 25;`
`571`	`571`
`572`	`572`	`builder.AppendLine("Overall repository:");`
`@@ -659,7 +659,7 @@ private ReadOnlyMemory<GitPack> LoadPacks()`
`659`	`659`
`660`	`660`	`private static string TrimEndingDirectorySeparator(string path)`
`661`	`661`	`{`
`662`		`-#if NETSTANDARD`
	`662`	`+#if NETSTANDARD2_0`
`663`	`663`	`if (string.IsNullOrEmpty(path) \|\| path.Length == 1)`
`664`	`664`	`{`
`665`	`665`	`return path;`
`@@ -690,7 +690,7 @@ private static bool TryConvertHexStringToByteArray(string hexString, Span<byte>`
`690`	`690`	`Requires.Argument(data.Length == hexString.Length / 2, nameof(data), "Length must be exactly half that of " + nameof(hexString) + ".");`
`691`	`691`	`for (int index = 0; index < data.Length; index++)`
`692`	`692`	`{`
`693`		`-#if NETCOREAPP3_1_OR_GREATER`
	`693`	`+#if !NETSTANDARD2_0`
`694`	`694`	`ReadOnlySpan<char> byteValue = hexString.AsSpan(index * 2, 2);`
`695`	`695`	`if (!byte.TryParse(byteValue, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out data[index]))`
`696`	`696`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public override int Read(byte[] buffer, int offset, int count)`
`72`	`72`	`return read;`
`73`	`73`	`}`
`74`	`74`
`75`		`-#if !NETSTANDARD`
	`75`	`+#if !NETSTANDARD2_0`
`76`	`76`	`/// <inheritdoc/>`
`77`	`77`	`public override int Read(Span<byte> buffer)`
`78`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public override int Read(byte[] array, int offset, int count)`
`94`	`94`	`return read;`
`95`	`95`	`}`
`96`	`96`
`97`		`-#if !NETSTANDARD`
	`97`	`+#if !NETSTANDARD2_0`
`98`	`98`	`/// <inheritdoc/>`
`99`	`99`	`public override int Read(Span<byte> buffer)`
`100`	`100`	`{`
`@@ -112,7 +112,7 @@ public override async Task<int> ReadAsync(byte[] array, int offset, int count, C`
`112`	`112`	`return read;`
`113`	`113`	`}`
`114`	`114`
`115`		`-#if !NETSTANDARD`
	`115`	`+#if !NETSTANDARD2_0`
`116`	`116`	`/// <inheritdoc/>`
`117`	`117`	`public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)`
`118`	`118`	`{`