[rel/3.7] Change that will conflict in rel/3.7 to test backport #4612
Build Linux Debug failed
Annotations
Check failure on line 9 in Build log
azure-pipelines / microsoft.testfx (Build Linux Debug)
Build log #L9
Publishing build artifacts failed with an error: Not found PathtoPublish: /mnt/vss/_work/1/s/artifacts/TestResults/Debug
Check failure on line 24 in test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs
azure-pipelines / microsoft.testfx (Build Linux Debug)
test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs#L24
test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs(24,1): error CS8300: (NETCORE_ENGINEERING_TELEMETRY=Build) Merge conflict marker encountered
Check failure on line 38 in test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs
azure-pipelines / microsoft.testfx (Build Linux Debug)
test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs#L38
test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs(38,1): error CS8300: (NETCORE_ENGINEERING_TELEMETRY=Build) Merge conflict marker encountered
Check failure on line 51 in test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs
azure-pipelines / microsoft.testfx (Build Linux Debug)
test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs#L51
test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs(51,1): error CS8300: (NETCORE_ENGINEERING_TELEMETRY=Build) Merge conflict marker encountered
Check failure on line 24 in test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs
azure-pipelines / microsoft.testfx (Build Linux Debug)
test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs#L24
test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs(24,1): error CS8300: (NETCORE_ENGINEERING_TELEMETRY=Build) Merge conflict marker encountered