diff options
| author | Ankit Jain <radical@gmail.com> | 2017-11-21 06:28:40 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-11-21 06:28:40 +0300 |
| commit | 73bd521c075b30bcbf349bdb7381d3b6b9fc3c69 (patch) | |
| tree | e941bf92f58abfc17e9b4c150392e2cbb5edfea5 /packaging | |
| parent | a6e7c1f81c949577480d35c161ca2b75a190c91c (diff) | |
Bump NuGet.BuildTasks (#6004)
* Bump nuget-buildtasks
cherry-pick 304d785bd0d11f8eb1f9ed18f0a3ef5cf273160d
* [msbuild] Install importbefore/after hooks for nuget
cherry-pick 4c935964b221437224e064446a932f76027a970d
* [msbuild] Fix build - create the directories before installing .. (#5980)
.. to them.
cherry-pick d711efdd90b6bb2603a8a9d7872768c895745666
* [msbuild] Fix build (#5981)
- Don't copy 14.0/Imports to 15.0 now, as we do that in nuget-buildtasks.
- And don't create symlinks for Microsoft.NuGet.targets as it is not
required anymore.
cherry-pick ef1ea85c0f6af8445ae0df9251d115920c17d4b4
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/MacSDK/mono.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/packaging/MacSDK/mono.py b/packaging/MacSDK/mono.py index bbbf8db091d..2d2598c370f 100644 --- a/packaging/MacSDK/mono.py +++ b/packaging/MacSDK/mono.py @@ -84,17 +84,6 @@ class MonoMasterPackage(Package): "LocalMachine") ensure_dir(registry_dir) - # Add ImportBefore files from xbuild 14.0 toolsVersion directory to msbuild's - # 15.0 directory - xbuild_dir = os.path.join(self.staged_prefix, 'lib/mono/xbuild') - new_xbuild_tv_dir = os.path.join(xbuild_dir, '15.0') - os.makedirs(new_xbuild_tv_dir) - - self.sh('cp -R %s/14.0/Imports %s' % (xbuild_dir, new_xbuild_tv_dir)) - - for dep in glob.glob("%s/Microsoft/NuGet/*" % xbuild_dir): - self.sh('ln -s %s %s' % (dep, xbuild_dir)) - def deploy(self): if bockbuild.cmd_options.arch == 'darwin-universal': os.symlink('mono-sgen64', '%s/bin/mono64' % self.staged_profile) |