This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a 2014-06-27 14:01:34.000000000 -0400 | |
+++ b 2014-06-27 14:02:03.000000000 -0400 | |
@@ -3,11 +3,9 @@ | |
Copyright (C) 2005-2013 Various Mono authors | |
Loading default tasks for ToolsVersion: 2.0 from /Users/michael/Mono/bockbuild/profiles/xs-mac-dev-32/build-root/_install/lib/mono/2.0/Microsoft.Common.tasks | |
-Build started 6/27/2014 2:01:34 PM. | |
+Build started 6/27/2014 2:01:26 PM. | |
__________________________________________________ | |
Loading default tasks for ToolsVersion: 4.0 from /Users/michael/Mono/bockbuild/profiles/xs-mac-dev-32/build-root/_install/lib/mono/4.5/Microsoft.Common.tasks |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure b/configure | |
index 8db98f5..669b70b 100755 | |
--- a/configure | |
+++ b/configure | |
@@ -271,11 +271,14 @@ if [ x$select == xyes -o ! -a profiles/$profile ]; then | |
fi | |
if test `uname` = "Darwin"; then | |
+ # if building on bots or in default environment, fix up paths to use system Mono | |
if test "x$BUILD_REVISION" != "x" -o "x$DYLD_FALLBACK_LIBRARY_PATH" = "x"; then |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure b/configure | |
index 8db98f5..8d6144d 100755 | |
--- a/configure | |
+++ b/configure | |
@@ -272,10 +272,11 @@ fi | |
if test `uname` = "Darwin"; then | |
if test "x$BUILD_REVISION" != "x" -o "x$DYLD_FALLBACK_LIBRARY_PATH" = "x"; then | |
- export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib:/Library/Developer/CommandLineTools/usr/lib" | |
+ export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure b/configure | |
index 8db98f5..8d6144d 100755 | |
--- a/configure | |
+++ b/configure | |
@@ -272,10 +272,11 @@ fi | |
if test `uname` = "Darwin"; then | |
if test "x$BUILD_REVISION" != "x" -o "x$DYLD_FALLBACK_LIBRARY_PATH" = "x"; then | |
- export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib:/Library/Developer/CommandLineTools/usr/lib" | |
+ export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
using System; | |
using System.Collections.Generic; | |
using System.Diagnostics; | |
using System.Linq; | |
using System.Text; | |
public static class TestMain | |
{ | |
static void Main(string[] args) | |
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
export MONO_PREFIX=/usr/local | |
export MONODEVELOP_PREFIX=/opt/monodevelop | |
# make sure we have the Mono and MD prefixes in our environment | |
# see http://mono-project.com/Parallel_Mono_Environments | |
export PATH=$MONODEVELOP_PREFIX/bin:$MONO_PREFIX/bin:$PATH | |
export LD_LIBRARY_PATH=$MONODEVELOP_PREFIX/lib:$MONO_PREFIX/lib:$LD_LIBRARY_PATH |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetAssemblyIdentity.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetAssemblyIdentity.cs | |
index 2921119..da30a93 100644 | |
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetAssemblyIdentity.cs | |
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetAssemblyIdentity.cs | |
@@ -25,11 +25,13 @@ | |
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | |
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |
-#if NET_2_0 | |
- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/main/external/Newtonsoft.Json b/main/external/Newtonsoft.Json | |
--- a/main/external/Newtonsoft.Json | |
+++ b/main/external/Newtonsoft.Json | |
@@ -1 +1 @@ | |
-Subproject commit b8ff206bd36247fe68e1ec4b862c47c27ef3f367 | |
+Subproject commit b8ff206bd36247fe68e1ec4b862c47c27ef3f367-dirty | |
diff --git a/main/external/cecil b/main/external/cecil | |
--- a/main/external/cecil | |
+++ b/main/external/cecil | |
@@ -1 +1 @@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Xwt.Gtk/Xwt.GtkBackend/PasswordEntryBackend.cs b/Xwt.Gtk/Xwt.GtkBackend/PasswordEntryBackend.cs | |
index 4809f7b..161eb3c 100644 | |
--- a/Xwt.Gtk/Xwt.GtkBackend/PasswordEntryBackend.cs | |
+++ b/Xwt.Gtk/Xwt.GtkBackend/PasswordEntryBackend.cs | |
@@ -33,9 +33,9 @@ namespace Xwt.GtkBackend | |
public override void EnableEvent (object eventId) | |
{ | |
base.EnableEvent (eventId); | |
- if (eventId is TextEntryEvent) { | |
- switch ((TextEntryEvent)eventId) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/main/external/nrefactory b/main/external/nrefactory | |
--- a/main/external/nrefactory | |
+++ b/main/external/nrefactory | |
@@ -1 +1 @@ | |
-Subproject commit a87d4cf3c543cde2257fb06e2f7ad15a8d50b375 | |
+Subproject commit a87d4cf3c543cde2257fb06e2f7ad15a8d50b375-dirty | |
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs | |
index e7ec264..b20b9b2 100644 | |
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs | |
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs |