Skip to content

[Android] Add AndroidAppBuilder pkgproj for Android sample #43216

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

Merged
merged 6 commits into from
Oct 21, 2020
Merged

[Android] Add AndroidAppBuilder pkgproj for Android sample #43216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab498ed
Add Android sample pkgproj
Oct 8, 2020
5c22a02
Add Android Sample pkgproj to descriptions
Oct 8, 2020
ecb50d5
Add Android sample pkgproj ProjectReference
Oct 8, 2020
21641ed
Fixup AndroidAppBuilder assembly path
Oct 9, 2020
c673a0e
Add packaging target
Oct 9, 2020
487f80c
Move package from dotnet6-transport to dotnet6 feed
Oct 20, 2020
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
16 changes: 16 additions & 0 deletions ...crosoft.NET.Runtime.Android.Sample.Mono/Microsoft.NET.Runtime.Android.Sample.Mono.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />

<ItemGroup>
<ProjectReference Include="$(RepoToolsLocalDir)tasks\mobile.tasks\AndroidAppBuilder\AndroidAppBuilder.csproj" />
</ItemGroup>

<ItemGroup>
<_AndroidSampleFiles Include="$(ArtifactsDir)bin\AndroidAppBuilder\$(Configuration)\$(NetCoreAppCurrent)\AndroidAppBuilder.dll" />

<PackageFile Include="@(_AndroidSampleFiles)" TargetPath="tools\$(NetCoreAppCurrent)\" />
</ItemGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
5 changes: 5 additions & 0 deletions src/mono/netcore/nuget/descriptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
"Description": "When using NuGet 3.x this package requires at least version {0}.",
"CommonTypes": [ ]
},
{
"Name": "Microsoft.NET.Runtime.Android.Sample.Mono",
"Description": "Internal package for sharing Android App Builder.",
"CommonTypes": [ ]
},
{
"Name": "Microsoft.NETCore.BrowserDebugHost.Transport",
"Description": "Internal package for sharing BrowserDebugHost.",
Expand Down
4 changes: 4 additions & 0 deletions src/mono/netcore/nuget/mono-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<Project>
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />

<ItemGroup Condition="'$(TargetOS)' == 'Android'">
<ProjectReference Include="Microsoft.NET.Runtime.Android.Sample.Mono\Microsoft.NET.Runtime.Android.Sample.Mono.pkgproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<ProjectReference Include="Microsoft.NETCore.BrowserDebugHost.Transport\Microsoft.NETCore.BrowserDebugHost.Transport.pkgproj" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions tools-local/tasks/mobile.tasks/AndroidAppBuilder/AndroidAppBuilder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,7 @@
<Target Name="PublishBuilder"
AfterTargets="Build"
DependsOnTargets="Publish" />

<Target Name="GetFilesToPackage" />

</Project>