Skip to content

Commit bec1919

Browse files
committed
join net9 with net10
1 parent fc7ec66 commit bec1919

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/RESPite/Internal/BlockBufferSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public virtual ReadOnlyMemory<byte> Serialize<TRequest>(
3636
ReadOnlySpan<byte> command,
3737
in TRequest request,
3838
IRespFormatter<TRequest> formatter)
39-
#if NET9_0_OR_GREATER
39+
#if NET10_0_OR_GREATER
4040
where TRequest : allows ref struct
4141
#endif
4242
{

src/RESPite/Messages/RespReader.AggregateEnumerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public void FillAll<TResult>(scoped Span<TResult> target, Projection<TResult> pr
198198
}
199199

200200
public void FillAll<TState, TResult>(scoped Span<TResult> target, ref TState state, Projection<TState, TResult> projection)
201-
#if NET9_0_OR_GREATER
201+
#if NET10_0_OR_GREATER
202202
where TState : allows ref struct
203203
#endif
204204
{
@@ -234,7 +234,7 @@ public void FillAll<TState, TFirst, TSecond, TResult>(
234234
Projection<TState, TFirst> first,
235235
Projection<TState, TSecond> second,
236236
Func<TState, TFirst, TSecond, TResult> combine)
237-
#if NET9_0_OR_GREATER
237+
#if NET10_0_OR_GREATER
238238
where TState : allows ref struct
239239
#endif
240240
{

src/RESPite/Messages/RespReader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public readonly bool AggregateLengthIs(int count)
177177
public delegate T Projection<out T>(ref RespReader value);
178178

179179
public delegate TResult Projection<TState, out TResult>(ref TState state, ref RespReader value)
180-
#if NET9_0_OR_GREATER
180+
#if NET10_0_OR_GREATER
181181
where TState : allows ref struct
182182
#endif
183183
;
@@ -1907,7 +1907,7 @@ public readonly T ReadEnum<T>(T unknownValue = default) where T : struct, Enum
19071907
/// <typeparam name="TState">Additional state required by the projection.</typeparam>
19081908
/// <typeparam name="TResult">The type of data to be projected.</typeparam>
19091909
public TResult[]? ReadArray<TState, TResult>(ref TState state, Projection<TState, TResult> projection, bool scalar = false)
1910-
#if NET9_0_OR_GREATER
1910+
#if NET10_0_OR_GREATER
19111911
where TState : allows ref struct
19121912
#endif
19131913
{
@@ -1928,7 +1928,7 @@ public readonly T ReadEnum<T>(T unknownValue = default) where T : struct, Enum
19281928
/// <typeparam name="TState">Additional state required by the projection.</typeparam>
19291929
/// <typeparam name="TResult">The type of data to be projected.</typeparam>
19301930
public TResult[]? ReadPastArray<TState, TResult>(ref TState state, Projection<TState, TResult> projection, bool scalar = false)
1931-
#if NET9_0_OR_GREATER
1931+
#if NET10_0_OR_GREATER
19321932
where TState : allows ref struct
19331933
#endif
19341934
#pragma warning restore RS0026

src/RESPite/Shared/FrameworkShims.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma warning disable SA1403 // single namespace
22

3-
#if !NET9_0_OR_GREATER
3+
#if !NET10_0_OR_GREATER
44
namespace System.Runtime.CompilerServices
55
{
66
// see https://learn.microsoft.com/dotnet/api/system.runtime.compilerservices.overloadresolutionpriorityattribute

src/StackExchange.Redis/FrameworkShims.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal static class IsExternalInit { }
1515
}
1616
#endif
1717

18-
#if !NET9_0_OR_GREATER
18+
#if !NET10_0_OR_GREATER
1919
namespace System.Runtime.CompilerServices
2020
{
2121
// see https://learn.microsoft.com/dotnet/api/system.runtime.compilerservices.overloadresolutionpriorityattribute

tests/StackExchange.Redis.Tests/PubSubKeyNotificationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ private void OnNotification(
338338
var recvKey = notification.GetKey();
339339
Assert.True(observedCounts.TryGetValue(recvKey.ToString(), out var counter));
340340

341-
#if NET9_0_OR_GREATER
341+
#if NET10_0_OR_GREATER
342342
// it would be more efficient to stash the alt-lookup, but that would make our API here non-viable,
343343
// since we need to support multiple frameworks
344344
var viaAlt = FindViaAltLookup(notification, observedCounts.GetAlternateLookup<ReadOnlySpan<char>>());
@@ -396,7 +396,7 @@ private async Task SendAndObserveAsync(
396396
}
397397
}
398398

399-
#if NET9_0_OR_GREATER
399+
#if NET10_0_OR_GREATER
400400
// demonstrate that we can use the alt-lookup APIs to avoid string allocations
401401
private static Counter? FindViaAltLookup(
402402
in KeyNotification notification,

toys/StackExchange.Redis.Server/RedisClient.Output.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public async Task WriteOutputAsync(PipeWriter writer, CancellationToken cancella
106106

107107
if (count != 0)
108108
{
109-
#if NET9_0_OR_GREATER
109+
#if NET10_0_OR_GREATER
110110
Node?.Server?.OnFlush(this, count, writer.CanGetUnflushedBytes ? writer.UnflushedBytes : -1);
111111
#else
112112
Node?.Server?.OnFlush(this, count, -1);

0 commit comments

Comments
 (0)