[acceptance-tests] Work around an issue that caused Roslyn tests to stop working
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Thu, 3 Mar 2016 21:08:07 +0000 (22:08 +0100)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Thu, 3 Mar 2016 21:11:43 +0000 (22:11 +0100)
xplat MSBuild uses a wrong, to be removed regex that doesn't catch our recent profile names. Temporarily work around it for now.

acceptance-tests/Makefile.am

index 68b9ff90e7dc4c8e38686a067a75eb9365f9504b..6d7395a5c564914ec4d4db60a9f0c40a6993d0eb 100644 (file)
@@ -29,6 +29,7 @@ check-ms-test-suite:
 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
+       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/; \
@@ -46,7 +47,8 @@ check-roslyn:
        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
+       ./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;
 
 coreclr-validate:
        $(MAKE) validate-coreclr RESET_VERSIONS=1