diff options
| author | Vsevolod Kukol <sevoku@microsoft.com> | 2019-08-27 18:13:16 +0300 |
|---|---|---|
| committer | Vsevolod Kukol <sevoku@microsoft.com> | 2019-08-27 18:13:16 +0300 |
| commit | 38b3d24852ac653d865a9d252feb08b2a125ed6c (patch) | |
| tree | 00d38c8b58e1ea3f19387ecd7e7a8e5aba13b5c1 | |
| parent | 7da3e8d5e4b3bf8f0d4cf83f92d60c82094502b2 (diff) | |
| parent | 94d90d630b6c7876d1d5298730d14ec97bbde3f9 (diff) | |
Merge remote-tracking branch 'origin/release-8.2' into release-8.2-xcode11
| -rw-r--r-- | main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs | 12 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs | 2 | ||||
| -rw-r--r-- | version-checks | 2 | ||||
| -rw-r--r-- | version.config | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs index 9e19487fc4..0a0b42e644 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs @@ -1495,13 +1495,21 @@ namespace MonoDevelop.Debugger { var doc = IdeApp.Workbench.GetDocument (document.FilePath); IBreakpointSpanResolver resolver = null; + ITextBuffer buffer; - if (doc != null) + if (doc != null) { resolver = doc.GetContent<IBreakpointSpanResolver> (); + buffer = doc.TextBuffer; + } else { + buffer = document.TextBuffer; + } + + if (buffer == null) + return Task.FromResult (default (Span)); resolver = resolver ?? new DefaultBreakpointSpanResolver (); - return resolver.GetBreakpointSpanAsync (document.TextBuffer, position, cancellationToken); + return resolver.GetBreakpointSpanAsync (buffer, position, cancellationToken); } } diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs index 8036e4da1b..7997a72146 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs @@ -53,7 +53,7 @@ namespace MonoDevelop.Projects TargetFramework defaultTargetFramework; - string defaultPlatformTarget = "x86"; + string defaultPlatformTarget = "anycpu"; static readonly TargetFrameworkMoniker DefaultTargetFrameworkId = TargetFrameworkMoniker.NET_4_7; public const string BuildTarget = "Build"; diff --git a/version-checks b/version-checks index ff6055f0d8..d8fe322594 100644 --- a/version-checks +++ b/version-checks @@ -17,7 +17,7 @@ DEP[0]=md-addins DEP_NAME[0]=MDADDINS DEP_PATH[0]=${top_srcdir}/../md-addins DEP_MODULE[0]=git@github.com:xamarin/md-addins.git -DEP_NEEDED_VERSION[0]=12c306582cf9fe4ef451e9b27422c416d11c6491 +DEP_NEEDED_VERSION[0]=75da92f750cf45413c04d71bd4691632974eb090 DEP_BRANCH_AND_REMOTE[0]="release-8.2-xcode11 origin/release-8.2-xcode11" # heap-shot diff --git a/version.config b/version.config index eed9359af7..e0e235ca0f 100644 --- a/version.config +++ b/version.config @@ -1,5 +1,5 @@ -Version=8.2.4 -Label=8.2.4 +Version=8.2.5 +Label=8.2.5 CompatVersion=8.0 IsPreview=false IsMajorPreview=false |