re verify

SimonCropp · May 25, 2023 · eaf06c0 · eaf06c0
1 parent fb50bdd
commit eaf06c0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 23 deletions.
diff --git a/src/Cymbal/CymbalTask.cs b/src/Cymbal/CymbalTask.cs
@@ -52,12 +52,12 @@ void InnerExecute()
         }
 
         var fullPublishPath = Path.GetFullPath(PublishDirectory);
-        var inputs = $@"
-PublishDir: {fullPublishPath}
-CymbalCacheDirectory environment variable: {environmentCacheDirectory}
-CymbalCacheDirectory MsBuild property: {CacheDirectory}
-Resolved CacheDirectory: {cacheDirectory}
-";
+        var inputs = $"""
+            PublishDir: {fullPublishPath}
+            CymbalCacheDirectory environment variable: {environmentCacheDirectory}
+            CymbalCacheDirectory MsBuild property: {CacheDirectory}
+            Resolved CacheDirectory: {cacheDirectory}
+            """;
         Log.LogMessageFromText(inputs, MessageImportance.High);
 
         var (hasPdb, isEmbedded, toDownload) = GetFiles(fullPublishPath);

diff --git a/src/Cymbal/Dotnet.cs b/src/Cymbal/Dotnet.cs
@@ -40,9 +40,11 @@ public static List<string> Execute(string command, string arguments)
 
         if (!process.DoubleWaitForExit())
         {
-            var timeoutError = $@"Process timed out. {commandLineMessage}.
-Output: {string.Join(Environment.NewLine, output)}
-Error: {errorBuilder}";
+            var timeoutError = $"""
+                Process timed out. {commandLineMessage}.
+                Output: {string.Join(Environment.NewLine, output)}
+                Error: {errorBuilder}
+                """;
             throw new Error(timeoutError);
         }
 
@@ -64,9 +66,11 @@ dotnet tool install dotnet-symbol
             throw new Error(message);
         }
 
-        var error = $@"Could not execute process. {commandLineMessage}.
-Output: {string.Join(Environment.NewLine, output)}
-Error: {errors}";
+        var error = $"""
+            Could not execute process. {commandLineMessage}.
+            Output: {string.Join(Environment.NewLine, output)}
+            Error: {errors}
+            """;
         throw new Error(error);
     }
 }
diff --git a/src/Tests/Tests.RunTask_environmentCache=False_propertyCache=False.DotNet.verified.txt b/src/Tests/Tests.RunTask_environmentCache=False_propertyCache=False.DotNet.verified.txt
@@ -9,12 +9,10 @@
        Publish:
          SampleApp -> {SolutionDirectory}SampleApp/bin/IncludeTask/publish/
        CymbalTarget:
-
          PublishDir: {SolutionDirectory}SampleApp/bin/IncludeTask/publish/
          CymbalCacheDirectory environment variable: 
          CymbalCacheDirectory MsBuild property: 
          Resolved CacheDirectory: 
-
          Skipped assemblies with existing pdbs:
          	{SolutionDirectory}SampleApp/bin/IncludeTask/publish/AssemblyWithPdb.dll
          	{SolutionDirectory}SampleApp/bin/IncludeTask/publish/Microsoft.Data.SqlClient.dll

diff --git a/src/Tests/Tests.RunTask_environmentCache=False_propertyCache=True.DotNet.verified.txt b/src/Tests/Tests.RunTask_environmentCache=False_propertyCache=True.DotNet.verified.txt
@@ -9,12 +9,10 @@
        Publish:
          SampleApp -> {SolutionDirectory}SampleApp/bin/IncludeTask/publish/
        CymbalTarget:
-
          PublishDir: {SolutionDirectory}SampleApp/bin/IncludeTask/publish/
          CymbalCacheDirectory environment variable: 
          CymbalCacheDirectory MsBuild property: {SolutionDirectory}Cache
          Resolved CacheDirectory: {SolutionDirectory}Cache
-
          Skipped assemblies with existing pdbs:
          	{SolutionDirectory}SampleApp/bin/IncludeTask/publish/AssemblyWithPdb.dll
          	{SolutionDirectory}SampleApp/bin/IncludeTask/publish/Microsoft.Data.SqlClient.dll

diff --git a/src/Tests/Tests.RunTask_environmentCache=True_propertyCache=False.DotNet.verified.txt b/src/Tests/Tests.RunTask_environmentCache=True_propertyCache=False.DotNet.verified.txt
@@ -9,12 +9,10 @@
        Publish:
          SampleApp -> {SolutionDirectory}SampleApp/bin/IncludeTask/publish/
        CymbalTarget:
-
          PublishDir: {SolutionDirectory}SampleApp/bin/IncludeTask/publish/
          CymbalCacheDirectory environment variable: {SolutionDirectory}Cache
          CymbalCacheDirectory MsBuild property: {SolutionDirectory}Cache
          Resolved CacheDirectory: {SolutionDirectory}Cache
-
          Skipped assemblies with existing pdbs:
          	{SolutionDirectory}SampleApp/bin/IncludeTask/publish/AssemblyWithPdb.dll
          	{SolutionDirectory}SampleApp/bin/IncludeTask/publish/Microsoft.Data.SqlClient.dll

diff --git a/src/Tests/Tests.RunTask_environmentCache=True_propertyCache=True.DotNet.verified.txt b/src/Tests/Tests.RunTask_environmentCache=True_propertyCache=True.DotNet.verified.txt
@@ -9,12 +9,10 @@
        Publish:
          SampleApp -> {SolutionDirectory}SampleApp/bin/IncludeTask/publish/
        CymbalTarget:
-
          PublishDir: {SolutionDirectory}SampleApp/bin/IncludeTask/publish/
          CymbalCacheDirectory environment variable: {SolutionDirectory}Cache
          CymbalCacheDirectory MsBuild property: {SolutionDirectory}Cache
          Resolved CacheDirectory: {SolutionDirectory}Cache
-
          Skipped assemblies with existing pdbs:
          	{SolutionDirectory}SampleApp/bin/IncludeTask/publish/AssemblyWithPdb.dll
          	{SolutionDirectory}SampleApp/bin/IncludeTask/publish/Microsoft.Data.SqlClient.dll

diff --git a/src/Tests/Tests.Should_Parse_SymbolServer.verified.txt b/src/Tests/Tests.Should_Parse_SymbolServer.verified.txt
@@ -1,18 +1,18 @@
 {
   buildOutput:
      1>Project "{SolutionDirectory}SampleWithSymbolServer/SampleWithSymbolServer.csproj" on node 1 (Publish target(s)).
-     1>PrepareForPublish:
+     1>IncludeSymbolFromReferences:
+       {SolutionDirectory}Cymbal/build/Cymbal.targets(26,14): message : MSB4120: Item 'ReferenceCopyLocalPaths' definition within target references itself via (qualified or unqualified) metadatum 'DestinationSubDirectory'. This can lead to unintended expansion and cross-applying of pre-existing items. More info: https://aka.ms/msbuild/metadata-self-ref [{SolutionDirectory}SampleWithSymbolServer/SampleWithSymbolServer.csproj]
+       PrepareForPublish:
        _CopyResolvedFilesToPublishPreserveNewest:
        _CopyResolvedFilesToPublishAlways:
        Publish:
          SampleWithSymbolServer -> {SolutionDirectory}SampleWithSymbolServer/bin/IncludeTask/publish/
        CymbalTarget:
-
          PublishDir: {SolutionDirectory}SampleWithSymbolServer/bin/IncludeTask/publish/
          CymbalCacheDirectory environment variable: 
          CymbalCacheDirectory MsBuild property: 
          Resolved CacheDirectory: 
-
          Skipped assemblies with existing pdbs:
          	{SolutionDirectory}SampleWithSymbolServer/bin/IncludeTask/publish/SampleWithSymbolServer.dll
          Assemblies to process: