Skip to content

Put a binary copy of mlaunch in macios-binaries instead of in Azure. Fixes #3316. - #3877

Merged
rolfbjarne merged 4 commits into
dotnet:masterfrom
rolfbjarne:binary-mlaunch-take-2
Apr 10, 2018
Merged

Put a binary copy of mlaunch in macios-binaries instead of in Azure. Fixes #3316.#3877
rolfbjarne merged 4 commits into
dotnet:masterfrom
rolfbjarne:binary-mlaunch-take-2

Conversation

@rolfbjarne

Copy link
Copy Markdown
Member

If the Xamarin build is enabled, then build mlaunch from source, otherwise get it from macios-binaries.

Fixes #3316.

…ixes dotnet#3316.

If the Xamarin build is enabled, then build mlaunch from source, otherwise get it from macios-binaries.

Fixes dotnet#3316.
Build msbuild/ after tools/, so that mlaunch builds when building from source,
since its build needs the MSBuild logic installed by msbuild/.
@rolfbjarne

Copy link
Copy Markdown
Member Author

@monojenkins

Copy link
Copy Markdown
Contributor

Build failure
Build comment file:

Provisioning succeeded
Build succeeded
API Diff (from stable)
API Diff (from PR only)
Generator Diff
🔥 Test run failed 🔥

Test results

Test run in progress: Built: 56, Succeeded: 23, Ignored: 1255


@rolfbjarne

Copy link
Copy Markdown
Member Author

It failed because the bundled mlaunch doesn't support xcode9.3, which will be fixed with this: xamarin/macios-binaries#9

@monojenkins

Copy link
Copy Markdown
Contributor

Build success
Build comment file:

Provisioning succeeded
Build succeeded
API Diff (from stable)
API Diff (from PR only)
Generator Diff
Test run succeeded


Comment thread Makefile
@@ -1,5 +1,5 @@
TOP=.
SUBDIRS=builds runtime fsharp src tools msbuild

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change of position important?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's important when building mlaunch from source, because mlaunch is a Xamarin.Mac project, and it needs the Xamarin.Mac msbuild targets / assemblies, which means that we need to build the msbuild directory before we build mlaunch (which is built in tools/mlaunch).

@rolfbjarne

Copy link
Copy Markdown
Member Author

Wrench build succeeded fine.

@rolfbjarne
rolfbjarne merged commit 34af711 into dotnet:master Apr 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants