Skip to content

Instantly share code, notes, and snippets.

View mhutch's full-sized avatar

Mikayla Hutchinson mhutch

View GitHub Profile
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 @@
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
-
#!/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
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
public static class TestMain
{
static void Main(string[] args)
{
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"
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"
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
--- 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
commit ba3b54264bb1ef30593235a31c17ee75485d75da
Author: Harsimran Singh Bath <harsimranbath@gmail.com>
Date: Sun Jul 27 17:56:23 2014 -0700
[JavaScript] Added reference to SOurce Editor. Updated AddinInfo.cs file. Added conditional context menu option for "Go to Declaration".
commit 50ef01270dd71dc0876c98e22f4d4f4728126a73
Author: Harsimran Singh Bath <harsimranbath@gmail.com>
Date: Sun Jul 27 17:38:07 2014 -0700
@mhutch
mhutch / MSBuild targets
Created September 26, 2011 11:58
PLP Info
/c/Program Files (x86)/MSBuild/Microsoft/Portable/
/c/Program Files (x86)/MSBuild/Microsoft/Portable/v4.0
/c/Program Files (x86)/MSBuild/Microsoft/Portable/v4.0/Microsoft.Portable.Common.targets
/c/Program Files (x86)/MSBuild/Microsoft/Portable/v4.0/Microsoft.Portable.CSharp.targets
/c/Program Files (x86)/MSBuild/Microsoft/Portable/v4.0/Microsoft.Portable.VisualBasic.targets