提交 20d97c59 编写于 作者: P Paul Vick

Fix bad merge

上级 eaeb63fc
......@@ -32868,11 +32868,7 @@ static void G(out object o)
o = null;
}
}";
<<<<<<< HEAD
var comp = CreateStandardCompilation(source);
=======
var comp = CreateCompilationWithMscorlib(source);
>>>>>>> upstream/dev15.2.x
var tree = comp.SyntaxTrees.Single();
var model = comp.GetSemanticModel(tree);
var identifierBefore = GetReferences(tree, "G").Single();
......@@ -32886,7 +32882,6 @@ <<<<<<< HEAD
var info = model.GetSymbolInfo(identifierAfter);
Assert.Equal("void C.G(out System.Object o)", info.Symbol.ToTestDisplayString());
}
<<<<<<< HEAD
[Fact]
[WorkItem(10604, "https://github.com/dotnet/roslyn/issues/10604")]
......@@ -32917,8 +32912,6 @@ IEnumerable<object> M2(out int j)
Assert.Equal("System.Collections.Generic.IEnumerator<System.Object> System.Collections.Generic.IEnumerable<System.Object>.GetEnumerator()",
info.GetEnumeratorMethod.ToTestDisplayString());
}
=======
>>>>>>> upstream/dev15.2.x
}
internal static class OutVarTestsExtensions
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册