diff options
| -rw-r--r-- | packaging/MacSDK/msbuild.py | 7 | ||||
| -rwxr-xr-x | scripts/ci/run-test-mac-sdk.sh | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packaging/MacSDK/msbuild.py b/packaging/MacSDK/msbuild.py index 4e7ed538c2f..145198eb62a 100644 --- a/packaging/MacSDK/msbuild.py +++ b/packaging/MacSDK/msbuild.py @@ -3,12 +3,13 @@ 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 = '93531d65ebbbe33b59e741b31a0bd994e612f9f2') + revision = '8357ae6cd8afe02149ea8fd1e07f0c394f8194df') def build (self): - self.sh ('./cibuild.sh --scope Compile --target Mono --host Mono --config Release') + self.sh ('./build.sh -host mono -configuration Release -skipTests') def install (self): - self.sh ('./install-mono-prefix.sh %s' % self.staged_prefix) + # use the bootstrap msbuild as the system might not have one available! + self.sh ('./artifacts/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix=%s /p:Configuration=Release-MONO /p:IgnoreDiffFailure=true' % self.staged_prefix) MSBuild () diff --git a/scripts/ci/run-test-mac-sdk.sh b/scripts/ci/run-test-mac-sdk.sh index 22d73a312cd..bc74c8d46bc 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 ./cibuild.sh --scope Test --host Mono --target Mono +${TESTCMD} --label="msbuild-tests" --timeout=180m ./build.sh -host mono -configuration Release # Bundled LLVM cd ${MONO_REPO_ROOT}/external/bockbuild/builds/mono |