Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -62,7 +62,7 @@ using System.Runtime.CompilerServices;
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
// documentation for more information on this.
//
#if !(TARGET_JVM || TARGET_DOTNET)
#if !(TARGET_DOTNET)
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile ("../winfx.pub")]
#endif

View File

@ -7,7 +7,6 @@ using System.Xml.Serialization;
using System.Xml.Xsl;
using Microsoft.Win32;
#if !TARGET_JVM
namespace HtmlAgilityPack
{
/// <summary>
@ -821,4 +820,3 @@ namespace HtmlAgilityPack
}
}
}
#endif

View File

@ -23,58 +23,6 @@ namespace HtmlAgilityPack
File.Copy(source, target, true);
}
}
#if TARGET_JVM1
internal struct HtmlLibrary
{
[Conditional("DEBUG")]
internal static void GetVersion(out string version)
{
System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(1, true);
version = sf.GetMethod().DeclaringType.Assembly.GetName().Version.ToString();
}
[Conditional("DEBUG")]
[Conditional("TRACE")]
internal static void Trace(object Value)
{
// category is the method
string name = null;
GetCurrentMethodName(2, out name);
System.Diagnostics.Trace.WriteLine(Value, name);
}
[Conditional("DEBUG")]
[Conditional("TRACE")]
internal static void TraceStackFrame(int steps)
{
string name = null;
GetCurrentMethodName(2, out name);
string trace = "";
for(int i=1;i<steps;i++)
{
System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(i, true);
trace += sf.ToString();
}
System.Diagnostics.Trace.WriteLine(trace, name);
System.Diagnostics.Trace.WriteLine("");
}
[Conditional("DEBUG")]
internal static void GetCurrentMethodName(out string name)
{
name = null;
GetCurrentMethodName(2, out name);
}
[Conditional("DEBUG")]
internal static void GetCurrentMethodName(int skipframe, out string name)
{
StackFrame sf = new StackFrame(skipframe, true);
name = sf.GetMethod().DeclaringType.Name + "." + sf.GetMethod().Name;
}
}
#endif
internal class HtmlCmdLine
{