diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitPackDeltafiedStream.cs b/src/NerdBank.GitVersioning/ManagedGit/GitPackDeltafiedStream.cs index 45c9db132..3c08112d0 100644 --- a/src/NerdBank.GitVersioning/ManagedGit/GitPackDeltafiedStream.cs +++ b/src/NerdBank.GitVersioning/ManagedGit/GitPackDeltafiedStream.cs @@ -65,7 +65,7 @@ public override long Position set => throw new NotImplementedException(); } -#if NETSTANDARD2_0 +#if NETFRAMEWORK /// /// Reads a sequence of bytes from the current 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 index 79dc845c1..703d3aa35 100644 --- a/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheStream.cs +++ b/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheStream.cs @@ -44,7 +44,7 @@ public override void Flush() throw new NotSupportedException(); } -#if NETSTANDARD2_0 +#if NETFRAMEWORK public int Read(Span buffer) #else /// diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheViewStream.cs b/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheViewStream.cs index 80f47b33e..9d97134da 100644 --- a/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheViewStream.cs +++ b/src/NerdBank.GitVersioning/ManagedGit/GitPackMemoryCacheViewStream.cs @@ -42,7 +42,7 @@ public override int Read(byte[] buffer, int offset, int count) return this.Read(buffer.AsSpan(offset, count)); } -#if NETSTANDARD2_0 +#if NETFRAMEWORK public int Read(Span buffer) #else /// diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitPackPooledStream.cs b/src/NerdBank.GitVersioning/ManagedGit/GitPackPooledStream.cs index 53ca67696..efb80fb8a 100644 --- 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 !NETSTANDARD2_0 +#if NET6_0_OR_GREATER /// public override int Read(Span buffer) { diff --git a/src/NerdBank.GitVersioning/ManagedGit/GitRepository.cs b/src/NerdBank.GitVersioning/ManagedGit/GitRepository.cs index 183f04ef2..34961cf32 100644 --- a/src/NerdBank.GitVersioning/ManagedGit/GitRepository.cs +++ b/src/NerdBank.GitVersioning/ManagedGit/GitRepository.cs @@ -668,7 +668,7 @@ public void Dispose() private static string TrimEndingDirectorySeparator(string path) { -#if NETSTANDARD2_0 +#if NETFRAMEWORK if (string.IsNullOrEmpty(path) || path.Length == 1) { return path; @@ -699,7 +699,7 @@ private static bool TryConvertHexStringToByteArray(string hexString, Span 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 !NETSTANDARD2_0 +#if NET6_0_OR_GREATER ReadOnlySpan 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 index cecef5edd..70a298702 100644 --- a/src/NerdBank.GitVersioning/ManagedGit/MemoryMappedStream.cs +++ b/src/NerdBank.GitVersioning/ManagedGit/MemoryMappedStream.cs @@ -73,7 +73,7 @@ public override int Read(byte[] buffer, int offset, int count) return read; } -#if !NETSTANDARD2_0 +#if NET6_0_OR_GREATER /// public override int Read(Span buffer) { diff --git a/src/NerdBank.GitVersioning/ManagedGit/StreamExtensions.cs b/src/NerdBank.GitVersioning/ManagedGit/StreamExtensions.cs index 87ca6a1fc..142312e8f 100644 --- a/src/NerdBank.GitVersioning/ManagedGit/StreamExtensions.cs +++ b/src/NerdBank.GitVersioning/ManagedGit/StreamExtensions.cs @@ -78,7 +78,7 @@ public static int ReadMbsInt(this Stream stream) return value; } -#if NETSTANDARD2_0 +#if NETFRAMEWORK /// /// Reads a sequence of bytes from the current stream and advances the position within the stream by /// the number of bytes read. diff --git a/src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs b/src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs index 564380254..49d58afc3 100644 --- a/src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs +++ b/src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs @@ -92,7 +92,7 @@ public override int Read(byte[] array, int offset, int count) return read; } -#if !NETSTANDARD2_0 +#if NET6_0_OR_GREATER /// public override int Read(Span buffer) { @@ -110,7 +110,7 @@ public override async Task ReadAsync(byte[] array, int offset, int count, C return read; } -#if !NETSTANDARD2_0 +#if NET6_0_OR_GREATER /// public override async ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) { diff --git a/src/NerdBank.GitVersioning/Nerdbank.GitVersioning.csproj b/src/NerdBank.GitVersioning/Nerdbank.GitVersioning.csproj index 54346b178..84cc1f758 100644 --- a/src/NerdBank.GitVersioning/Nerdbank.GitVersioning.csproj +++ b/src/NerdBank.GitVersioning/Nerdbank.GitVersioning.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net6.0 + net472;net6.0 true Full false diff --git a/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs b/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs index 6ff17c7b5..1c7336c5c 100644 --- a/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs +++ b/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs @@ -37,7 +37,7 @@ the code is regenerated. ------------------------------------------------------------------------------ "; -#if NET462 +#if NETFRAMEWORK private static readonly CodeGeneratorOptions CodeGeneratorOptions = new CodeGeneratorOptions { BlankLinesBetweenMembers = false, @@ -136,7 +136,7 @@ public string BuildCode() return null; } -#if NET462 +#if NETFRAMEWORK /// public override bool Execute() { @@ -186,7 +186,7 @@ public override bool Execute() } #endif -#if !NET462 +#if !NETFRAMEWORK /// public override bool Execute() { @@ -233,7 +233,7 @@ private static byte[] GetPublicKeyFromKeyPair(byte[] keyPair) } } -#if NET462 +#if NETFRAMEWORK private static CodeMemberField CreateField(string name, T value) { return new CodeMemberField(typeof(T), name) diff --git a/src/Nerdbank.GitVersioning.Tasks/NativeVersionInfo.cs b/src/Nerdbank.GitVersioning.Tasks/NativeVersionInfo.cs index e6d9530f9..2dd70746f 100644 --- a/src/Nerdbank.GitVersioning.Tasks/NativeVersionInfo.cs +++ b/src/Nerdbank.GitVersioning.Tasks/NativeVersionInfo.cs @@ -177,7 +177,7 @@ private void CreateDefines() { if (!int.TryParse(this.AssemblyLanguage, out lcid)) { -#if NET462 +#if NETFRAMEWORK try { var cultureInfo = new CultureInfo(this.AssemblyLanguage); diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj index da3e1629b..95df494c7 100644 --- a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj +++ b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj @@ -1,6 +1,6 @@  - net462;net6.0 + net472;net6.0 true Nerdbank.GitVersioning.nuspec @@ -41,16 +41,13 @@ + - - - - diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.targets b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.targets index f61154dfe..47becee3c 100644 --- a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.targets +++ b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.targets @@ -10,7 +10,7 @@ MSBuildCore\ - MSBuildFull\ + MSBuildFull\ diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec index 7cbd11177..9c825edd6 100644 --- a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec +++ b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec @@ -17,18 +17,18 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/test/Nerdbank.GitVersioning.Benchmarks/GetVersionBenchmarks.cs b/test/Nerdbank.GitVersioning.Benchmarks/GetVersionBenchmarks.cs index b1bbda93e..f580c34e2 100644 --- a/test/Nerdbank.GitVersioning.Benchmarks/GetVersionBenchmarks.cs +++ b/test/Nerdbank.GitVersioning.Benchmarks/GetVersionBenchmarks.cs @@ -10,7 +10,7 @@ namespace Nerdbank.GitVersioning.Benchmarks { [SimpleJob(RuntimeMoniker.Net70)] - [SimpleJob(RuntimeMoniker.Net462, baseline: true)] + [SimpleJob(RuntimeMoniker.Net472, baseline: true)] public class GetVersionBenchmarks { // You must manually clone these repositories: diff --git a/test/Nerdbank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj b/test/Nerdbank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj index 6e0ed52af..71b136fb8 100644 --- a/test/Nerdbank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj +++ b/test/Nerdbank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj @@ -2,7 +2,7 @@ net7.0 - $(TargetFrameworks);net462 + $(TargetFrameworks);net472 Exe true AnyCPU