diff --git a/Changelog.txt b/Changelog.txt index 9e021da..718bae4 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -6,6 +6,10 @@ Git: https://github.com/Unity-Technologies/vscode-unity-debug Changes ------- +2.7.0 +===== + - Update debugger libs. This patch includes sending the absolute file path to the debugger agent on native. + 2.6.7 ===== - Fix launch settings configuration through resolve. diff --git a/External/ICSharpCode.NRefactory.CSharp.dll b/External/ICSharpCode.NRefactory.CSharp.dll index 5ff6a28..1379c3c 100644 Binary files a/External/ICSharpCode.NRefactory.CSharp.dll and b/External/ICSharpCode.NRefactory.CSharp.dll differ diff --git a/External/ICSharpCode.NRefactory.CSharp.pdb b/External/ICSharpCode.NRefactory.CSharp.pdb index 6e84111..0a8c37e 100644 Binary files a/External/ICSharpCode.NRefactory.CSharp.pdb and b/External/ICSharpCode.NRefactory.CSharp.pdb differ diff --git a/External/ICSharpCode.NRefactory.dll b/External/ICSharpCode.NRefactory.dll index 86f0df8..bf39fb9 100755 Binary files a/External/ICSharpCode.NRefactory.dll and b/External/ICSharpCode.NRefactory.dll differ diff --git a/External/ICSharpCode.NRefactory.pdb b/External/ICSharpCode.NRefactory.pdb index db69f01..095946f 100644 Binary files a/External/ICSharpCode.NRefactory.pdb and b/External/ICSharpCode.NRefactory.pdb differ diff --git a/External/Mono.Cecil.Mdb.dll b/External/Mono.Cecil.Mdb.dll index 04db208..424219b 100644 Binary files a/External/Mono.Cecil.Mdb.dll and b/External/Mono.Cecil.Mdb.dll differ diff --git a/External/Mono.Cecil.Mdb.pdb b/External/Mono.Cecil.Mdb.pdb index 4d24077..ed33613 100644 Binary files a/External/Mono.Cecil.Mdb.pdb and b/External/Mono.Cecil.Mdb.pdb differ diff --git a/External/Mono.Cecil.dll b/External/Mono.Cecil.dll index d5ad066..29a6bae 100644 Binary files a/External/Mono.Cecil.dll and b/External/Mono.Cecil.dll differ diff --git a/External/Mono.Cecil.pdb b/External/Mono.Cecil.pdb index d9e3993..cf27d56 100644 Binary files a/External/Mono.Cecil.pdb and b/External/Mono.Cecil.pdb differ diff --git a/External/Mono.Debugger.Soft.dll b/External/Mono.Debugger.Soft.dll index 85b4b47..53a8bf4 100644 Binary files a/External/Mono.Debugger.Soft.dll and b/External/Mono.Debugger.Soft.dll differ diff --git a/External/Mono.Debugger.Soft.pdb b/External/Mono.Debugger.Soft.pdb index d2a1906..62def63 100644 Binary files a/External/Mono.Debugger.Soft.pdb and b/External/Mono.Debugger.Soft.pdb differ diff --git a/External/Mono.Debugging.Soft.dll b/External/Mono.Debugging.Soft.dll index 0a79fb9..57a5223 100755 Binary files a/External/Mono.Debugging.Soft.dll and b/External/Mono.Debugging.Soft.dll differ diff --git a/External/Mono.Debugging.Soft.pdb b/External/Mono.Debugging.Soft.pdb index fb5b118..9d50814 100644 Binary files a/External/Mono.Debugging.Soft.pdb and b/External/Mono.Debugging.Soft.pdb differ diff --git a/External/Mono.Debugging.dll b/External/Mono.Debugging.dll index 38370a7..364ab86 100755 Binary files a/External/Mono.Debugging.dll and b/External/Mono.Debugging.dll differ diff --git a/External/Mono.Debugging.pdb b/External/Mono.Debugging.pdb index ada3f80..54ff6aa 100644 Binary files a/External/Mono.Debugging.pdb and b/External/Mono.Debugging.pdb differ diff --git a/External/Mono.Posix.dll b/External/Mono.Posix.dll index 83fff46..9e281ad 100644 Binary files a/External/Mono.Posix.dll and b/External/Mono.Posix.dll differ diff --git a/UnityDebug/Log.cs b/UnityDebug/Log.cs index 8c5e698..421620a 100644 --- a/UnityDebug/Log.cs +++ b/UnityDebug/Log.cs @@ -1,6 +1,8 @@ using System; using System.IO; using System.Reflection; +using System.Security.AccessControl; +using System.Text; namespace UnityDebug { @@ -28,11 +30,18 @@ public static void DebugWrite(string message) Write (message); } + public static void LogError(string message, Exception ex) + { + Write(message + (ex != null ? Environment.NewLine + ex : string.Empty)); + } + public static void Write(string message) { var formattedMessage = FormatMessage (message); - lock (logPath) { - File.AppendAllText (logPath, formattedMessage); + var buf = Encoding.UTF8.GetBytes(formattedMessage); + using (var stream = new FileStream(logPath, FileMode.Append, FileAccess.Write, FileShare.ReadWrite)) + { + stream.Write(buf, 0, buf.Length); } } } diff --git a/UnityDebug/Program.cs b/UnityDebug/Program.cs index c8e52c9..f7e5310 100644 --- a/UnityDebug/Program.cs +++ b/UnityDebug/Program.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; @@ -38,7 +39,7 @@ public void LogAndShowException(string message, Exception ex) public void LogError(string message, Exception ex) { - Log.Write(message + (ex != null ? Environment.NewLine + ex : string.Empty)); + Log.LogError(message, ex); } public void LogMessage(string messageFormat, params object[] args) @@ -48,7 +49,7 @@ public void LogMessage(string messageFormat, params object[] args) public string GetNewDebuggerLogFilename() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().Location) + "-log.txt"); + return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().Location) + "-another-log.txt"); } } diff --git a/UnityDebug/UnityDebugSession.cs b/UnityDebug/UnityDebugSession.cs index 0012849..027ad87 100644 --- a/UnityDebug/UnityDebugSession.cs +++ b/UnityDebug/UnityDebugSession.cs @@ -152,7 +152,9 @@ public UnityDebugSession() m_ResumeEvent.Set(); }; - m_Session.TargetStarted += (sender, e) => { }; + m_Session.TargetStarted += (sender, e) => + { + }; m_Session.TargetReady += (sender, e) => { diff --git a/debugger-libs b/debugger-libs index 0506718..0db8001 160000 --- a/debugger-libs +++ b/debugger-libs @@ -1 +1 @@ -Subproject commit 0506718a0ce20d31bdd43d0255114345fb7186ff +Subproject commit 0db800135308f7b04eb05296e97453e965d1f72c diff --git a/package.json b/package.json index 64e768f..fb5dca0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "unity-debug", "displayName": "Debugger for Unity", - "version": "2.6.7", + "version": "2.7.0", "publisher": "Unity", "description": "Unity debugger extension", "license": "MIT", @@ -11,14 +11,16 @@ "extensionDependencies": [ "ms-vscode.csharp" ], - "dependencies": { - "@types/node": "^10.5.1", - "make": "^0.8.1", - "npm": "^6.1.0", + "devDependencies": { "vscode": "^1.1.21", "vscode-debugprotocol": "^1.32.0", "vscode-nls": "^4.0.0" }, + "dependencies": { + "@types/node": "^10.5.1", + "make": "^0.8.1", + "npm": "^6.1.0" + }, "categories": [ "Debuggers" ],