Skip to content

Conversation

@pjcollins
Copy link
Member

@pjcollins pjcollins commented Mar 2, 2020

  • Bump to dotnet/java-interop@cedf4d0
  • [Mono.Android] Do not check target framework of referenced console apps
    These project references only exist to ensure a particular build order,
    so we can skip target framework version compatibility checks.

@pjcollins pjcollins force-pushed the test-ji-more-sdk branch 5 times, most recently from 760ec20 to b9233ec Compare March 10, 2020 17:44
@pjcollins pjcollins marked this pull request as ready for review March 17, 2020 19:43
@pjcollins pjcollins changed the title Test additional sdk style changes in java.interop Bump to xamarin/java.interop@cedf4d0 Mar 17, 2020
<_ILRepackArgs>/out:&quot;$(MSBuildThisFileDirectory)$(IntermediateOutputPath)$(AssemblyName).dll&quot; /internalize</_ILRepackArgs>
<_ILRepackArgs>$(_ILRepackArgs) &quot;$(MSBuildThisFileDirectory)$(IntermediateOutputPath)$(AssemblyName).dll&quot;</_ILRepackArgs>
<_ILRepackArgs>$(_ILRepackArgs) @(_InputAssembliesThatExist->'&quot;%(Identity)&quot;', ' ')</_ILRepackArgs>
<_ILRepackArgs>$(_ILRepackArgs) /lib:&quot;$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\facades&quot;</_ILRepackArgs> <!-- Path to netstandard.dll -->
Copy link
Member

Choose a reason for hiding this comment

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

I'm wondering if this is right... netstandard.dll in this case is coming from our build tree, and meant for Xamarin.Android projects. Xamarin.Android.Build.Tasks is a desktop assembly, should it be using Mono's system install of netstandard.dll instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

We were previously repacking against the netstandard.dll that was copied into this directory by some Java.Interop project. Maybe we can do something similar to what macios is doing here... https://github.com/xamarin/xamarin-macios/blob/0557f16e6a936f9d3c94fe020536141296b42640/msbuild/ILMerge.targets#L13

Copy link
Member Author

Choose a reason for hiding this comment

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

I just rebuilt on macOS with the latest changes, and we should now using a path from the .NET Core installation:

/lib:"/usr/local/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/build/netstandard2.0/ref/"

Copy link
Member Author

@pjcollins pjcollins Mar 17, 2020

Choose a reason for hiding this comment

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

Looks like Windows wasn't happy with this approach

Edit trimming the trailing path separator seems to make the tool invocation on Windows happy.

@jonpryor
Copy link
Contributor

jonpryor commented Mar 17, 2020

Squash-and-merge commit message:

Changes: https://github.com/xamarin/java.interop/compare/bd7c60a6a5ea8abaf6f241da17c42d2d93226bf2...cedf4d04c7bf1f327d615a0316cbeabe59be5454

  * xamarin/Java.Interop@cedf4d0: [build] Convert more projects to Short-Form projects (#547)

Update `src/Mono.Android` to not check target framework of referenced
console apps.  These project references only exist to ensure a
particular build order, so we can skip target framework version
compatibility checks.

@pjcollins
Copy link
Member Author

pjcollins commented Mar 17, 2020

Re-running, we hit a bot which doesn't have powershell installed...

@pjcollins
Copy link
Member Author

/azp run

@dotnet dotnet deleted a comment from azure-pipelines bot Mar 18, 2020
@dotnet dotnet deleted a comment from azure-pipelines bot Mar 18, 2020
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jonpryor jonpryor merged commit 0b7151b into master Mar 18, 2020
@jonpryor jonpryor deleted the test-ji-more-sdk branch March 18, 2020 19:00
jonpryor pushed a commit that referenced this pull request Mar 18, 2020
Changes: dotnet/java-interop@a84d19e...2cab35c

  * dotnet/java-interop@2cab35cc: [build] Convert more projects to Short-Form projects (#547)

Update `src/Mono.Android` to not check target framework of referenced
console apps.  These project references only exist to ensure a
particular build order, so we can skip target framework version
compatibility checks.
@github-actions github-actions bot locked and limited conversation to collaborators Jan 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants