[One .NET] place .aar files in NuGet packages properly #5242
Conversation
This file contains 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
Context: dotnet/sdk#14042 (comment) We had been using an unfortunate hack to get the proper directory for placing `.aar` files in NuGet packages: <None Include="$(_AarOutputPath)" Pack="true" PackagePath="lib\$(TargetFramework)$(TargetPlatformVersion).0" /> Not only was the `.0` weird, but it would also produce the wrong result if the `$(TargetFramework)` was `net5.0-android30`: lib\net5.0-android3030.0 Using an example from the NuGet team, we can run a run a target by setting `$(TargetsForTfmSpecificContentInPackage)`: <PropertyGroup> <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_IncludeAarInNuGetPackage</TargetsForTfmSpecificContentInPackage> </PropertyGroup> Then we can run the `<GetNuGetShortFolderName/>` MSBuild task to get the NuGet folder name: <GetNuGetShortFolderName TargetFrameworkMoniker="$(TargetFrameworkMoniker)" TargetPlatformMoniker="$(TargetPlatformMoniker)"> <Output TaskParameter="NuGetShortFolderName" PropertyName="_NuGetShortFolderName" /> </GetNuGetShortFolderName> Lastly, we add to the `@(TfmSpecificPackageFile)` item group: <ItemGroup> <TfmSpecificPackageFile Include="$(_AarOutputPath)" PackagePath="lib\$(_NuGetShortFolderName)" /> </ItemGroup> Using these changes we can remove the `@(None)` item we were using originally. I also updated a test to verify that `net5.0-android30` works.
dellis1972
approved these changes
Oct 27, 2020
pjcollins
approved these changes
Oct 27, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Context: dotnet/sdk#14042 (comment)
We had been using an unfortunate hack to get the proper directory for
placing
.aarfiles in NuGet packages:Not only was the
.0weird, but it would also produce the wrongresult if the
$(TargetFramework)wasnet5.0-android30:Using an example from the NuGet team, we can run a run a target by
setting
$(TargetsForTfmSpecificContentInPackage):Then we can run the
<GetNuGetShortFolderName/>MSBuild task to getthe NuGet folder name:
Lastly, we add to the
@(TfmSpecificPackageFile)item group:Using these changes we can remove the
@(None)item we were usingoriginally. I also updated a test to verify that
net5.0-android30works.