diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/MacSDK/msbuild.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packaging/MacSDK/msbuild.py b/packaging/MacSDK/msbuild.py index 0560ed4a59c..e5b0103f5bc 100644 --- a/packaging/MacSDK/msbuild.py +++ b/packaging/MacSDK/msbuild.py @@ -3,14 +3,16 @@ 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 = '2edf32d1a5b7a9706ab44555acb11b9367738312') + revision = 'f6dc6f7734870ba8f226e1413e29c7bca589e95c') def build (self): - self.sh ('./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests') - self.sh ('find artifacts -wholename \'*/log/*\' -type f -exec zip msbuild-bin-logs.zip {} \+') + try: + self.sh ('./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests') + finally: + self.sh ('find artifacts stage1 -wholename \'*/log/*\' -type f -exec zip msbuild-bin-logs.zip {} \+') def install (self): # 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) + self.sh ('./stage1/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix=%s /p:Configuration=Release-MONO /p:IgnoreDiffFailure=true' % self.staged_prefix) MSBuild () |