diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2015-07-01 11:53:11 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2015-07-01 11:53:11 +0300 |
| commit | 12f92a1d65d2a7b687f65c5a6636cd0d2d23d198 (patch) | |
| tree | c54fa17a4b2284ec6cfe4336dbd8140f7f6c03e9 | |
| parent | 62b712c6d1a29ce5e9efeece080c6f4273120748 (diff) | |
[Debugger] Fixed build(track debugger-libs API changes)
-Made it buildable on Windows without .Net 2.0/3.5(CorApi project is now .Net 4.5)
-Ignored implict casting on CorDebug
| -rw-r--r-- | CorApi/CorApi.csproj | 2 | ||||
| -rw-r--r-- | CorApi2/CorApi2.csproj | 1 | ||||
| -rw-r--r-- | MonoDevelop.Debugger.Win32/CorDebuggerBacktrace.cs | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CorApi/CorApi.csproj b/CorApi/CorApi.csproj index 0d99603..e3f7087 100644 --- a/CorApi/CorApi.csproj +++ b/CorApi/CorApi.csproj @@ -23,7 +23,7 @@ <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> - <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/CorApi2/CorApi2.csproj b/CorApi2/CorApi2.csproj index 0b234e8..8193510 100644 --- a/CorApi2/CorApi2.csproj +++ b/CorApi2/CorApi2.csproj @@ -23,6 +23,7 @@ <OldToolsVersion>3.5</OldToolsVersion> <UpgradeBackupLocation> </UpgradeBackupLocation> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/MonoDevelop.Debugger.Win32/CorDebuggerBacktrace.cs b/MonoDevelop.Debugger.Win32/CorDebuggerBacktrace.cs index d8ff9db..01230ac 100644 --- a/MonoDevelop.Debugger.Win32/CorDebuggerBacktrace.cs +++ b/MonoDevelop.Debugger.Win32/CorDebuggerBacktrace.cs @@ -182,7 +182,9 @@ namespace MonoDevelop.Debugger.Win32 string addressSpace = "";
string file = "";
int line = 0;
+ int endLine = 0;
int column = 0;
+ int endColumn = 0;
string method = "";
string lang = "";
string module = "";
@@ -204,6 +206,8 @@ namespace MonoDevelop.Debugger.Win32 if (sp != null) {
line = sp.StartLine;
column = sp.StartColumn;
+ endLine = sp.EndLine;
+ endColumn = sp.EndColumn;
file = sp.Document.URL;
address = (uint)sp.Offset;
}
@@ -251,7 +255,7 @@ namespace MonoDevelop.Debugger.Win32 if (method == null)
method = "<Unknown>";
- var loc = new SourceLocation (method, file, line, column);
+ var loc = new SourceLocation (method, file, line, column, endLine, endColumn);
return new StackFrame ((long)address, addressSpace, loc, lang, external, hasDebugInfo, hidden, null, null);
}
|