[msbuild] Bump msbuild to fix test failures on wrench (#5660)

[mono.git] / packaging / MacSDK / msbuild.py

diff --git a/packaging/MacSDK/msbuild.py b/packaging/MacSDK/msbuild.py
index 3d123952f35168d771fbe222f1d111cc5efd1757..67db79c7fe63b3729025e8fe7e314002805a8ce8 100644 (file)
--- a/packaging/MacSDK/msbuild.py
+++ b/packaging/MacSDK/msbuild.py
@@ -1,57 +1,14 @@
 import fileinput
 
-
 class MSBuild (GitHubPackage):
+       def __init__ (self):
+               GitHubPackage.__init__ (self, 'mono', 'msbuild', '15.4',
+                       revision = '5bb588162eadfc68c6af8895397f4f65f8008b24')
 
-    def __init__(self):
-        GitHubPackage.__init__(self, 'mono', 'msbuild', '15.0',
-                               git_branch='xplat-master')
-
-    def build(self):
-        self.sh('./cibuild.sh --scope Compile --target Mono --host Mono')
-
-    def install(self):
-        # adjusted from 'install-mono-prefix.sh'
-
-        build_output = 'bin/Debug-MONO/OSX_Deployment'
-        new_location = os.path.join(
-            self.staged_prefix,
-            'lib/mono/msbuild/%s/bin' %
-            self.version)
-        bindir = os.path.join(self.staged_prefix, 'bin')
-
-        os.makedirs(new_location)
-        self.sh('cp -R %s/* %s' % (build_output, new_location))
-
-        os.makedirs(bindir)
-
-        self.sh('cp msbuild-mono-deploy.in %s/msbuild' % bindir)
-
-        xbuild_dir = os.path.join(self.staged_prefix, 'lib/mono/xbuild')
-        new_xbuild_tv_dir = os.path.join(xbuild_dir, self.version)
-        os.makedirs(new_xbuild_tv_dir)
-
-        self.sh('mv %s/Microsoft.Common.props %s' %
-                (new_location, new_xbuild_tv_dir))
-        self.sh('cp -R nuget-support/tv/ %s' % new_xbuild_tv_dir)
-        self.sh('cp -R nuget-support/tasks-targets/ %s/' % xbuild_dir)
-        for dep in glob.glob("%s/Microsoft/NuGet/*" % xbuild_dir):
-            self.sh('ln -s %s %s' % (dep, xbuild_dir))
-
-        for line in fileinput.input('%s/msbuild' % bindir, inplace=True):
-            line = line.replace('@bindir@', '%s/bin' % self.staged_prefix)
-            line = line.replace(
-                '@mono_instdir@',
-                '%s/lib/mono' %
-                self.staged_prefix)
-            print line
-
-        patterns = ["*UnitTests*", "*xunit*", "NuGet*", "System.Runtime.InteropServices.RuntimeInformation.dll",
-                    "Roslyn/csc.exe*"]
-
-        for pattern in patterns:
-            for excluded in glob.glob("%s/%s" % (new_location, pattern)):
-                self.rm(excluded)
+       def build (self):
+               self.sh ('./cibuild.sh --scope Compile --target Mono --host Mono --config Release')
 
+       def install (self):
+                self.sh ('./install-mono-prefix.sh %s' % self.staged_prefix)
 
-MSBuild()
+MSBuild ()