Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ship the .aar with the NuGet for android #2465

Merged
merged 5 commits into from
Jun 8, 2023
Merged

Ship the .aar with the NuGet for android #2465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d515e55
Add a null check. Ship the aar with the Nuget
dellis1972 May 19, 2023
b5d2c9d
Remove null checking
dellis1972 May 23, 2023
380b184
Merge branch 'main' into nullcheck
mattleibow Jun 7, 2023
57cb3fb
Update SkiaSharp.Build.targets
mattleibow Jun 8, 2023
3f1f7da
Merge branch 'main' into nullcheck
mattleibow Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nuget/SkiaSharp.Views.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/net6.0-android/SkiaSharp.Views.Android.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.dll" />
<file src="lib/net6.0-android/SkiaSharp.Views.Android.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.pdb" />
<file src="lib/net6.0-android/SkiaSharp.Views.Android.xml" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.xml" />
<file src="lib/net6.0-android/SkiaSharp.Views.Android.aar" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.aar" />
Copy link
Contributor

Choose a reason for hiding this comment

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

This packs the file in the NuGet package.

<file src="lib/net6.0-ios/SkiaSharp.Views.iOS.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.dll" />
<file src="lib/net6.0-ios/SkiaSharp.Views.iOS.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.pdb" />
<file src="lib/net6.0-ios/SkiaSharp.Views.iOS.xml" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.xml" />
Expand Down
2 changes: 2 additions & 0 deletions source/SkiaSharp.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,13 @@ internal partial class VersionConstants {
<ItemGroup Condition=" '$(PackagingLocation)' == '' ">
<_CopyItems Include="$(TargetPath)" Dest="nuget\lib\$(PackagingPlatform)\$(TargetFileName)" />
<_CopyItems Include="$(TargetDir)$(TargetName).xml" Dest="nuget\lib\$(PackagingPlatform)\$(TargetName).xml" Condition=" Exists('$(TargetDir)$(TargetName).xml') " />
<_CopyItems Include="$(TargetDir)$(TargetName).aar" Dest="nuget\lib\$(PackagingPlatform)\$(TargetName).aar" Condition=" Exists('$(TargetDir)$(TargetName).aar') " />
Copy link
Contributor

Choose a reason for hiding this comment

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

This copies from the bin directory into the artifacts directory.

<_CopyItems Include="$(TargetDir)$(TargetName).pdb" Dest="nuget\lib\$(PackagingPlatform)\$(TargetName).pdb" />
</ItemGroup>
<ItemGroup Condition=" '$(PackagingLocation)' != '' ">
<_CopyItems Include="$(TargetPath)" Dest="nuget\$(PackagingLocation)\$(TargetFileName)" />
<_CopyItems Include="$(TargetDir)$(TargetName).xml" Dest="nuget\$(PackagingLocation)\$(TargetName).xml" Condition=" Exists('$(TargetDir)$(TargetName).xml') " />
<_CopyItems Include="$(TargetDir)$(TargetName).aar" Dest="nuget\$(PackagingLocation)\$(TargetName).aar" Condition=" Exists('$(TargetDir)$(TargetName).aar') " />
<_CopyItems Include="$(TargetDir)$(TargetName).pdb" Dest="nuget\$(PackagingLocation)\$(TargetName).pdb" />
</ItemGroup>
<ItemGroup>
Expand Down