Add sync script and sync

pester · May 27, 2024 · e995c3f · e995c3f
1 parent 1f68386
commit e995c3f
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 5 deletions.
diff --git a/src/csharp/Pester/Tracing/ExternalTracerAdapter.cs b/src/csharp/Pester/Tracing/ExternalTracerAdapter.cs
@@ -1,4 +1,6 @@
-using System;
+// Copied from Profiler module, branch: Fix-error-autodetection, commit: 150bbcf Fix error autodetection 
+
+using System;
 using System.Management.Automation;
 using System.Management.Automation.Language;
 using System.Reflection;

diff --git a/src/csharp/Pester/Tracing/ITracer.cs b/src/csharp/Pester/Tracing/ITracer.cs
@@ -1,4 +1,6 @@
-using System.Management.Automation;
+// Copied from Profiler module, branch: Fix-error-autodetection, commit: 150bbcf Fix error autodetection 
+
+using System.Management.Automation;
 using System.Management.Automation.Language;
 
 # if PESTER

diff --git a/src/csharp/Pester/Tracing/Tracer.cs b/src/csharp/Pester/Tracing/Tracer.cs
@@ -1,4 +1,6 @@
-using System;
+// Copied from Profiler module, branch: Fix-error-autodetection, commit: 150bbcf Fix error autodetection 
+
+using System;
 using System.Management.Automation;
 using System.Management.Automation.Host;
 using System.Management.Automation.Language;
@@ -77,7 +79,8 @@ private static void EnsureTracingWasNotCorrupted()
         // the only line that is allowed to do that is $corruptionAutodetectionVariable = Set-PSDebug -Trace 0
         // This line should be the second to last line that was executed. We re-enable the trace in Profiler, so the last line (::Unregister or ::Unpatch) is
         // captured even when tracing is broken by user.
-        var corrupted = LastTraceItem.Extent?.Text != null && LastTraceItem.Extent.Text != "$corruptionAutodetectionVariable = Set-PSDebug -Trace 0";
+        const string autodetectionText = "$corruptionAutodetectionVariable = Set-PSDebug -Trace 0";
+        var corrupted = LastTraceItem.Extent?.Text != null && !LastTraceItem.Extent.Text.Equals(autodetectionText, StringComparison.OrdinalIgnoreCase);
         if (corrupted)
         {
             throw new InvalidOperationException($"Trace was broken by: {LastTraceItem.Extent.Text} from {LastTraceItem.Extent.File}:{LastTraceItem.Extent.StartLineNumber}");

diff --git a/src/csharp/Pester/Tracing/TracerHostUI.cs b/src/csharp/Pester/Tracing/TracerHostUI.cs
@@ -1,4 +1,6 @@
-using System;
+// Copied from Profiler module, branch: Fix-error-autodetection, commit: 150bbcf Fix error autodetection 
+
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Management.Automation;

diff --git a/src/csharp/Sync-WithProfiler.ps1 b/src/csharp/Sync-WithProfiler.ps1
@@ -0,0 +1,28 @@
+# Copies shared csharp files from Profiler module, which is expected to be
+# in a folder named Profiler next to Pester repo folder.
+
+$ErrorActionPreference = 'Stop'
+$profilerPath = "$PSScriptRoot\..\..\..\Profiler"
+
+if (-not (Test-Path $profilerPath)) {
+    throw "Profiler module not found at '$profilerPath'."
+}
+
+
+$commit = git -C $profilerPath log --format="%h %B" -n 1
+$branch = git -C $profilerPath branch --show-current
+$profilerSources = "$profilerPath\csharp\Profiler"
+$pesterSources = "$PSScriptRoot\Pester\Tracing\"
+$names = @(
+    "ExternalTracerAdapter.cs"
+    "ITracer.cs"
+    "Tracer.cs"
+    "TracerHostUI.cs"
+)
+foreach ($name in $names ) {
+    $destination = "$pesterSources\$name"
+    Copy-Item -Path "$profilerSources\$name" -Destination $destination -Force
+    $content = Get-Content $destination -Raw
+    $n = [System.Environment]::NewLine
+    ("// Copied from Profiler module, branch: $branch, commit: $commit$n$n" + $content) | Set-Content $destination -NoNewline
+}