Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -362,6 +362,7 @@ namespace Mono.CompilerServices.SymbolWriter
compile_unit_hash = new Dictionary<int, CompileUnitEntry> ();
}
#if !NET_CORE
public static MonoSymbolFile ReadSymbolFile (Assembly assembly)
{
string filename = assembly.Location;
@@ -372,6 +373,7 @@ namespace Mono.CompilerServices.SymbolWriter
return ReadSymbolFile (name, assembly_guid);
}
#endif
public static MonoSymbolFile ReadSymbolFile (string mdbFilename)
{
@@ -628,7 +630,11 @@ namespace Mono.CompilerServices.SymbolWriter
{
if (disposing) {
if (reader != null) {
#if NET_CORE
reader.Dispose ();
#else
reader.Close ();
#endif
reader = null;
}
}

View File

@@ -110,9 +110,11 @@ namespace Mono.CompilerServices.SymbolWriter
internal OffsetTable ()
{
#if !NET_CORE
int platform = (int) Environment.OSVersion.Platform;
if ((platform != 4) && (platform != 128))
FileFlags |= Flags.WindowsFileNames;
#endif
}
internal OffsetTable (BinaryReader reader, int major_version, int minor_version)

View File

@@ -27,6 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NET_CORE
using System;
using System.Reflection;
@@ -347,3 +348,5 @@ namespace Mono.CompilerServices.SymbolWriter
public ArrayList UsingClauses = new ArrayList ();
}
}
#endif