diff options
| author | Ankit Jain <radical@gmail.com> | 2019-08-12 18:03:13 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-08-12 18:03:13 +0300 |
| commit | c028454befe4ab6f9bf59f90e4136fc197014216 (patch) | |
| tree | b54de284d29e26a79b83f6d4596410e0d6f79b71 /packaging | |
| parent | 69ebdd8b9384d2cdd9fd72458f14fe3a83ade1ef (diff) | |
[msbuild] Bump to track xplat-master and update roslyn (#16155)
Prompted by mono/msbuild#126:
This includes:
- merge mono-2019-06
- SDK update to track dotnet release/3.0.100-preview8
- Roslyn updated to 3.3.0-beta2-19381-14
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 () |