Fixing flakey test and updates

Author: distantcam

src/AutoCtor.Tests/AutoCtor.Tests.csproj

@@ -45,6 +45,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="System.Linq.Async" />
     <PackageReference Include="TUnit" />
     <PackageReference Include="Verify.DiffPlex" />
     <PackageReference Include="Verify.SourceGenerators" />

src/AutoCtor.Tests/ExampleTests.cs

@@ -12,7 +12,7 @@ public class ExampleTests
     public async Task ExamplesGeneratedCode(CodeFileTheoryData theoryData)
     {
         var builder = CreateCompilation(theoryData);
-        var compilation = await builder.Build(nameof(ExampleTests));
+        var compilation = await builder.Build(nameof(ExampleTests), TestHelper.CancellationToken);
         var driver = new GeneratorDriverBuilder()
             .AddGenerator(new AutoConstructSourceGenerator())
             .WithAnalyzerOptions(theoryData.Options)
@@ -30,7 +30,7 @@ await Verify(driver)
     public async Task CodeCompilesProperly(CodeFileTheoryData theoryData)
     {
         var builder = CreateCompilation(theoryData);
-        var compilation = await builder.Build(nameof(ExampleTests));
+        var compilation = await builder.Build(nameof(ExampleTests), TestHelper.CancellationToken);
         new GeneratorDriverBuilder()
             .AddGenerator(new AutoConstructSourceGenerator())
             .WithAnalyzerOptions(theoryData.Options)
@@ -52,7 +52,7 @@ await Assert.That(outputCompilation.GetDiagnostics(TestHelper.CancellationToken)
     public async Task EnsureRunsAreCachedCorrectly(CodeFileTheoryData theoryData)
     {
         var builder = CreateCompilation(theoryData);
-        var compilation = await builder.Build(nameof(ExampleTests));
+        var compilation = await builder.Build(nameof(ExampleTests), TestHelper.CancellationToken);
 
         var driver = new GeneratorDriverBuilder()
             .AddGenerator(new AutoConstructSourceGenerator())

src/AutoCtor.Tests/GeneratedAttributeTests.cs

@@ -8,7 +8,7 @@ public async Task AttributeGeneratedCode()
         var builder = new CompilationBuilder()
             .AddNetCoreReference()
             .WithPreprocessorSymbols(["AUTOCTOR_EMBED_ATTRIBUTES"]);
-        var compilation = await builder.Build(nameof(GeneratedAttributeTests));
+        var compilation = await builder.Build(nameof(GeneratedAttributeTests), TestHelper.CancellationToken);
         var driver = new GeneratorDriverBuilder()
             .AddGenerator(new AttributeSourceGenerator())
             .Build(builder.ParseOptions)
@@ -23,7 +23,7 @@ public async Task AttributeCompilesProperly()
         var builder = new CompilationBuilder()
             .AddNetCoreReference()
             .WithPreprocessorSymbols(["AUTOCTOR_EMBED_ATTRIBUTES"]);
-        var compilation = await builder.Build(nameof(GeneratedAttributeTests));
+        var compilation = await builder.Build(nameof(GeneratedAttributeTests), TestHelper.CancellationToken);
         var driver = new GeneratorDriverBuilder()
             .AddGenerator(new AttributeSourceGenerator())
             .Build(builder.ParseOptions)
@@ -47,7 +47,7 @@ public async Task PreserveAttributesTest()
             .AddNetCoreReference()
             .AddCode("[AutoCtor.AutoConstruct] public partial class Test { }")
             .WithPreprocessorSymbols(["AUTOCTOR_EMBED_ATTRIBUTES", "AUTOCTOR_USAGES"]);
-        var compilation = await builder.Build(nameof(GeneratedAttributeTests));
+        var compilation = await builder.Build(nameof(GeneratedAttributeTests), TestHelper.CancellationToken);
 
         var driver = new GeneratorDriverBuilder()
             .AddGenerator(new AttributeSourceGenerator())
@@ -79,13 +79,13 @@ public async Task EnsureGeneratedAttributesAreNotExternallyVisible()
             .Build(compileBuilder.ParseOptions);
 
         var projectA = await compileBuilder
-            .Build("ProjectA");
+            .Build("ProjectA", TestHelper.CancellationToken);
 
         genDriver = genDriver.RunGeneratorsAndUpdateCompilation(projectA, out var genProjectA, out _, TestHelper.CancellationToken);
 
         var projectB = await compileBuilder
             .AddCompilationReference(genProjectA)
-            .Build("ProjectB");
+            .Build("ProjectB", TestHelper.CancellationToken);
 
         genDriver.RunGeneratorsAndUpdateCompilation(
             projectB,

src/AutoCtor.Tests/Issue73.cs

@@ -73,12 +73,12 @@ public sealed partial class TheClass : BaseClass<object, int, string>{}
 ";
         var projectA = await common
             .AddCode(projectACode)
-            .Build("ProjectA");
+            .Build("ProjectA", TestHelper.CancellationToken);
 
         var projectB = await common
             .AddCompilationReference(projectA)
             .AddCode(projectBCode)
-            .Build("ProjectB");
+            .Build("ProjectB", TestHelper.CancellationToken);
 
         return projectB;
     }

src/AutoCtor.Tests/Utilities/CompilationBuilder.cs

@@ -14,7 +14,6 @@ internal class CompilationBuilder
     private CSharpParseOptions _parseOptions;
     private CSharpCompilationOptions _compilationOptions;
 
-
     public CSharpParseOptions ParseOptions => _parseOptions;
 
     public CompilationBuilder()
@@ -37,11 +36,11 @@ private CompilationBuilder(CompilationBuilder other)
         _compilationOptions = other._compilationOptions;
     }
 
-    public async Task<CSharpCompilation> Build(string assemblyName)
+    public async Task<CSharpCompilation> Build(string assemblyName, CancellationToken cancellationToken = default)
     {
-        var refTasks = _nugetReferences.Select(r => r.ResolveAsync(null, CancellationToken.None));
-        await Task.WhenAll(refTasks);
-        var nugetReferences = refTasks.SelectMany(t => t.Result);
+        var nugetReferences = await _nugetReferences.ToAsyncEnumerable()
+            .SelectManyAwait(async r => (await r.ResolveAsync(null, cancellationToken)).ToAsyncEnumerable())
+            .ToListAsync(cancellationToken);
 
         return CSharpCompilation.Create(assemblyName)
             .AddReferences(nugetReferences)

src/Directory.Packages.props

@@ -12,9 +12,10 @@
     <PackageVersion Include="Microsoft.NETCore.App.Ref" Version="9.0.10" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="TUnit" Version="0.75.30" />
+    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
+    <PackageVersion Include="TUnit" Version="0.77.3" />
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
     <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
-    <PackageVersion Include="Verify.TUnit" Version="31.0.4" />
+    <PackageVersion Include="Verify.TUnit" Version="31.0.5" />
   </ItemGroup>
-</Project>
+</Project>