From e4936dee551fabef721caeb04a7ba19665f0f91a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 3 Mar 2016 22:08:07 +0100 Subject: [PATCH] [acceptance-tests] Work around an issue that caused Roslyn tests to stop working 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index 68b9ff90e7d..6d7395a5c56 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -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 -- 2.25.1