Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<!-- StyleSharp.Analyzers, PerformanceSharp.Analyzers and SecuritySharp.Analyzers ship from the
same release pipeline and always share a version. -->
<RoslynCommonAnalyzersVersion>3.46.0</RoslynCommonAnalyzersVersion>
<RoslynCommonAnalyzersVersion>4.0.5</RoslynCommonAnalyzersVersion>
<AvaloniaVersion>12.1.2</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.400"/>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.401"/>
</ItemGroup>
<ItemGroup>
<PackageVersion Include="MinVer" Version="7.0.0"/>
<PackageVersion Include="MinVer" Version="8.0.0"/>
<PackageVersion Include="StyleSharp.Analyzers" Version="$(RoslynCommonAnalyzersVersion)"/>
<PackageVersion Include="PerformanceSharp.Analyzers" Version="$(RoslynCommonAnalyzersVersion)"/>
<PackageVersion Include="SecuritySharp.Analyzers" Version="$(RoslynCommonAnalyzersVersion)"/>
<PackageVersion Include="Roslynator.Analyzers" Version="5.0.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="5.6.0"/>
<PackageVersion Include="PublicApiSharp.Analyzers" Version="1.0.7"/>
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.33.0.1635"/>
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.34.0.3385"/>
</ItemGroup>
<!-- Benchmarks + tests -->
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8"/>
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.9.0"/>
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.10.0"/>
<PackageVersion Include="System.Reactive" Version="7.0.0"/>
<PackageVersion Include="Microsoft.Reactive.Testing" Version="7.0.0"/>
<PackageVersion Include="System.Reactive.Async" Version="6.0.0-alpha.18"/>
Expand All @@ -34,41 +34,41 @@
<ItemGroup>
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
<PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersion)"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.30" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.19" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.11" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="11.0.0-preview.7.26381.103" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.30" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.19" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.11" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="11.0.0-preview.7.26381.103" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="10.0.11"/>
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="11.0.0-preview.7.26381.103" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.7.26381.103" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="11.0.0-preview.7.26381.103" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="11.0.0-preview.7.26381.103" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="11.0.0-preview.7.26381.103" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Maui.Core" Version="10.0.100" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Maui.Core" Version="11.0.0-preview.7.26406.9" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.31" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.20" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.12" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="11.0.0-rc.1.26425.128" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.31" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.20" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.12" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="11.0.0-rc.1.26425.128" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="10.0.12"/>
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="11.0.0-rc.1.26425.128" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-rc.1.26425.128" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="11.0.0-rc.1.26425.128" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="11.0.0-rc.1.26425.128" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="11.0.0-rc.1.26425.128" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Maui.Core" Version="10.0.101" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0')) AND !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.Maui.Core" Version="11.0.0-rc.1.26451.6" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))"/>
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.4.0"/>
</ItemGroup>
<!-- .NET Framework legs -->
<ItemGroup>
<PackageVersion Include="System.ValueTuple" Version="4.6.2"/>
<PackageVersion Include="System.Threading.Channels" Version="10.0.11"/>
<PackageVersion Include="System.Threading.Channels" Version="10.0.12"/>
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2"/>
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0"/>
<PackageVersion Include="System.Buffers" Version="4.6.1"/>
<PackageVersion Include="System.Memory" Version="4.6.3"/>
<PackageVersion Include="System.Collections.Immutable" Version="10.0.11"/>
<PackageVersion Include="System.Collections.Immutable" Version="10.0.12"/>
</ItemGroup>
<!-- Test infrastructure. Microsoft.CodeAnalysis.CSharp is deliberately held on the 4.x line: the
R3 bridge generator has to load in the oldest SDK we still support, and a 5.x reference raises
the compiler the generator demands of every consumer. Renovate's Roslyn PR is not for us. -->
<ItemGroup>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0"/>
<PackageVersion Include="TUnit" Version="1.66.8"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0"/>
<PackageVersion Include="TUnit" Version="1.66.27"/>
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.11.0"/>
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)/directory.packages.support.props" Condition="Exists('$(MSBuildThisFileDirectory)/directory.packages.support.props')"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public IDisposable Subscribe(IObserver<IList<T>> observer)
{
ArgumentExceptionHelper.ThrowIfNull(observer);

List<int> values = new(_range.Count);
List<int> values = [with(capacity: _range.Count)];
for (var i = 0; i < _range.Count; i++)
{
values.Add(_range.Start + i);
Expand Down
6 changes: 3 additions & 3 deletions src/Primitives.Shared/SignalOperatorMixins.StatefulSignals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,12 @@ private HashSet<T> CreateSeen() =>
#if NET8_0_OR_GREATER
(_source is RangeSignal range ? range.Count : 0) switch
{
var capacity when capacity > 0 => new(capacity, _comparer),
var capacity when capacity > 0 => [with(capacity, _comparer)],
_ when _comparer is null => [],
_ => new(_comparer),
_ => [with(_comparer)],
};
#else
new(_comparer);
[with(_comparer)];
#endif
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private static int CountDistinctRange(
Func<T, TKey> keySelector,
IEqualityComparer<TKey>? comparer)
{
HashSet<TKey> seen = comparer is null ? [] : new(comparer);
HashSet<TKey> seen = comparer is null ? [] : [with(comparer)];
var typedSelector = (Func<int, TKey>)(object)keySelector;
for (var i = 0; i < range.Count; i++)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ public Task<IList<T>> CollectListAsync()

if (source is RangeSignal range && typeof(T) == typeof(int))
{
List<int> integers = new(range.Count);
List<int> integers = [with(capacity: range.Count)];
for (var i = 0; i < range.Count; i++)
{
integers.Add(range.Start + i);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private sealed class ToDictionaryTaskWitness<TSource, TKey, TValue>(
where TKey : notnull
{
/// <summary>The dictionary that accumulates key-value pairs from the source sequence.</summary>
private readonly Dictionary<TKey, TValue> _map = comparer is null ? new() : new(comparer);
private readonly Dictionary<TKey, TValue> _map = comparer is null ? [] : [with(comparer)];

/// <inheritdoc/>
protected override ValueTask OnNextAsyncCore(TSource value, CancellationToken cancellationToken)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public readonly record struct
/// <param name="keySelector">The key selector.</param>
/// <param name="comparer">The key comparer, or <see langword="null"/> for the default comparer.</param>
public DistinctByCountAggregator(Func<T, TKey> keySelector, IEqualityComparer<TKey>? comparer)
: this(keySelector, comparer is null ? [] : new(comparer), 0)
: this(keySelector, comparer is null ? [] : [with(comparer)], 0)
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public readonly record struct
/// <param name="keySelector">The key selector.</param>
/// <param name="comparer">The key comparer, or <see langword="null"/> for the default comparer.</param>
public DistinctByLongCountAggregator(Func<T, TKey> keySelector, IEqualityComparer<TKey>? comparer)
: this(keySelector, comparer is null ? [] : new(comparer), 0L)
: this(keySelector, comparer is null ? [] : [with(comparer)], 0L)
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public DistinctByWitness(IObserver<T> observer, Func<T, TKey> keySelector, IEqua
{
_observer = observer;
_keySelector = keySelector;
_seen = comparer is null ? [] : new(comparer);
_seen = comparer is null ? [] : [with(comparer)];
}

/// <inheritdoc/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ private static List<MetadataReference> CreateReferences(bool includeAsyncReferen
{
// Signal and StateSignal<> are always referenced on top of the platform assemblies.
const int SignalReferenceCount = 2;
Dictionary<string, string> platformAssemblies = new(StringComparer.OrdinalIgnoreCase);
Dictionary<string, string> platformAssemblies = [with(StringComparer.OrdinalIgnoreCase)];
foreach (var path in AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES")!.ToString()!.Split(Path.PathSeparator))
{
var name = Path.GetFileName(path);
Expand All @@ -263,7 +263,7 @@ private static List<MetadataReference> CreateReferences(bool includeAsyncReferen
}
}

List<MetadataReference> references = new(PlatformReferenceNames.Length + SignalReferenceCount);
List<MetadataReference> references = [with(capacity: PlatformReferenceNames.Length + SignalReferenceCount)];
foreach (var name in PlatformReferenceNames)
{
if (platformAssemblies.TryGetValue(name, out var path))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,8 @@ public async Task RxFactoryAliasesRepeatGenerateUsingIfAndCase()
chooseThen = false;
_ = conditionalSource.Subscribe(conditional.Add);

Dictionary<string, IObservable<int>> cases = new(StringComparer.Ordinal) { ["one"] = Signal.Emit(One) };
Dictionary<string, IObservable<int>> cases = [with(StringComparer.Ordinal)];
cases["one"] = Signal.Emit(One);
_ = Signal.Case(static () => "one", cases, Signal.Emit(Two)).Subscribe(selectedCase.Add);
_ = Signal.Case(static () => "missing", cases, Signal.Emit(Two)).Subscribe(defaultCase.Add);
_ = Signal.Using(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,13 @@ public async Task RemainingOperatorFactoryAndObserverFailureBranchesAreDetermini
}

/// <summary>Verifies optimized coordinator and async enumerable branches cover remaining gaps.</summary>
/// <param name="token">The test cancellation token.</param>
/// <returns>A task representing the asynchronous test.</returns>
[Test]
public async Task OptimizedCoordinatorAndAsyncEnumerableBranchesCoverRemainingGaps()
[Timeout(30_000)]
public async Task OptimizedCoordinatorAndAsyncEnumerableBranchesCoverRemainingGaps(CancellationToken token)
{
await VerifyAsyncEnumerableShiftAndExpireAsync().ConfigureAwait(false);
await VerifyAsyncEnumerableShiftAndExpireAsync(token).ConfigureAwait(false);
await VerifyRaceSyncLatestAndSwitchBranches();
await VerifyProbeBranches();
await VerifyCalmAppendAndForkJoinBranches();
Expand Down Expand Up @@ -462,8 +464,9 @@ private static async Task VerifyFlatMapTerminalAndErrorBranches()
}

/// <summary>Verifies async enumerable subscription, shift timing, and expire timeout branches.</summary>
/// <param name="token">The test cancellation token.</param>
/// <returns>A task representing the asynchronous verification.</returns>
private static async Task VerifyAsyncEnumerableShiftAndExpireAsync()
private static async Task VerifyAsyncEnumerableShiftAndExpireAsync(CancellationToken token)
{
_ = Assert.Throws<ArgumentNullException>(static () => Signal.FromAsyncEnumerable(AsyncValues(One)).Subscribe(null!));
List<int> asyncValues = [];
Expand All @@ -473,7 +476,7 @@ private static async Task VerifyAsyncEnumerableShiftAndExpireAsync()
asyncValues.Add,
ex => asyncCompleted.TrySetException(ex),
() => asyncCompleted.TrySetResult(null));
await asyncCompleted.Task.WaitAsync(TimeSpan.FromSeconds(Five)).ConfigureAwait(false);
await asyncCompleted.Task.WaitAsync(token).ConfigureAwait(false);
int[] expectedAsyncValues = [0, One, Two];
await Assert.That(asyncValues.SequenceEqual(expectedAsyncValues)).IsTrue();
var exact = await Signal.FromAsyncEnumerable(AsyncValues(Sixteen)).CollectArrayAsync().ConfigureAwait(false);
Expand Down
Loading