Skip to content

Commit e7c89be

Browse files
viceroypenguinviceroypenguin
authored
Merge branch 'master' into netstandard2.0
2 parents a33fa8f + 4d7b91a commit e7c89be

File tree

7 files changed

+43
-30
lines changed

7 files changed

+43
-30
lines changed

‎.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -385,3 +385,4 @@ dotnet_diagnostic.MA0147.severity = error
385385
dotnet_diagnostic.MA0148.severity = none
386386
dotnet_diagnostic.MA0149.severity = none
387387
dotnet_diagnostic.MA0154.severity = warning
388+
dotnet_diagnostic.MA0158.severity = none

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<LangVersion>latest</LangVersion>
3+
<LangVersion>preview</LangVersion>
44

55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>$(WarningsAsErrors);nullable;</WarningsAsErrors>

‎Directory.Packages.props

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
<Project>
22
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
8-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
9-
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
10-
<PackageVersion Include="DocFx.App" Version="2.76.0" />
11-
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
12-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
13-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
14-
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
15-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
16-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
17-
<PackageVersion Include="MinVer" Version="5.0.0" />
18-
<PackageVersion Include="Scriban" Version="5.10.0" />
19-
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
20-
<PackageVersion Include="System.Memory" Version="4.5.5" />
21-
<PackageVersion Include="ThisAssembly.Resources" Version="1.4.3" />
22-
<PackageVersion Include="xunit" Version="2.8.1" />
7+
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
8+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
9+
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
10+
<PackageVersion Include="DocFx.App" Version="2.77.0" />
11+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
2312
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
17+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
18+
<PackageVersion Include="MinVer" Version="5.0.0" />
19+
<PackageVersion Include="Scriban" Version="5.10.0" />
20+
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
21+
<PackageVersion Include="System.Memory" Version="4.5.5" />
22+
<PackageVersion Include="ThisAssembly.Resources" Version="1.4.3" />
23+
<PackageVersion Include="xunit" Version="2.9.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
27-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" PrivateAssets="All" />
27+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
2828
</ItemGroup>
2929

3030
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
31-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
31+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.160" />
36-
<GlobalPackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" Version="3.3.1" />
37-
<GlobalPackageReference Include="PolySharp" Version="1.14.1" />
35+
<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.160" />
36+
<GlobalPackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" Version="3.3.1" />
37+
<GlobalPackageReference Include="PolySharp" Version="1.14.1" />
3838
</ItemGroup>
3939
</Project>

‎Docs/SuperLinq.Docs/SuperLinq.Docs.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFrameworks>net8.0</TargetFrameworks>
6-
<NoWarn>$(NoWarn);CA1852;NU1701</NoWarn>
6+
<NoWarn>$(NoWarn);CA1852;NU1701;NU1902;NU1903</NoWarn>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

‎Tests/SuperLinq.Async.Test/TestingSequence.cs

+5
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ ValueTask IAsyncDisposable.DisposeAsync()
9494
return default;
9595
}
9696

97+
[SuppressMessage(
98+
"Style",
99+
"IDE0100",
100+
Justification = "Expanded code is used for better error reporting on test failures"
101+
)]
97102
public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default)
98103
{
99104
AssertTestingSequence(_enumerationCount == _disposedCount, SimultaneousEnumerations);

‎Tests/SuperLinq.Async.Test/TimeoutTest.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Test.Async;
1+
namespace Test.Async;
22

33
public sealed class TimeoutTest
44
{
@@ -95,9 +95,10 @@ private sealed class SequenceWithoutThrowIfCancellationRequested : IAsyncEnumera
9595
return AsyncEnumerable.Range(1, 5)
9696
.SelectAwait(async x =>
9797
{
98-
await Task.Delay(TimeSpan.FromMilliseconds(1), CancellationToken.None);
98+
await Task.Delay(TimeSpan.FromMilliseconds(10), CancellationToken.None);
9999
return x;
100-
}).GetAsyncEnumerator(CancellationToken.None);
100+
})
101+
.GetAsyncEnumerator(CancellationToken.None);
101102
}
102103
}
103104

@@ -110,9 +111,10 @@ private sealed class SequenceWithThrowIfCancellationRequested : IAsyncEnumerable
110111
return AsyncEnumerable.Range(1, 5)
111112
.SelectAwait(async x =>
112113
{
113-
await Task.Delay(TimeSpan.FromMilliseconds(1), cancellationToken);
114+
await Task.Delay(TimeSpan.FromMilliseconds(10), cancellationToken);
114115
return x;
115-
}).GetAsyncEnumerator(cancellationToken);
116+
})
117+
.GetAsyncEnumerator(cancellationToken);
116118
}
117119
}
118120
}

‎Tests/SuperLinq.Test/TestingSequence.cs

+5
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ void IDisposable.Dispose()
7474
AssertTestingSequence(_disposedCount == _enumerationCount, ExpectedDisposal);
7575
}
7676

77+
[SuppressMessage(
78+
"Style",
79+
"IDE0100",
80+
Justification = "Expanded code is used for better error reporting on test failures"
81+
)]
7782
public IEnumerator<T> GetEnumerator()
7883
{
7984
AssertTestingSequence(_enumerationCount == _disposedCount, SimultaneousEnumerations);

0 commit comments

Comments
 (0)