Browse Source

Add System.Memory types to Roslyn test environment.

pull/1246/head
Siegfried Pammer 7 years ago
parent
commit
76cfa6fda4
  1. 7
      ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
  2. 1
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

7
ICSharpCode.Decompiler.Tests/Helpers/Tester.cs

@ -186,9 +186,11 @@ namespace ICSharpCode.Decompiler.Tests.Helpers @@ -186,9 +186,11 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "mscorlib.dll")),
MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.dll")),
MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.Core.dll")),
MetadataReference.CreateFromFile(Path.Combine(refAsmPath, @"Facades\System.Runtime.dll")),
MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.Xml.dll")),
MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "Microsoft.CSharp.dll")),
MetadataReference.CreateFromFile(typeof(ValueTuple).Assembly.Location)
MetadataReference.CreateFromFile(typeof(ValueTuple).Assembly.Location),
MetadataReference.CreateFromFile(typeof(Span<>).Assembly.Location),
};
});
@ -239,6 +241,9 @@ namespace ICSharpCode.Decompiler.Tests.Helpers @@ -239,6 +241,9 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
));
CompilerResults results = new CompilerResults(new TempFileCollection());
results.PathToAssembly = outputFileName ?? Path.GetTempFileName();
string systemMemoryDestPath = Path.Combine(Path.GetDirectoryName(results.PathToAssembly), Path.GetFileName(typeof(Span<>).Assembly.Location));
if (!File.Exists(systemMemoryDestPath))
File.Copy(typeof(Span<>).Assembly.Location, systemMemoryDestPath);
var emitResult = compilation.Emit(results.PathToAssembly);
if (!emitResult.Success) {
StringBuilder b = new StringBuilder("Compiler error:");

1
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="System.Memory" Version="4.5.1" />
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save