Rollback PR unrelated changes

Author: manne

src/CodeGeneration.Roslyn.Engine/CompilationGenerator.cs

@@ -84,7 +84,7 @@ public class CompilationGenerator
         /// <param name="progress">Optional handler of diagnostics provided by code generator.</param>
         /// <param name="cancellationToken">Cancellation token to interrupt async operations.</param>
         /// <returns>A <see cref="Task.CompletedTask"/>.</returns>
-        public async Task GenerateAsync(IProgress<Diagnostic> progress, CancellationToken cancellationToken)
+        public async Task GenerateAsync(IProgress<Diagnostic> progress = null, CancellationToken cancellationToken = default)
         {
             Verify.Operation(this.Compile != null, $"{nameof(Compile)} must be set first.");
             Verify.Operation(this.ReferencePath != null, $"{nameof(ReferencePath)} must be set first.");
@@ -104,14 +104,13 @@ public async Task GenerateAsync(IProgress<Diagnostic> progress, CancellationToke
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    string sourceHash = Convert.ToBase64String(hasher.ComputeHash(Encoding.UTF8.GetBytes(inputSyntaxTree.FilePath)), 0, 6).Replace(Path.AltDirectorySeparatorChar, '-').Replace(Path.DirectorySeparatorChar, '-');
+                    string sourceHash = Convert.ToBase64String(hasher.ComputeHash(Encoding.UTF8.GetBytes(inputSyntaxTree.FilePath)), 0, 6).Replace('/', '-');
                     Logger.Info($"File \"{inputSyntaxTree.FilePath}\" hashed to {sourceHash}");
-                    string outputFilePath = Path.Combine(this.IntermediateOutputDirectory, Path.GetFileNameWithoutExtension(inputSyntaxTree.FilePath) + FormattableString.Invariant($".{sourceHash}.generated.cs"));
-                    var outputFile = new FileInfo(outputFilePath);
+                    string outputFilePath = Path.Combine(this.IntermediateOutputDirectory, Path.GetFileNameWithoutExtension(inputSyntaxTree.FilePath) + $".{sourceHash}.generated.cs");
 
                     // Code generation is relatively fast, but it's not free.
                     // So skip files that haven't changed since we last generated them.
-                    DateTime outputLastModified = outputFile.Exists ? outputFile.LastWriteTime : DateTime.MinValue;
+                    DateTime outputLastModified = File.Exists(outputFilePath) ? File.GetLastWriteTime(outputFilePath) : DateTime.MinValue;
                     if (File.GetLastWriteTime(inputSyntaxTree.FilePath) > outputLastModified || assembliesLastModified > outputLastModified)
                     {
                         int retriesLeft = 3;
@@ -127,7 +126,7 @@ public async Task GenerateAsync(IProgress<Diagnostic> progress, CancellationToke
                                     progress,
                                     cancellationToken);
                                 var outputText = await generatedSyntaxTree.GetTextAsync(cancellationToken);
-                                using (var outputFileStream = outputFile.OpenWrite())
+                                using (var outputFileStream = File.OpenWrite(outputFilePath))
                                 using (var outputWriter = new StreamWriter(outputFileStream))
                                 {
                                     outputText.Write(outputWriter, cancellationToken);
@@ -143,7 +142,7 @@ public async Task GenerateAsync(IProgress<Diagnostic> progress, CancellationToke
                                     bool anyTypesGenerated = root.DescendantNodes().OfType<TypeDeclarationSyntax>().Any();
                                     if (!anyTypesGenerated)
                                     {
-                                        this.emptyGeneratedFiles.Add(outputFile.FullName);
+                                        this.emptyGeneratedFiles.Add(outputFilePath);
                                     }
                                 }
                                 break;
@@ -163,7 +162,7 @@ public async Task GenerateAsync(IProgress<Diagnostic> progress, CancellationToke
                         while (true);
                     }
 
-                    this.generatedFiles.Add(outputFile.FullName);
+                    this.generatedFiles.Add(outputFilePath);
                 }
             }
 
@@ -233,7 +232,10 @@ private static void ReportError(IProgress<Diagnostic> progress, string id, Synta
 
             var location = inputSyntaxTree != null ? Location.Create(inputSyntaxTree, TextSpan.FromBounds(0, 0)) : Location.None;
 
-            var messageArgs = new object[] { ex };
+            var messageArgs = new object[]
+            {
+                ex,
+            };
 
             var reportDiagnostic = Diagnostic.Create(descriptor, location, messageArgs);
 

src/CodeGeneration.Roslyn.Engine/DocumentTransform.cs

@@ -50,7 +50,7 @@ public static async Task<SyntaxTree> TransformAsync(
             string projectDirectory,
             Func<AssemblyName, Assembly> assemblyLoader,
             IProgress<Diagnostic> progress,
-            CancellationToken cancellationToken)
+            CancellationToken cancellationToken = default)
         {
             Requires.NotNull(compilation, nameof(compilation));
             Requires.NotNull(inputDocument, nameof(inputDocument));

src/CodeGeneration.Roslyn.Tests/Helpers/CompilationTestsBase.cs

@@ -6,7 +6,6 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Threading;
 using System.Threading.Tasks;
 using CodeGeneration.Roslyn;
 using CodeGeneration.Roslyn.Engine;
@@ -79,7 +78,7 @@ protected static async Task<SyntaxTree> GenerateAsync(string source)
         var diagnostics = compilation.GetDiagnostics();
         Assert.Empty(diagnostics.Where(x => x.Severity >= DiagnosticSeverity.Warning));
         var progress = new Progress<Diagnostic>();
-        var result = await DocumentTransform.TransformAsync(compilation, tree, null, Assembly.Load, progress, CancellationToken.None);
+        var result = await DocumentTransform.TransformAsync(compilation, tree, null, Assembly.Load, progress);
         return result;
     }