mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.14.0.106

Browse Source 
Former-commit-id: 03fab0f68b93e237c47a03f7d3793d7f5d7c276d
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-26 08:37:10 +00:00
parent c34b058d3e
commit fee6ab6a16
60 changed files with 271 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
external/cecil/symbols/mdb/Mono.Cecil.Mdb/MdbReader.cs vendored
View File

@@ -25,7 +25,7 @@ namespace Mono.Cecil.Mdb {
Mixin.CheckModule (module);
Mixin.CheckFileName (fileName);
return new MdbReader (module, MonoSymbolFile.ReadSymbolFile (Mixin.GetMdbFileName (fileName), module.Mvid));
return new MdbReader (module, MonoSymbolFile.ReadSymbolFile (Mixin.GetMdbFileName (fileName)));
}
public ISymbolReader GetSymbolReader (ModuleDefinition module, Stream symbolStream)
@@ -33,15 +33,7 @@ namespace Mono.Cecil.Mdb {
Mixin.CheckModule (module);
Mixin.CheckStream (symbolStream);
var file = MonoSymbolFile.ReadSymbolFile (symbolStream);
if (module.Mvid != file.Guid) {
var file_stream = symbolStream as FileStream;
if (file_stream != null)
throw new MonoSymbolFileException ("Symbol file `{0}' does not match assembly", file_stream.Name);
throw new MonoSymbolFileException ("Symbol file from stream does not match assembly");
}
return new MdbReader (module, file);
return new MdbReader (module, MonoSymbolFile.ReadSymbolFile (symbolStream));
}
}

4
external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs vendored
View File

@@ -280,7 +280,7 @@ namespace Mono.Cecil.Pdb {
target = new ImportTarget (ImportTargetKind.ImportNamespace) { @namespace = value };
break;
case 'T': {
var type = module.GetType (value, runtimeName: true);
var type = TypeParser.ParseType (module, value);
if (type != null)
target = new ImportTarget (ImportTargetKind.ImportType) { type = type };
break;
@@ -298,7 +298,7 @@ namespace Mono.Cecil.Pdb {
target = new ImportTarget (ImportTargetKind.DefineNamespaceAlias) { alias = alias_value, @namespace = alias_target_value };
break;
case 'T':
var type = module.GetType (alias_target_value, runtimeName: true);
var type = TypeParser.ParseType (module, alias_target_value);
if (type != null)
target = new ImportTarget (ImportTargetKind.DefineTypeAlias) { alias = alias_value, type = type };
break;

6
external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs vendored
View File

@@ -253,9 +253,9 @@ namespace Mono.Cecil.Pdb {
doc_writer = writer.DefineDocument (
document.Url,
document.Language.ToGuid (),
document.LanguageVendor.ToGuid (),
document.Type.ToGuid ());
document.LanguageGuid,
document.LanguageVendorGuid,
document.TypeGuid);
documents [document.Url] = doc_writer;
return doc_writer;