[One .NET] pack AndroidLibrary .aar files in .nupkg #7045
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes: dotnet#7040 It appears we were missing a test case of: 1. `dotnet new androidlib` 2. Add an `.aar` file 3. `dotnet pack` 4. Assert that `lib\net6.0-android31.0\MyAndroidLibrary.aar` exists in the `.nupkg` output We instead end up with "weird" output in the `.nupkg` like: lib\net6.0-android31.0\MyDotNetAssembly.dll lib\net6.0-android31.0\MyDotNetAssembly.xml lib\net6.0-android31.0\MyDotNetAssembly.aar content\MyAndroidLibrary.aar contentFiles\any\net6.0-android31.0\MyAndroidLibrary.aar `MyDotNetAssembly.aar` would contain any `.jar` files or `AndroidResource` files packed inside. However, *other* `.aar` files are supposed to sit next to `MyDotNetAssembly.dll`. It was surprisingly difficult to work alongside NuGet's MSBuild targets to get this to work. 1. In the `_CategorizeAndroidLibraries` MSBuild target, mark `TfmSpecificPackageFile="%(Pack)"` to be used in our `_IncludeAarInNuGetPackage` MSBuild target. 2. Add these files to `@(TfmSpecificPackageFileWithRecursiveDir)` and set `%(NuGetRecursiveDir)` to empty. Otherwise, these items can have `%(RecursiveDir)` set to some path, and this causes sub-directories in the `.nupkg` output. I updated several tests for this case. I also updated usage of `XASdkProject.OtherBuildItems` to use `Sources` instead. `OtherBuildItems` adds the files to the `.csproj`, and we should be testing our wildcards in `AutoImport.props`. Previously, some of these items were being added twice in these tests.
dellis1972
approved these changes
May 31, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #7040
It appears we were missing a test case of:
dotnet new androidlibAdd an
.aarfiledotnet packAssert that
lib\net6.0-android31.0\MyAndroidLibrary.aarexists inthe
.nupkgoutputWe instead end up with "weird" output in the
.nupkglike:MyDotNetAssembly.aarwould contain any.jarfiles orAndroidResourcefiles packed inside. However, other.aarfilesare supposed to sit next to
MyDotNetAssembly.dll.It was surprisingly difficult to work alongside NuGet's MSBuild
targets to get this to work.
In the
_CategorizeAndroidLibrariesMSBuild target, markTfmSpecificPackageFile="%(Pack)"to be used in our_IncludeAarInNuGetPackageMSBuild target.Add these files to
@(TfmSpecificPackageFileWithRecursiveDir)andset
%(NuGetRecursiveDir)to empty. Otherwise, these items canhave
%(RecursiveDir)set to some path, and this causessub-directories in the
.nupkgoutput.I updated several tests for this case. I also updated usage of
XASdkProject.OtherBuildItemsto useSourcesinstead.OtherBuildItemsadds the files to the.csproj, and we should betesting our wildcards in
AutoImport.props. Previously, some of theseitems were being added twice in these tests.