提交 b1c3a128 编写于 作者: J Jared Parsons

Fix serialization issue in testsz

上级 49edd3c3
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 15
VisualStudioVersion = 14.0.25420.1 VisualStudioVersion = 15.0.26021.3
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysisTest", "src\Compilers\Core\CodeAnalysisTest\CodeAnalysisTest.csproj", "{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysisTest", "src\Compilers\Core\CodeAnalysisTest\CodeAnalysisTest.csproj", "{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}"
EndProject EndProject
...@@ -1180,22 +1180,22 @@ Global ...@@ -1180,22 +1180,22 @@ Global
{14118347-ED06-4608-9C45-18228273C712}.Release|x86.Build.0 = Release|Any CPU {14118347-ED06-4608-9C45-18228273C712}.Release|x86.Build.0 = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.Build.0 = Debug|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|ARM.ActiveCfg = Debug|ARM {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|ARM.ActiveCfg = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|ARM.Build.0 = Debug|ARM {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|ARM.Build.0 = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x64.ActiveCfg = Debug|x64 {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x64.ActiveCfg = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x64.Build.0 = Debug|x64 {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x64.Build.0 = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x86.ActiveCfg = Debug|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x86.ActiveCfg = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x86.Build.0 = Debug|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|x86.Build.0 = Debug|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.ActiveCfg = Release|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.Build.0 = Release|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.Build.0 = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|ARM.ActiveCfg = Release|ARM {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|ARM.ActiveCfg = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|ARM.Build.0 = Release|ARM {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|ARM.Build.0 = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Mixed Platforms.Build.0 = Release|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x64.ActiveCfg = Release|x64 {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x64.ActiveCfg = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x64.Build.0 = Release|x64 {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x64.Build.0 = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x86.ActiveCfg = Release|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x86.ActiveCfg = Release|Any CPU
{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x86.Build.0 = Release|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
......
...@@ -319,7 +319,7 @@ public string[] PeVerifyModules(string[] modulesToVerify, bool throwOnError = tr ...@@ -319,7 +319,7 @@ public string[] PeVerifyModules(string[] modulesToVerify, bool throwOnError = tr
public SortedSet<string> GetMemberSignaturesFromMetadata(string fullyQualifiedTypeName, string memberName) public SortedSet<string> GetMemberSignaturesFromMetadata(string fullyQualifiedTypeName, string memberName)
{ {
var emitData = GetEmitData(); var emitData = GetEmitData();
var searchIds = emitData.AllModuleData.Select(x => x.Id).ToList(); var searchIds = emitData.AllModuleData.Select(x => new RuntimeModuleDataId(x.Id)).ToList();
return GetEmitData().Manager.GetMemberSignaturesFromMetadata(fullyQualifiedTypeName, memberName, searchIds); return GetEmitData().Manager.GetMemberSignaturesFromMetadata(fullyQualifiedTypeName, memberName, searchIds);
} }
......
...@@ -329,12 +329,12 @@ private Module ModuleResolve(object sender, ResolveEventArgs args) ...@@ -329,12 +329,12 @@ private Module ModuleResolve(object sender, ResolveEventArgs args)
return assembly.LoadModule(args.Name, rawModule.ToArray()); return assembly.LoadModule(args.Name, rawModule.ToArray());
} }
public SortedSet<string> GetMemberSignaturesFromMetadata(string fullyQualifiedTypeName, string memberName, List<ModuleDataId> searchModules) public SortedSet<string> GetMemberSignaturesFromMetadata(string fullyQualifiedTypeName, string memberName, List<RuntimeModuleDataId> searchModules)
{ {
try try
{ {
var signatures = new SortedSet<string>(); var signatures = new SortedSet<string>();
foreach (var id in searchModules) // Check inside each assembly in the compilation foreach (var id in searchModules.Select(x => x.Id)) // Check inside each assembly in the compilation
{ {
var assembly = GetAssembly(id.FullName, reflectionOnly: true); var assembly = GetAssembly(id.FullName, reflectionOnly: true);
foreach (var signature in MetadataSignatureHelper.GetMemberSignatures(assembly, fullyQualifiedTypeName, memberName)) foreach (var signature in MetadataSignatureHelper.GetMemberSignatures(assembly, fullyQualifiedTypeName, memberName))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册