[mono/monodevelop] [2 commits] fcead578: Fixed a bug where XSP would fail to launch when using .NET 4 configuration on Windows. Path generator would generate the correct path, and then switch it out for the 4.5 library path instead. XSP isn't packaged into that directory on Windows, so MonoDevelop would throw an exception when it couldn't find it
"Alan McGovern (
[email protected])" <
[email protected]>
Sun, 17 Nov 2013 18:03:13 +0000
| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<00000142673b0f0d-dc8b74fa-e36f-49b3-9a78-ea39f6283c54-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/5cf75514f611...9b6d05e89c90
Commit: fcead5789e96254cabc47c8ec17cb1d7ac635698
Author: Stephen Gream <[email protected]> (ThreeToes)
Date: 2013-11-16 15:03:31 GMT
URL: https://github.com/mono/monodevelop/commit/fcead5789e96254cabc47c8ec17cb1d7ac635698
Fixed a bug where XSP would fail to launch when using .NET 4 configuration on Windows. Path generator would generate the correct path, and then switch it out for the 4.5 library path instead. XSP isn't packaged into that directory on Windows, so MonoDevelop would throw an exception when it couldn't find it
Changed paths:
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
===================================================================
@@ -57,7 +57,7 @@ FilePath GetFxDir (MonoTargetRuntime runtime, ClrVersion version)
return prefix.Combine ("lib", "mono", "2.0");
case ClrVersion.Net_4_0:
var net45Path = prefix.Combine ("lib", "mono", "4.5");
- if (Directory.Exists (net45Path)) return net45Path;
+ if (Directory.Exists (net45Path) && !MonoDevelop.Core.Platform.IsWindows) return net45Path;
return prefix.Combine ("lib", "mono", "4.0");
case ClrVersion.Net_4_5:
return prefix.Combine ("lib", "mono", "4.5");
Commit: 9b6d05e89c9066496e1cfbcaad7c13cdf8a5d61c
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-11-17 18:01:08 GMT
URL: https://github.com/mono/monodevelop/commit/9b6d05e89c9066496e1cfbcaad7c13cdf8a5d61c
Merge pull request #437 from ThreeToes/master
Fixed a bug where XSP would fail to launch when using .NET 4 configuration
Changed paths:
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
===================================================================
@@ -57,7 +57,7 @@ FilePath GetFxDir (MonoTargetRuntime runtime, ClrVersion version)
return prefix.Combine ("lib", "mono", "2.0");
case ClrVersion.Net_4_0:
var net45Path = prefix.Combine ("lib", "mono", "4.5");
- if (Directory.Exists (net45Path)) return net45Path;
+ if (Directory.Exists (net45Path) && !MonoDevelop.Core.Platform.IsWindows) return net45Path;
return prefix.Combine ("lib", "mono", "4.0");
case ClrVersion.Net_4_5:
return prefix.Combine ("lib", "mono", "4.5");
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches