View | Details | Raw Unified | Return to bug 5225
Collapse All | Expand All

(-)a/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile.am (-1 / +2 lines)
Lines 5-11 SIGNING_KEY=$(top_srcdir)/src/core/Mono.Debugging/mono.debugging.snk Link Here
5
5
6
DEPS =  \
6
DEPS =  \
7
	$(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll \
7
	$(top_builddir)/build/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll \
8
	$(top_builddir)/build/bin/Mono.Debugging.dll
8
	$(top_builddir)/build/bin/Mono.Debugging.dll \
9
	$(top_builddir)/build/bin/MonoDevelop.Core.dll
9
10
10
REFS =  \
11
REFS =  \
11
	-r:../../../../build/bin/Mono.Cecil.dll \
12
	-r:../../../../build/bin/Mono.Cecil.dll \
(-)a/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugging.Soft.csproj (+4 lines)
Lines 39-53 Link Here
39
     <Name>Mono.Cecil.Mdb</Name>
39
     <Name>Mono.Cecil.Mdb</Name>
40
     <Private>False</Private>
40
     <Private>False</Private>
41
    </ProjectReference>
41
    </ProjectReference>
42
    <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
43
      <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
44
      <Name>MonoDevelop.Core</Name>
45
     </ProjectReference>
42
  </ItemGroup>
46
  </ItemGroup>
43
  <ItemGroup>
47
  <ItemGroup>
(-)a/main/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/SoftDebuggerSession.cs (-2 / +8 lines)
Lines 41-46 using System.IO; Link Here
41
using System.Reflection;
41
using System.Reflection;
42
using System.Text;
42
using System.Text;
43
using System.Net;
43
using System.Net;
44
using MonoDevelop.Core;
44
45
45
namespace Mono.Debugging.Soft
46
namespace Mono.Debugging.Soft
46
{
47
{
Lines 1672-1683 namespace Mono.Debugging.Soft Link Here
1672
1676
1673
			// Now resolve normal Breakpoints
1677
			// Now resolve normal Breakpoints
1674
			foreach (string s in type_to_source [type]) {
1678
			foreach (string s in type_to_source [type]) {
1679
				var sourceFile = FileService.ResolveFullPath (new FilePath (s)).FullPath;
1680
1675
				foreach (var bi in pending_bes.Where (b => b.BreakEvent is Breakpoint)) {
1681
				foreach (var bi in pending_bes.Where (b => b.BreakEvent is Breakpoint)) {
1676
					var bp = (Breakpoint) bi.BreakEvent;
1682
					var bp = (Breakpoint) bi.BreakEvent;
1677
					if (PathComparer.Compare (PathToFileName (bp.FileName), s) == 0) {
1683
1684
					var bpFile = FileService.ResolveFullPath (new FilePath (PathToFileName (bp.FileName))).FullPath;
1685
1686
					if (PathComparer.Compare (bpFile, sourceFile) == 0) {
1678
						bool insideLoadedRange;
1687
						bool insideLoadedRange;
1679
						bool genericMethod;
1688
						bool genericMethod;
1680
						
1689
1681
						loc = GetLocFromType (type, s, bp.Line, out genericMethod, out insideLoadedRange);
1690
						loc = GetLocFromType (type, s, bp.Line, out genericMethod, out insideLoadedRange);
1682
						if (loc != null) {
1691
						if (loc != null) {
1683
							OnDebuggerOutput (false, string.Format ("Resolved pending breakpoint at '{0}:{1}' to {2} [0x{3:x5}].\n",
1692
							OnDebuggerOutput (false, string.Format ("Resolved pending breakpoint at '{0}:{1}' to {2} [0x{3:x5}].\n",
(-)a/main/tests/UnitTests/Makefile.am (+1 lines)
Lines 36-41 REFS = \ Link Here
36
	-r:../../src/addins/NUnit/lib/nunit.framework.dll \
36
	-r:../../src/addins/NUnit/lib/nunit.framework.dll \
37
	-r:../../src/addins/NUnit/lib/nunit.util.dll \
37
	-r:../../src/addins/NUnit/lib/nunit.util.dll \
38
	-r:Mono.Cairo \
38
	-r:Mono.Cairo \
39
	-r:Mono.Posix \
39
	-r:System \
40
	-r:System \
40
	-r:System.Core \
41
	-r:System.Core \
41
	-r:System.Xml
42
	-r:System.Xml
(-)a/main/tests/UnitTests/MonoDevelop.Projects/FileServiceTests.cs (+23 lines)
Lines 96-101 namespace MonoDevelop.Projects Link Here
96
			Assert.AreEqual (@"aa/bb", FileService.AbsoluteToRelativePath (@"/aa", @"aa/bb"));
96
			Assert.AreEqual (@"aa/bb", FileService.AbsoluteToRelativePath (@"/aa", @"aa/bb"));
97
			Assert.AreEqual (@"aa", FileService.AbsoluteToRelativePath (@"/aa", @"aa"));
97
			Assert.AreEqual (@"aa", FileService.AbsoluteToRelativePath (@"/aa", @"aa"));
98
		}
98
		}
99
100
		[Test]
101
		public void CompareFullPathsWithSymLinks ()
102
		{
103
			if (Platform.IsWindows)
104
				Assert.Ignore ("sym links not tested on windows");
105
106
			string tempDir = Util.CreateTmpDir ("FilePathComparisonTests" + DateTime.Now.Second);
107
108
			try {
109
				var someFileName = "someFile.txt";
110
				var thePath = System.IO.Path.Combine (tempDir, someFileName);
111
				System.IO.File.WriteAllText (thePath, "some content");
112
				var unixFile = new Mono.Unix.UnixFileInfo (thePath);
113
				var symlink = thePath.Replace (someFileName, "symlink.txt");
114
				unixFile.CreateSymbolicLink (symlink);
115
116
				Assert.That (FileService.ResolveFullPath (new FilePath (symlink)),
117
				             Is.EqualTo (FileService.ResolveFullPath (thePath)));
118
			} finally {
119
				System.IO.Directory.Delete (tempDir, true);
120
			}
121
		}
99
	}
122
	}
100
}
123
}
101
124

Return to bug 5225