Skip to content

Commit c9660b3

Browse files
maca88maca88
authored
Add support for .NET 8 and remove .NET 5 (#171)
* Add support for .NET 8 and remove .NET 5 * update appveyor
1 parent 3384b49 commit c9660b3

File tree

85 files changed

+1179
-1167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1179
-1167
lines changed

‎Common.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1212
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
1313
<TreatSpecificWarningsAsErrors />
14-
<LibTargetFrameworks Condition ="$(LibTargetFrameworks) == ''">netstandard2.0;net5.0;net6.0</LibTargetFrameworks>
15-
<AppTargetFrameworks Condition ="$(AppTargetFrameworks) == ''">net472;netcoreapp3.1;net5.0;net6.0</AppTargetFrameworks>
16-
<TestTargetFramework Condition ="$(TestTargetFramework) == ''">net6.0</TestTargetFramework>
17-
<ToolTargetFrameworks Condition ="$(ToolTargetFrameworks) == ''">netcoreapp3.1;net5.0;net6.0</ToolTargetFrameworks>
14+
<LibTargetFrameworks Condition ="$(LibTargetFrameworks) == ''">netstandard2.0;net6.0;net8.0</LibTargetFrameworks>
15+
<AppTargetFrameworks Condition ="$(AppTargetFrameworks) == ''">net472;netcoreapp3.1;net6.0;net8.0</AppTargetFrameworks>
16+
<TestTargetFramework Condition ="$(TestTargetFramework) == ''">net8.0</TestTargetFramework>
17+
<ToolTargetFrameworks Condition ="$(ToolTargetFrameworks) == ''">netcoreapp3.1;net6.0;net8.0</ToolTargetFrameworks>
1818
<MicrosoftCodeAnalysisVersion>3.11.0</MicrosoftCodeAnalysisVersion>
1919
<MicrosoftBuildLocatorVersion>1.4.1</MicrosoftBuildLocatorVersion>
2020
<SQLitePCLRawVersion>2.1.1</SQLitePCLRawVersion>

‎Source/AsyncGenerator.Tests/AbstractClass/Fixture.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public Task TestAsyncFromInterfaceAfterTransformation()
2525
.AfterTransformation(result =>
2626
{
2727
AssertValidAnnotations(result);
28-
Assert.AreEqual(1, result.Documents.Count);
28+
Assert.That(result.Documents.Count, Is.EqualTo(1));
2929
var document = result.Documents[0];
30-
Assert.NotNull(document.OriginalModified);
31-
Assert.AreEqual(GetOutputFile("AsyncFromInterface"), document.Transformed.ToFullString());
30+
Assert.That(document.OriginalModified, Is.Not.Null);
31+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile("AsyncFromInterface")));
3232
})
3333
)
3434
);
@@ -45,10 +45,10 @@ public Task TestAsyncFromImplementationAfterTransformation()
4545
.AfterTransformation(result =>
4646
{
4747
AssertValidAnnotations(result);
48-
Assert.AreEqual(1, result.Documents.Count);
48+
Assert.That(result.Documents.Count, Is.EqualTo(1));
4949
var document = result.Documents[0];
50-
Assert.NotNull(document.OriginalModified);
51-
Assert.AreEqual(GetOutputFile("AsyncFromImplementation"), document.Transformed.ToFullString());
50+
Assert.That(document.OriginalModified, Is.Not.Null);
51+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile("AsyncFromImplementation")));
5252
})
5353
)
5454
);
@@ -65,10 +65,10 @@ public Task TestIgnoreFromInterfaceAfterTransformation()
6565
.AfterTransformation(result =>
6666
{
6767
AssertValidAnnotations(result);
68-
Assert.AreEqual(1, result.Documents.Count);
68+
Assert.That(result.Documents.Count, Is.EqualTo(1));
6969
var document = result.Documents[0];
70-
Assert.NotNull(document.OriginalModified);
71-
Assert.AreEqual(GetOutputFile("IgnoreFromInterface"), document.Transformed.ToFullString());
70+
Assert.That(document.OriginalModified, Is.Not.Null);
71+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile("IgnoreFromInterface")));
7272
})
7373
)
7474
);
@@ -86,10 +86,10 @@ public Task TestCancellationTokensAfterTransformation()
8686
.AfterTransformation(result =>
8787
{
8888
AssertValidAnnotations(result);
89-
Assert.AreEqual(1, result.Documents.Count);
89+
Assert.That(result.Documents.Count, Is.EqualTo(1));
9090
var document = result.Documents[0];
91-
Assert.NotNull(document.OriginalModified);
92-
Assert.AreEqual(GetOutputFile("TestCaseDefaultTokens"), document.Transformed.ToFullString());
91+
Assert.That(document.OriginalModified, Is.Not.Null);
92+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile("TestCaseDefaultTokens")));
9393
})
9494
)
9595
);
@@ -107,10 +107,10 @@ public Task TestValueTaskFromInterfaceAfterTransformation()
107107
.AfterTransformation(result =>
108108
{
109109
AssertValidAnnotations(result);
110-
Assert.AreEqual(1, result.Documents.Count);
110+
Assert.That(result.Documents.Count, Is.EqualTo(1));
111111
var document = result.Documents[0];
112-
Assert.NotNull(document.OriginalModified);
113-
Assert.AreEqual(GetOutputFile("ValueTaskFromInterface"), document.Transformed.ToFullString());
112+
Assert.That(document.OriginalModified, Is.Not.Null);
113+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile("ValueTaskFromInterface")));
114114
})
115115
)
116116
);

‎Source/AsyncGenerator.Tests/AlwaysAwait/Fixture.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ private void VoidAfterTransformation(IProjectTransformationResult result)
152152
private void AfterTransformation(IProjectTransformationResult result, string fileName)
153153
{
154154
AssertValidAnnotations(result);
155-
Assert.AreEqual(1, result.Documents.Count);
155+
Assert.That(result.Documents.Count, Is.EqualTo(1));
156156
var document = result.Documents[0];
157-
Assert.NotNull(document.OriginalModified);
158-
Assert.AreEqual(GetOutputFile(fileName), document.Transformed.ToFullString());
157+
Assert.That(document.OriginalModified, Is.Not.Null);
158+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(fileName)));
159159
}
160160
}
161161
}

‎Source/AsyncGenerator.Tests/AnonymousFunctions/Fixture.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public Task TestAfterTransformation()
2626
.AfterTransformation(result =>
2727
{
2828
AssertValidAnnotations(result);
29-
Assert.AreEqual(1, result.Documents.Count);
29+
Assert.That(result.Documents.Count, Is.EqualTo(1));
3030
var document = result.Documents[0];
31-
Assert.NotNull(document.OriginalModified);
32-
Assert.AreEqual(GetOutputFile(nameof(TestCase)), document.Transformed.ToFullString());
31+
Assert.That(document.OriginalModified, Is.Not.Null);
32+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(TestCase))));
3333
})
3434
)
3535
);
@@ -48,10 +48,10 @@ public Task TestPreserveReturnTypeAfterTransformation()
4848
.AfterTransformation(result =>
4949
{
5050
AssertValidAnnotations(result);
51-
Assert.AreEqual(1, result.Documents.Count);
51+
Assert.That(result.Documents.Count, Is.EqualTo(1));
5252
var document = result.Documents[0];
53-
Assert.NotNull(document.OriginalModified);
54-
Assert.AreEqual(GetOutputFile("PreserveReturnType"), document.Transformed.ToFullString());
53+
Assert.That(document.OriginalModified, Is.Not.Null);
54+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile("PreserveReturnType")));
5555
})
5656
)
5757
);
@@ -71,10 +71,10 @@ public Task TestPreserveReturnTypeWithoutTokensAfterTransformation()
7171
.AfterTransformation(result =>
7272
{
7373
AssertValidAnnotations(result);
74-
Assert.AreEqual(1, result.Documents.Count);
74+
Assert.That(result.Documents.Count, Is.EqualTo(1));
7575
var document = result.Documents[0];
76-
Assert.NotNull(document.OriginalModified);
77-
Assert.AreEqual(GetOutputFile("PreserveReturnTypeWithoutTokens"), document.Transformed.ToFullString());
76+
Assert.That(document.OriginalModified, Is.Not.Null);
77+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile("PreserveReturnTypeWithoutTokens")));
7878
})
7979
)
8080
);
@@ -91,10 +91,10 @@ public Task TestMethodWithDelegateAfterTransformation()
9191
.AfterTransformation(result =>
9292
{
9393
AssertValidAnnotations(result);
94-
Assert.AreEqual(1, result.Documents.Count);
94+
Assert.That(result.Documents.Count, Is.EqualTo(1));
9595
var document = result.Documents[0];
96-
Assert.NotNull(document.OriginalModified);
97-
Assert.AreEqual(GetOutputFile(nameof(MethodWithDelegate)), document.Transformed.ToFullString());
96+
Assert.That(document.OriginalModified, Is.Not.Null);
97+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(MethodWithDelegate))));
9898
})
9999
)
100100
);
@@ -115,10 +115,10 @@ public Task TestArrayOfDelegatesAfterTransformation()
115115
.AfterTransformation(result =>
116116
{
117117
AssertValidAnnotations(result);
118-
Assert.AreEqual(1, result.Documents.Count);
118+
Assert.That(result.Documents.Count, Is.EqualTo(1));
119119
var document = result.Documents[0];
120-
Assert.IsNull(document.OriginalModified);
121-
Assert.AreEqual(GetOutputFile(nameof(ArrayOfDelegates)), document.Transformed.ToFullString());
120+
Assert.That(document.OriginalModified, Is.Null);
121+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(ArrayOfDelegates))));
122122
})
123123
)
124124
);
@@ -135,10 +135,10 @@ public Task TestVariableAfterTransformation()
135135
.AfterTransformation(result =>
136136
{
137137
AssertValidAnnotations(result);
138-
Assert.AreEqual(1, result.Documents.Count);
138+
Assert.That(result.Documents.Count, Is.EqualTo(1));
139139
var document = result.Documents[0];
140-
Assert.NotNull(document.OriginalModified);
141-
Assert.AreEqual(GetOutputFile(nameof(Variable)), document.Transformed.ToFullString());
140+
Assert.That(document.OriginalModified, Is.Not.Null);
141+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(Variable))));
142142
})
143143
)
144144
);
@@ -155,10 +155,10 @@ public Task TestTryCatchAfterTransformation()
155155
.AfterTransformation(result =>
156156
{
157157
AssertValidAnnotations(result);
158-
Assert.AreEqual(1, result.Documents.Count);
158+
Assert.That(result.Documents.Count, Is.EqualTo(1));
159159
var document = result.Documents[0];
160-
Assert.NotNull(document.OriginalModified);
161-
Assert.AreEqual(GetOutputFile(nameof(TryCatch)), document.Transformed.ToFullString());
160+
Assert.That(document.OriginalModified, Is.Not.Null);
161+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(TryCatch))));
162162
})
163163
)
164164
.RegisterPlugin<RunnerAsyncCountepartFinder>()
@@ -176,10 +176,10 @@ public Task TestVoidTryCatchAfterTransformation()
176176
.AfterTransformation(result =>
177177
{
178178
AssertValidAnnotations(result);
179-
Assert.AreEqual(1, result.Documents.Count);
179+
Assert.That(result.Documents.Count, Is.EqualTo(1));
180180
var document = result.Documents[0];
181-
Assert.NotNull(document.OriginalModified);
182-
Assert.AreEqual(GetOutputFile(nameof(VoidTryCatch)), document.Transformed.ToFullString());
181+
Assert.That(document.OriginalModified, Is.Not.Null);
182+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(VoidTryCatch))));
183183
})
184184
)
185185
.RegisterPlugin<RunnerAsyncCountepartFinder>()
@@ -197,10 +197,10 @@ public Task TestReturnTypeMismatchAfterTransformation()
197197
.AfterTransformation(result =>
198198
{
199199
AssertValidAnnotations(result);
200-
Assert.AreEqual(1, result.Documents.Count);
200+
Assert.That(result.Documents.Count, Is.EqualTo(1));
201201
var document = result.Documents[0];
202-
Assert.NotNull(document.OriginalModified);
203-
Assert.AreEqual(GetOutputFile(nameof(ReturnTypeMismatch)), document.Transformed.ToFullString());
202+
Assert.That(document.OriginalModified, Is.Not.Null);
203+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(ReturnTypeMismatch))));
204204
})
205205
)
206206
);

‎Source/AsyncGenerator.Tests/AsyncGenerator.Tests.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@
2727
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
2828
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
2929
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
30-
<PackageReference Include="NUnit" Version="3.13.3" />
31-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
30+
<PackageReference Include="NUnit" Version="3.14.0" />
31+
<PackageReference Include="NUnit.Analyzers" Version="4.0.1">
32+
<PrivateAssets>all</PrivateAssets>
33+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34+
</PackageReference>
35+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
3236
<PackageReference Include="System.Interactive.Async" Version="4.1.1" />
3337
<!-- https://stackoverflow.com/a/73422940 -->
3438
<PackageReference Include="System.Memory" Version="4.5.5" />
@@ -41,7 +45,7 @@
4145
</ItemGroup>
4246

4347
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
44-
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
48+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
4549
</ItemGroup>
4650

4751
<ItemGroup>

‎Source/AsyncGenerator.Tests/AsyncMethodFinder/Fixture.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public Task TestCustomLinqExtensionsAfterTransformation()
2020
.AfterTransformation(result =>
2121
{
2222
AssertValidAnnotations(result);
23-
Assert.AreEqual(1, result.Documents.Count);
23+
Assert.That(result.Documents.Count, Is.EqualTo(1));
2424
var document = result.Documents[0];
25-
Assert.NotNull(document.OriginalModified);
26-
Assert.AreEqual(GetOutputFile(nameof(CustomLinqExtensions)), document.Transformed.ToFullString());
25+
Assert.That(document.OriginalModified, Is.Not.Null);
26+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(CustomLinqExtensions))));
2727
})
2828
)
2929
);
@@ -41,10 +41,10 @@ public Task TestIgnoreSomeAsyncMethodsAfterTransformation()
4141
.AfterTransformation(result =>
4242
{
4343
AssertValidAnnotations(result);
44-
Assert.AreEqual(1, result.Documents.Count);
44+
Assert.That(result.Documents.Count, Is.EqualTo(1));
4545
var document = result.Documents[0];
46-
Assert.NotNull(document.OriginalModified);
47-
Assert.AreEqual(GetOutputFile(nameof(IgnoreSomeAsyncMethods)), document.Transformed.ToFullString());
46+
Assert.That(document.OriginalModified, Is.Not.Null);
47+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(IgnoreSomeAsyncMethods))));
4848
})
4949
)
5050
);
@@ -62,10 +62,10 @@ public Task TestGenericParameterAfterTransformation()
6262
.AfterTransformation(result =>
6363
{
6464
AssertValidAnnotations(result);
65-
Assert.AreEqual(1, result.Documents.Count);
65+
Assert.That(result.Documents.Count, Is.EqualTo(1));
6666
var document = result.Documents[0];
67-
Assert.NotNull(document.OriginalModified);
68-
Assert.AreEqual(GetOutputFile(nameof(GenericParameter)), document.Transformed.ToFullString());
67+
Assert.That(document.OriginalModified, Is.Not.Null);
68+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(GenericParameter))));
6969
})
7070
)
7171
);
@@ -85,10 +85,10 @@ public Task TestGuardsAfterTransformation()
8585
.AfterTransformation(result =>
8686
{
8787
AssertValidAnnotations(result);
88-
Assert.AreEqual(1, result.Documents.Count);
88+
Assert.That(result.Documents.Count, Is.EqualTo(1));
8989
var document = result.Documents[0];
90-
Assert.NotNull(document.OriginalModified);
91-
Assert.AreEqual(GetOutputFile(nameof(Guards)), document.Transformed.ToFullString());
90+
Assert.That(document.OriginalModified, Is.Not.Null);
91+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(Guards))));
9292
})
9393
)
9494
);
@@ -106,10 +106,10 @@ public Task TestGenericTypeParameterAfterTransformation()
106106
.AfterTransformation(result =>
107107
{
108108
AssertValidAnnotations(result);
109-
Assert.AreEqual(1, result.Documents.Count);
109+
Assert.That(result.Documents.Count, Is.EqualTo(1));
110110
var document = result.Documents[0];
111-
Assert.NotNull(document.OriginalModified);
112-
Assert.AreEqual(GetOutputFile(nameof(GenericTypeParameter)), document.Transformed.ToFullString());
111+
Assert.That(document.OriginalModified, Is.Not.Null);
112+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(GenericTypeParameter))));
113113
})
114114
)
115115
);
@@ -126,10 +126,10 @@ public Task TestActionFuncAfterTransformation()
126126
.AfterTransformation(result =>
127127
{
128128
AssertValidAnnotations(result);
129-
Assert.AreEqual(1, result.Documents.Count);
129+
Assert.That(result.Documents.Count, Is.EqualTo(1));
130130
var document = result.Documents[0];
131-
Assert.NotNull(document.OriginalModified);
132-
Assert.AreEqual(GetOutputFile(nameof(ActionFunc)), document.Transformed.ToFullString());
131+
Assert.That(document.OriginalModified, Is.Not.Null);
132+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(ActionFunc))));
133133
})
134134
)
135135
);
@@ -147,10 +147,10 @@ public Task TestExtensionMethodsAfterTransformation()
147147
.AfterTransformation(result =>
148148
{
149149
AssertValidAnnotations(result);
150-
Assert.AreEqual(1, result.Documents.Count);
150+
Assert.That(result.Documents.Count, Is.EqualTo(1));
151151
var document = result.Documents[0];
152-
Assert.NotNull(document.OriginalModified);
153-
Assert.AreEqual(GetOutputFile(nameof(ExtensionMethods)), document.Transformed.ToFullString());
152+
Assert.That(document.OriginalModified, Is.Not.Null);
153+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(ExtensionMethods))));
154154
})
155155
)
156156
);
@@ -169,10 +169,10 @@ public Task TestExternalExtensionMethodsAfterTransformation()
169169
.AfterTransformation(result =>
170170
{
171171
AssertValidAnnotations(result);
172-
Assert.AreEqual(1, result.Documents.Count);
172+
Assert.That(result.Documents.Count, Is.EqualTo(1));
173173
var document = result.Documents[0];
174-
Assert.NotNull(document.OriginalModified);
175-
Assert.AreEqual(GetOutputFile(nameof(ExternalExtensionMethods)), document.Transformed.ToFullString());
174+
Assert.That(document.OriginalModified, Is.Not.Null);
175+
Assert.That(document.Transformed.ToFullString(), Is.EqualTo(GetOutputFile(nameof(ExternalExtensionMethods))));
176176
})
177177
)
178178
);

0 commit comments

Comments
 (0)