提交 db2a9f02 编写于 作者: T Tomas Matousek

Fix scripting

上级 3eabe82a
......@@ -23,11 +23,11 @@
/r:System.Threading.Tasks.Parallel
/r:System.Threading.Thread
# extra references
/r:System.Dynamic.Runtime
/r:System.Linq
/r:System.Linq.Expressions
/r:System.Runtime.Numerics
/r:System.Dynamic.Runtime
/r:System.ValueTuple.dll
/r:System.ValueTuple
/r:Microsoft.CSharp
# imports
/u:System
......
/r:System
/r:System.Core
/r:Microsoft.CSharp
/r:System.ValueTuple.dll
/u:System
/u:System.IO
/u:System.Collections.Generic
......
......@@ -25,11 +25,11 @@
/r:System.Threading.Tasks.Parallel
/r:System.Threading.Thread
# extra references
/r:System.Dynamic.Runtime
/r:System.Linq
/r:System.Linq.Expressions
/r:System.Runtime.Numerics
/r:System.Dynamic.Runtime
/r:System.ValueTuple.dll
/r:System.ValueTuple
# imports
/u:System
/u:System.IO
......
/r:System
/r:System.Core
/r:System.ValueTuple.dll
/Imports:System
/Imports:System.IO
/Imports:System.Collections.Generic
......
......@@ -43,7 +43,6 @@ private static IEnumerable<string> GetReferences()
yield return "System";
yield return "System.Core";
yield return "Microsoft.CSharp";
yield return "System.ValueTuple.dll";
}
else
{
......@@ -76,7 +75,6 @@ private static IEnumerable<string> GetReferences()
yield return "System.Linq.Expressions";
yield return "System.Runtime.Numerics";
yield return "System.Dynamic.Runtime";
yield return "System.ValueTuple";
yield return "Microsoft.CSharp";
}
}
......@@ -170,7 +168,7 @@ > Math.PI
>", runner.Console.Out.ToString());
}
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/17043")]
[Fact]
[WorkItem(7133, "http://github.com/dotnet/roslyn/issues/7133")]
public void TestDisplayResultsWithCurrentUICulture2()
{
......@@ -224,7 +222,7 @@ > Print(2)
> ", runner.Console.Out.ToString());
}
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/18479")]
[Fact]
[WorkItem(18479, "https://github.com/dotnet/roslyn/issues/18479")]
public void Tuples()
{
......
......@@ -831,7 +831,7 @@ public async Task Pdb_CreateFromString_CodeFromFile_WithEmitDebugInformation_Wit
}
}
[ConditionalFact(typeof(DesktopOnly))]
[Fact]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromString_CodeFromFile_WithEmitDebugInformation_WithFileEncoding_ResultInPdbEmitted()
{
......@@ -853,7 +853,7 @@ public Task Pdb_CreateFromString_CodeFromFile_WithoutEmitDebugInformation_WithFi
return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts));
}
[ConditionalFact(typeof(DesktopOnly))]
[Fact]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromStream_CodeFromFile_WithEmitDebugInformation_ResultInPdbEmitted()
{
......@@ -868,7 +868,7 @@ public Task Pdb_CreateFromStream_CodeFromFile_WithoutEmitDebugInformation_Result
return VerifyStackTraceAsync(() => CSharpScript.Create(new MemoryStream(Encoding.UTF8.GetBytes("throw new System.Exception();")), opts));
}
[ConditionalFact(typeof(DesktopOnly))]
[Fact]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromString_InlineCode_WithEmitDebugInformation_WithoutFileEncoding_ResultInPdbEmitted()
{
......@@ -876,7 +876,7 @@ public Task Pdb_CreateFromString_InlineCode_WithEmitDebugInformation_WithoutFile
return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts), line: 1, column: 1, filename: "");
}
[ConditionalFact(typeof(DesktopOnly))]
[Fact]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromString_InlineCode_WithEmitDebugInformation_WithFileEncoding_ResultInPdbEmitted()
{
......@@ -898,7 +898,7 @@ public Task Pdb_CreateFromString_InlineCode_WithoutEmitDebugInformation_WithFile
return VerifyStackTraceAsync(() => CSharpScript.Create("throw new System.Exception();", opts));
}
[ConditionalFact(typeof(DesktopOnly))]
[Fact]
[WorkItem(19027, "https://github.com/dotnet/roslyn/issues/19027")]
public Task Pdb_CreateFromStream_InlineCode_WithEmitDebugInformation_ResultInPdbEmitted()
{
......
......@@ -63,6 +63,7 @@ private static ImmutableArray<MetadataReference> GetDefaultMetadataReferences()
"System.Threading.Tasks",
"System.Threading.Tasks.Parallel",
"System.Threading.Thread",
"System.ValueTuple",
};
return ImmutableArray.CreateRange(files.Select(CreateUnresolvedReference));
......
......@@ -24,7 +24,7 @@ public void AddReferences()
AddReferences("System.Linq").
AddReferences("System.Linq");
Assert.Equal(GacFileResolver.IsAvailable ? 5 : 29, options.MetadataReferences.Length);
Assert.Equal(GacFileResolver.IsAvailable ? 5 : 30, options.MetadataReferences.Length);
}
[Fact]
......
......@@ -67,14 +67,13 @@ public class TestAnalyzer : DiagnosticAnalyzer
dir.CopyFile(typeof(System.Reflection.Metadata.MetadataReader).Assembly.Location);
var immutable = dir.CopyFile(typeof(ImmutableArray).Assembly.Location);
var analyzer = dir.CopyFile(typeof(DiagnosticAnalyzer).Assembly.Location);
dir.CopyFile(Path.Combine(Path.GetDirectoryName(typeof(CSharpCompilation).Assembly.Location), "System.IO.FileSystem.dll"));
var analyzerCompilation = CSharpCompilation.Create(
assemblyName,
new SyntaxTree[] { SyntaxFactory.ParseSyntaxTree(analyzerSource) },
new MetadataReference[]
{
TestReferences.NetStandard13.SystemRuntime,
TestReferences.NetStandard20.NetStandard,
MetadataReference.CreateFromFile(immutable.Path),
MetadataReference.CreateFromFile(analyzer.Path)
},
......
/r:System
/r:System.Core
/r:Microsoft.CSharp
/r:System.ValueTuple.dll
/u:System
/u:System.IO
/u:System.Collections.Generic
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册