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

Update AndroidX #459

Closed
wants to merge 3 commits into from
Closed

Update AndroidX #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
321bb17
Update AndroidX
mattleibow Mar 8, 2021
06afc2f
Update Maui.Controls.Sample.Droid-net6.csproj
mattleibow Mar 8, 2021
8560428
Update Maui.Controls.Sample.SingleProject.csproj
mattleibow Mar 8, 2021
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
2 changes: 1 addition & 1 deletion eng/AndroidX.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<_AndroidXVersion>net6preview01</_AndroidXVersion>
<_AndroidXVersion>net6preview02.4535000</_AndroidXVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference
Expand Down
19 changes: 1 addition & 18 deletions src/Controls/samples/Controls.Sample.Droid/Maui.Controls.Sample.Droid-net6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,4 @@
<ProjectReference Include="..\Controls.Sample\Maui.Controls.Sample-net6.csproj" />
<PackageReference Include="Xamarin.AndroidX.Browser" />
</ItemGroup>
<!--
The linker resolves some assembly references too eagerly, and
fails when it can't find them, so work around this by referencing
the missing assemblies.
See: https://github.com/mono/linker/issues/1139
-->
<PropertyGroup>
<_DotNetPackageVersion>5.0.0</_DotNetPackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.CodeDom" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Diagnostics.EventLog" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.IO.Ports" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Security.Permissions" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Threading.AccessControl" Version="$(_DotNetPackageVersion)" />
</ItemGroup>
</Project>
</Project>
19 changes: 1 addition & 18 deletions src/Controls/samples/Controls.Sample.SingleProject/Maui.Controls.Sample.SingleProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,4 @@
<ProjectReference Include="..\..\..\Core\src\Core-net6.csproj" />
<ProjectReference Include="..\..\src\Core\Controls.Core-net6.csproj" />
</ItemGroup>
<!--
The linker resolves some assembly references too eagerly, and
fails when it can't find them, so work around this by referencing
the missing assemblies.
See: https://github.com/mono/linker/issues/1139
-->
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-android' ">
<_DotNetPackageVersion>5.0.0</_DotNetPackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-android' ">
<PackageReference Include="System.CodeDom" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Diagnostics.EventLog" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.IO.Ports" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Security.Permissions" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Threading.AccessControl" Version="$(_DotNetPackageVersion)" />
</ItemGroup>
</Project>
</Project>