diff options
author | Alan McGovern <alan@xamarin.com> | 2015-09-15 11:26:07 +0300 |
---|---|---|
committer | Alan McGovern <alan@xamarin.com> | 2015-09-15 11:26:07 +0300 |
commit | c4bae8699d467abf96d4f287799ce8fce9def878 (patch) | |
tree | 137220a121b21a4a603c48487748768229fcd306 | |
parent | 0e1f15d51f78db46b106dda4f9c40a645a863506 (diff) | |
parent | 7036681a43d890b72715235370f4cea7417111f1 (diff) |
Merge remote-tracking branch 'origin/master' into roslyn
-rw-r--r-- | dependency_checker.rb | 6 | ||||
-rwxr-xr-x | version-checks | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dependency_checker.rb b/dependency_checker.rb index e56fa614e2..cfc10b45f0 100644 --- a/dependency_checker.rb +++ b/dependency_checker.rb @@ -2,11 +2,11 @@ require 'pp' XAMARIN_MAC_MIN_VERSION="2.3" XAMARIN_MAC_VERSION=lambda { product_version ("/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/bin/mmp") } -XAMARIN_MAC_URL="http://storage.bos.internalx.com/macios-mac-cycle6/1e/1e6896dd96bc9387725b4332175baace1bef8186/xamarin.mac-2.3.0.135.pkg" +XAMARIN_MAC_URL="http://www.xamarin.com" MONO_MIN_VERSION="4.2" MONO_VERSION=lambda { mono_version("/Library/Frameworks/Mono.framework/Versions/Current/bin/mono") } -MONO_URL="http://storage.bos.internalx.com/mono-mac-4.2.0-branch/27/2701b194139f851f54660bd66c97074b041427fd/MonoFramework-MDK-4.2.0.207.macos10.xamarin.x86.pkg" +MONO_URL="http://mono-project.com" class String def red; "\e[31m#{self}\e[0m" end @@ -54,4 +54,4 @@ def check_monodevelop_dependencies() end $stdout.sync = true -check_monodevelop_dependencies() if __FILE__==$0
\ No newline at end of file +check_monodevelop_dependencies() if __FILE__==$0 diff --git a/version-checks b/version-checks index ca3f8da7ba..e8401f4dd6 100755 --- a/version-checks +++ b/version-checks @@ -17,8 +17,8 @@ DEP[0]=md-addins DEP_NAME[0]=MDADDINS DEP_PATH[0]=${top_srcdir}/../md-addins DEP_MODULE[0]=git@github.com:xamarin/md-addins.git -DEP_NEEDED_VERSION[0]=23a9892b25555121900864ffaa045c3cbf59ea03 -DEP_BRANCH_AND_REMOTE[0]="roslyn origin/roslyn" +DEP_NEEDED_VERSION[0]=aa20978dac11e2f14567d1483cddb12c76668bc1 +DEP_BRANCH_AND_REMOTE[0]="master origin/master" # heap-shot DEP[1]=heap-shot |