[msbuild] Repack all iOS Task assemblies into Xamarin.iOS.Tasks.dll #3007

jstedfast · 2017-11-14T20:40:35Z

https://bugzilla.xamarin.com/show_bug.cgi?id=52729

This is needed to prevent symbol conflicts with Xamarin.MacDev's ProcessArgumentBuilder (which is functionally different from Xamarin.MacDev.Tasks.Core's class of the same name).

…ntains all symbols

jstedfast · 2017-11-14T20:40:47Z

This PR replaces #2875

…buted

monojenkins · 2017-11-14T20:45:11Z

Build failure

monojenkins · 2017-11-14T21:37:16Z

Build failure

monojenkins · 2017-11-15T19:18:31Z

Build failure

chamons · 2017-11-15T22:13:54Z

build

chamons

Looks reasonable at first glance. I don't grok the ilpack msbuild logic very well, but it should break very quickly if it's wrong. I added mmp/mtouch tests, at least mmp invoke msbuild a lot.

monojenkins · 2017-11-15T23:12:16Z

Build failure

monojenkins · 2017-11-16T16:39:22Z

Build failure

jstedfast · 2017-11-20T16:26:52Z

Does anyone understand what is failing in the build?

chamons · 2017-11-20T16:27:46Z

@jstedfast

https://jenkins.mono-project.com/job/xamarin-macios-pr-builder/5603/Test_Report/

Project file: /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks.sln
Platform: Configuration:
Build duration: 00:00:07.0559854
Run duration: 00:37:01.1999263
Main log
Build log
: error : Error building target CoreCompile: Microsoft.Build.BuildEngine.InvalidProjectFileException: Unable to parse condition "Exists(@(IntermediateAssembly -> '%(FullPath)')) And '$(ILRepack)' != 'false'" : Expected an item list at position 8 in condition "Exists(@(IntermediateAssembly -> '%(FullPath)')) And '$(ILRepack)' != 'false'". Missing opening parantheses after the '@'. ---> Microsoft.Build.BuildEngine.ExpressionParseException: Expected an item list at position 8 in condition "Exists(@(IntermediateAssembly -> '%(FullPath)')) And '$(ILRepack)' != 'false'". Missing opening parantheses after the '@'. ```

jstedfast · 2017-11-20T16:33:45Z

Ok, that suggests that xbuild is being used instead of msbuild on the bots :(

chamons · 2017-11-20T16:35:54Z

@jstedfast Correct. msbuild currently does not have sufficient redirect support to build all of the tests and use the local built binaries. @radical is working on that.

However, I don't know of a reason why the msbuild/ can't be built w\ msbuild. You could look at changing that and see how it goes.

jstedfast · 2017-11-20T16:37:51Z

I modified the Makefile to make it use msbuild for building the msbuild/ directory tho. :-\

chamons · 2017-11-20T16:40:33Z

https://jenkins.mono-project.com/job/xamarin-macios-pr-builder/5603/Test_Report/

xbuild /verbosity:diagnostic /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks.sln :(

rolfbjarne · 2017-11-20T16:41:38Z

@jstedfast I've just pushed a fix

chamons · 2017-11-20T16:41:53Z

A wild @rolfbjarne to the rescue! 🎉

jstedfast · 2017-11-20T16:45:44Z

thanks @rolfbjarne !

monojenkins · 2017-11-20T18:27:08Z

Build failure

rolfbjarne · 2017-11-21T08:37:28Z

This happens now:

  /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj(135,5): error : INFO: IL Repack - Version 2.0.13;
  INFO: ------------- IL Repack Arguments -------------;
  /out:/Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.iOS.Tasks/obj/Debug/Xamarin.iOS.Tasks.dll  /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.iOS.Tasks/obj/Debug/Xamarin.iOS.Tasks.dll /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.iOS.Tasks.Core/bin/Debug/Xamarin.iOS.Tasks.Core.dll /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/external/Xamarin.MacDev/Xamarin.MacDev/bin/Debug/Xamarin.MacDev.dll /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks.Core/bin/Debug/Xamarin.MacDev.Tasks.Core.dll /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks/bin/Debug/Xamarin.MacDev.Tasks.dll /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks/bin/Debug/Mono.Cecil.dll;
  -----------------------------------------------;
  INFO: Adding assembly for merge: /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.iOS.Tasks/obj/Debug/Xamarin.iOS.Tasks.dll;
  INFO: Failed to load debug information for /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.iOS.Tasks/obj/Debug/Xamarin.iOS.Tasks.dll;
  INFO: Adding assembly for merge: /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.iOS.Tasks.Core/bin/Debug/Xamarin.iOS.Tasks.Core.dll;
  INFO: Failed to load debug information for /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.iOS.Tasks.Core/bin/Debug/Xamarin.iOS.Tasks.Core.dll;
  INFO: Adding assembly for merge: /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/external/Xamarin.MacDev/Xamarin.MacDev/bin/Debug/Xamarin.MacDev.dll;
  INFO: Failed to load debug information for /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/external/Xamarin.MacDev/Xamarin.MacDev/bin/Debug/Xamarin.MacDev.dll;
  INFO: Adding assembly for merge: /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks.Core/bin/Debug/Xamarin.MacDev.Tasks.Core.dll;
  INFO: Failed to load debug information for /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks.Core/bin/Debug/Xamarin.MacDev.Tasks.Core.dll;
  INFO: Adding assembly for merge: /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks/bin/Debug/Xamarin.MacDev.Tasks.dll;
  INFO: Failed to load debug information for /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks/bin/Debug/Xamarin.MacDev.Tasks.dll;
  INFO: Adding assembly for merge: /Users/builder/jenkins/workspace/xamarin-macios-pr-builder/msbuild/Xamarin.MacDev.Tasks/bin/Debug/Mono.Cecil.dll;
  INFO: Processing references;
  INFO: Processing types;
  INFO: Merging <Module>;
  INFO: Merging <Module>;
  ERROR: Duplicate type Xamarin.iOS.Tasks.ACToolTaskBase;
  System.InvalidOperationException: Duplicate type Xamarin.iOS.Tasks.ACToolTaskBase from Xamarin.iOS.Tasks.Core.dll, was also present in Xamarin.iOS.Tasks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null;
  at ILRepacking.RepackImporter.Import (Mono.Cecil.TypeDefinition type, Mono.Collections.Generic.Collection`1[T] col, System.Boolean internalize) [0x00165] in <64e369dd574e4d42a56b1689deff9155>:0;
  at ILRepacking.Steps.TypesRepackStep.RepackTypes () [0x00142] in <64e369dd574e4d42a56b1689deff9155>:0;at ILRepacking.Steps.TypesRepackStep.Perform () [0x00000] in <64e369dd574e4d42a56b1689deff9155>:0;
  at ILRepacking.ILRepack.Repack () [0x00305] in <64e369dd574e4d42a56b1689deff9155>:0;at ILRepacking.Application.Main (System.String[] args) [0x0004a] in <64e369dd574e4d42a56b1689deff9155>:0

which seems to be a rebuild issue (if I do msbuild *.sln twice in xamarin-macios/msbuild, the error occurs the second time). Maybe the ilrepacked assembly is used as input for second build?

jstedfast · 2017-11-21T20:15:12Z

Yea, that's what is happening. How do I fix this? Why is it being "re"built?

rolfbjarne · 2017-11-22T06:46:34Z

It's first built during normal make, then the second time to (try to) build the tests.

In any case it doesn't matter why: it should be possible to build the solution multiple times.

I don't know how to fix it, maybe @kzu knows?

monojenkins · 2017-11-22T17:38:15Z

Build failure

monojenkins · 2017-11-22T19:36:46Z

Build success

spouliot · 2017-11-24T20:39:53Z

ping @kzu / @emaf

kzu

LGTM

…amarin#3007) * [msbuild] Pack all iOS MSBuild Task assemblies into a single assembly * Fixed the build * Renamed ProcessArgumentBuilder to CommandLineArgumentBuilder This is needed to prevent symbol conflicts with Xamarin.MacDev's ProcessArgumentBuilder (which is functionally different from Xamarin.MacDev.Tasks.Core's class of the same name). * Fixed ILRepack logic for filtering dll's to repack * Fixed building of Xamarin.iOS.Tasks.Tests now that X.iOS.Tasks.dll contains all symbols * Updated Makefile now that only 1 iOS Task assembly needs to be distributed * ILRepack Xamarin.Mac.Tasks as well * Fixed up *.targets to specify The One Assembly To Rule Them All * [xharness] Build MSBuild tests with MSBuild. * Touch the ilrepack stamp file *after* invoking ILRepack, not before. * Same for Xamarin.Mac.Tasks

…ks.dll (#3007)" This reverts commit 2d4256e.

jstedfast added 5 commits November 10, 2017 16:16

[msbuild] Pack all iOS MSBuild Task assemblies into a single assembly

9708a85

Fixed the build

8cfd37c

Renamed ProcessArgumentBuilder to CommandLineArgumentBuilder

0461dcb

This is needed to prevent symbol conflicts with Xamarin.MacDev's ProcessArgumentBuilder (which is functionally different from Xamarin.MacDev.Tasks.Core's class of the same name).

Fixed ILRepack logic for filtering dll's to repack

3604fab

Fixed building of Xamarin.iOS.Tasks.Tests now that X.iOS.Tasks.dll co…

87bdfdb

…ntains all symbols

jstedfast requested a review from rolfbjarne November 14, 2017 20:40

jstedfast requested review from emaf, kzu and VincentDondain as code owners November 14, 2017 20:40

dnfclas added the cla-already-signed label Nov 14, 2017

Updated Makefile now that only 1 iOS Task assembly needs to be distri…

5c3ff71

…buted

jstedfast mentioned this pull request Nov 15, 2017

[msbuild] Do not allow iOS and Mac to share the same Xamarin.MacDev* … #2875

Closed

ILRepack Xamarin.Mac.Tasks as well

1bc0369

spouliot requested a review from chamons November 15, 2017 19:07

chamons added run-mmp-tests Run the mmp tests run-mtouch-tests Run the mtouch tests labels Nov 15, 2017

chamons approved these changes Nov 15, 2017

View reviewed changes

Fixed up *.targets to specify The One Assembly To Rule Them All

d9b510c

[xharness] Build MSBuild tests with MSBuild.

657ebd9

Touch the ilrepack stamp file *after* invoking ILRepack, not before.

5b54011

Same for Xamarin.Mac.Tasks

7c02c41

spouliot approved these changes Nov 23, 2017

View reviewed changes

rolfbjarne approved these changes Nov 23, 2017

View reviewed changes

emaf approved these changes Nov 27, 2017

View reviewed changes

kzu approved these changes Nov 27, 2017

View reviewed changes

jstedfast merged commit 2d4256e into master Nov 27, 2017

jstedfast deleted the msbuild-ilrepack branch November 27, 2017 19:44

jstedfast added a commit that referenced this pull request Nov 29, 2017

Revert "[msbuild] Repack all iOS Task assemblies into Xamarin.iOS.Tas…

5645e33

…ks.dll (#3007)" This reverts commit 2d4256e.

jstedfast mentioned this pull request Jan 5, 2018

[msbuild] Repack all iOS Task assemblies into Xamarin.iOS.Tasks.dll #3168

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[msbuild] Repack all iOS Task assemblies into Xamarin.iOS.Tasks.dll #3007

[msbuild] Repack all iOS Task assemblies into Xamarin.iOS.Tasks.dll #3007

jstedfast commented Nov 14, 2017 •

edited by rolfbjarne

jstedfast commented Nov 14, 2017

monojenkins commented Nov 14, 2017

monojenkins commented Nov 14, 2017

monojenkins commented Nov 15, 2017

chamons commented Nov 15, 2017

chamons left a comment

monojenkins commented Nov 15, 2017

monojenkins commented Nov 16, 2017

jstedfast commented Nov 20, 2017

chamons commented Nov 20, 2017

jstedfast commented Nov 20, 2017

chamons commented Nov 20, 2017

jstedfast commented Nov 20, 2017

chamons commented Nov 20, 2017

rolfbjarne commented Nov 20, 2017

chamons commented Nov 20, 2017

jstedfast commented Nov 20, 2017

monojenkins commented Nov 20, 2017

rolfbjarne commented Nov 21, 2017

jstedfast commented Nov 21, 2017

rolfbjarne commented Nov 22, 2017

monojenkins commented Nov 22, 2017

monojenkins commented Nov 22, 2017

spouliot commented Nov 24, 2017

kzu left a comment

[msbuild] Repack all iOS Task assemblies into Xamarin.iOS.Tasks.dll #3007

[msbuild] Repack all iOS Task assemblies into Xamarin.iOS.Tasks.dll #3007

Conversation

jstedfast commented Nov 14, 2017 • edited by rolfbjarne

jstedfast commented Nov 14, 2017

monojenkins commented Nov 14, 2017

monojenkins commented Nov 14, 2017

monojenkins commented Nov 15, 2017

chamons commented Nov 15, 2017

chamons left a comment

Choose a reason for hiding this comment

monojenkins commented Nov 15, 2017

monojenkins commented Nov 16, 2017

jstedfast commented Nov 20, 2017

chamons commented Nov 20, 2017

jstedfast commented Nov 20, 2017

chamons commented Nov 20, 2017

jstedfast commented Nov 20, 2017

chamons commented Nov 20, 2017

rolfbjarne commented Nov 20, 2017

chamons commented Nov 20, 2017

jstedfast commented Nov 20, 2017

monojenkins commented Nov 20, 2017

rolfbjarne commented Nov 21, 2017

jstedfast commented Nov 21, 2017

rolfbjarne commented Nov 22, 2017

monojenkins commented Nov 22, 2017

monojenkins commented Nov 22, 2017

spouliot commented Nov 24, 2017

kzu left a comment

Choose a reason for hiding this comment

jstedfast commented Nov 14, 2017 •

edited by rolfbjarne