X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=acceptance-tests%2Froslyn.mk;h=a91c68d986b5a97720963c05258a82354cc7efa8;hb=HEAD;hp=e20b01e4979a0c05a239578a0d5bd6cb1af5fa32;hpb=b827d683c63a0470bb17b392d3640db64b54e67f;p=mono.git

diff --git a/acceptance-tests/roslyn.mk b/acceptance-tests/roslyn.mk
index e20b01e4979..a91c68d986b 100644
--- a/acceptance-tests/roslyn.mk
+++ b/acceptance-tests/roslyn.mk
@@ -4,20 +4,15 @@ check-roslyn:
 	sed -i -e 's/\\4.5-api"/\\4.5"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
 	export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \
 	MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \
-	MONO_NUGET_TARGETS_DIR=$$PREFIX/lib/mono/xbuild/Microsoft/NuGet/; \
-	MONO_PORTABLE_TARGETS_DIR=$$PREFIX/lib/mono/xbuild/Microsoft/Portable/v5.0; \
-	if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR/v5.0" ]; then \
+	if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR/v4.6" ]; then \
 		mkdir -p $$MONO_DOTNET_PORTABLE_DIR; \
-		mkdir -p $$MONO_NUGET_TARGETS_DIR; \
-		mkdir -p $$MONO_PORTABLE_TARGETS_DIR; \
-		curl -SL "http://storage.bos.internalx.com/bot-provisioning/RoslynBuildDependencies.zip" > /tmp/RoslynBuildDependencies.zip; \
+		curl -SL "http://download.mono-project.com/third-party/RoslynBuildDependencies.zip" > /tmp/RoslynBuildDependencies.zip; \
 		unzip -o /tmp/RoslynBuildDependencies.zip -d /tmp/RoslynBuildDependencies; \
 		cp -r /tmp/RoslynBuildDependencies/PortableReferenceAssemblies/* $$MONO_DOTNET_PORTABLE_DIR; \
-		cp /tmp/RoslynBuildDependencies/NuGetTargets/* $$MONO_NUGET_TARGETS_DIR; \
-		cp /tmp/RoslynBuildDependencies/PortableTargets/* $$MONO_PORTABLE_TARGETS_DIR; \
 	fi; \
 	cd $(ROSLYN_PATH); \
 	sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \
 	sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \
-	./cibuild.sh --mono-path $$PREFIX/bin; \
-	sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml;
+	./cibuild.sh --mono-path $$PREFIX/bin || EXIT_CODE=1; \
+	sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
+	exit $$EXIT_CODE