diff options
| author | Ankit Jain <radical@gmail.com> | 2018-08-02 01:34:55 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-08-02 01:34:55 +0300 |
| commit | 07ac08973505eb71fbba6dcafd3a3266aeaf620f (patch) | |
| tree | 82051b63f60a5010ba3d990bf6676e0f87aa7bb6 | |
| parent | d31dbe843a556a5377a66793ee438c6f52695379 (diff) | |
Bump msbuild to track mono-2018-04 (#9834)
Pick up fix for https://github.com/xamarin/xamarin-android/issues/1845 .
| -rw-r--r-- | packaging/MacSDK/msbuild.py | 2 | ||||
| -rwxr-xr-x | scripts/ci/run-test-mac-sdk.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/MacSDK/msbuild.py b/packaging/MacSDK/msbuild.py index ae3d839b2fa..0a11d9eea12 100644 --- a/packaging/MacSDK/msbuild.py +++ b/packaging/MacSDK/msbuild.py @@ -3,7 +3,7 @@ import fileinput class MSBuild (GitHubPackage): def __init__ (self): GitHubPackage.__init__ (self, 'mono', 'msbuild', '15', # note: fix scripts/ci/run-test-mac-sdk.sh when bumping the version number - revision = '9202c914597cf40b2407d11d7356e97c4100617a') + revision = '8af44c5b9e727c096833a88fae05c3ddb76716d0') def build (self): self.sh ('./build.sh -hostType mono -configuration Release -skipTests') diff --git a/scripts/ci/run-test-mac-sdk.sh b/scripts/ci/run-test-mac-sdk.sh index f1ca737e8b7..2d6aa51ef4c 100755 --- a/scripts/ci/run-test-mac-sdk.sh +++ b/scripts/ci/run-test-mac-sdk.sh @@ -7,7 +7,7 @@ export PATH=${MONO_REPO_ROOT}/external/bockbuild/stage/bin:$PATH # Bundled MSBuild cd ${MONO_REPO_ROOT}/external/bockbuild/builds/msbuild-15/ -${TESTCMD} --label="msbuild-tests" --timeout=180m ./build.sh -host mono -configuration Release +${TESTCMD} --label="msbuild-tests" --timeout=180m ./build.sh -hostType mono -configuration Release zip ${MONO_REPO_ROOT}/msbuild-test-results.zip artifacts/2/Release-MONO/TestResults/* # Bundled LLVM |