Merge remote-tracking branch 'upstream/master' into fix409

ab4e659f · Vladimir Reshetnikov · aa8a9c74 · 939cefea · ab4e659f
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenShortCircuitOperatorTests.cs ...arp/Test/Emit/CodeGen/CodeGenShortCircuitOperatorTests.cs +1 -1

未找到文件。
--- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenShortCircuitOperatorTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenShortCircuitOperatorTests.cs
@@ -4176,7 +4176,7 @@ static void Main()
            var comp = CompileAndVerify(source, expectedOutput: @"Success");
        }

-        [Fact]
+        [Fact(Skip = "836"), WorkItem(836, "GitHub")]
        public void ConditionalMemberAccessRace002()
        {
            var source = @"