[acceptance-tests] Fixes for Roslyn integration

We now use our own archive with the few additional pieces that MS added to their copy of
Mono used by Roslyn CI instead of downloading their archive.

Also bump coreclr to get a fix for the GC test that would fail on Jenkins in.

diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am
index 4ec90887b305171e3762d883a36375754bb6b6ae..2129dee140ebc39301e4c4e6e028ba84c8ab9cc4 100644 (file)
--- a/acceptance-tests/Makefile.am
+++ b/acceptance-tests/Makefile.am
@@ -26,40 +26,23 @@ check-ms-test-suite:
                echo "*** [ms-test-suite] Getting the repository failed, you probably don't have access to this Xamarin-internal resource. Skipping."; \
        fi
 
-# Roslyn require some aditional files in the mono installation to build.
-# Those files can be copied from roslyn mono toolset archive that is downloaded by cibuild.sh
 check-roslyn:
        @$(MAKE) validate-roslyn RESET_VERSIONS=1
        @if [ -z $$PREFIX ]; then echo "You need to set PREFIX to the prefix of the Mono installation that should be used for testing Roslyn." && exit 1; fi
        export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \
-       MONO_TOOLSET_NAME=mono.mac.3; \
-       MONO_NUGET_DIR=$$PREFIX/lib/mono/xbuild/Microsoft/NuGet; \
        MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \
-       pushd /tmp; \
-       if [ ! -d "$$MONO_NUGET_DIR" ]; then \
-               echo "Mono installation is missing $$MONO_NUGET_DIR"; \
-               ROSLYN_MONO_TOOLSET_REQUIRED=yes; \
+       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 \
+               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; \
+               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; \
-       if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR" ]; then \
-               echo "Mono installation is missing $$MONO_DOTNET_PORTABLE_DIR"; \
-               ROSLYN_MONO_TOOLSET_REQUIRED=yes; \
-       fi; \
-       if [[ $$ROSLYN_MONO_TOOLSET_REQUIRED ]]; then \
-               if [ ! -d "$$MONO_TOOLSET_NAME" ]; then \
-                       echo "Downloading roslyn mono tool set"; \
-                       curl -O https://dotnetci.blob.core.windows.net/roslyn/$$MONO_TOOLSET_NAME.tar.bz2; \
-                       tar -jxf $$MONO_TOOLSET_NAME.tar.bz2; \
-               fi; \
-       fi; \
-       if [ ! -d "$$MONO_NUGET_DIR" ]; then \
-               mkdir $$MONO_NUGET_DIR; \
-               cp -r $$MONO_TOOLSET_NAME/lib/mono/xbuild/Microsoft/NuGet/* $$MONO_NUGET_DIR; \
-       fi; \
-       if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR" ]; then \
-               mkdir $$MONO_DOTNET_PORTABLE_DIR; \
-               cp -r $$MONO_TOOLSET_NAME/lib/mono/xbuild-frameworks/.NETPortable/* $$MONO_DOTNET_PORTABLE_DIR; \
-       fi; \
-       popd; \
        cd $(ROSLYN_PATH) && ./cibuild.sh --mono-path $$PREFIX/bin
 
 coreclr-validate:

diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json
index d07bbb83a98a70c61a145aab43fa327eb93ab5fe..baabf314363cc1ed7637eebadc8a02553f854ef2 100644 (file)
--- a/acceptance-tests/SUBMODULES.json
+++ b/acceptance-tests/SUBMODULES.json
@@ -2,7 +2,7 @@
   {
     "name": "roslyn", 
     "url": "git://github.com/dotnet/roslyn.git", 
-    "rev": "2e68ae5e6ec51762296c681aadf57a6f33f2f34f", 
+    "rev": "322bd5b2bbf07df6a67de35cbcb2365484412f70", 
     "remote-branch": "origin/master", 
     "branch": "master", 
     "directory": "roslyn"
@@ -10,7 +10,7 @@
   {
     "name": "coreclr", 
     "url": "git://github.com/mono/coreclr.git", 
-    "rev": "a8cbbdddfe9923a7f99edf8870842ad373e66b5b", 
+    "rev": "ba86240da16a86505743ef592dc448edb3e5109c", 
     "remote-branch": "origin/mono", 
     "branch": "mono", 
     "directory": "coreclr"