Skip to content

Commit

Permalink
[Xamarin.Android.Build.Tasks] remove Microsoft.AspNetCore.App.Runtime…
Browse files Browse the repository at this point in the history
….linux workaround (#6851)

Context: dotnet/sdk#19891

In 3f052b5, I added a workaround to exclude
`Microsoft.AspNetCore.App.Runtime.linux` packages from Android builds.
This was a problem where the `android` RID "inherited" from the
`linux` RID, and so we ended up with unintended packages restored.

This was fixed in dotnet/installer#12702, so
we should remove this workaround.
  • Loading branch information
jonathanpeppers authored Mar 24, 2022
1 parent 1f907f0 commit 24e8120
Showing 1 changed file with 0 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ _ResolveAssemblies MSBuild target.
<UsingTask TaskName="Xamarin.Android.Tasks.ProcessNativeLibraries" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
<UsingTask TaskName="Xamarin.Android.Tasks.StripNativeLibraries" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />

<!-- HACK: workaround for: https://github.com/dotnet/sdk/issues/19891 -->
<Target Name="_RemoveLinuxFrameworkReferences"
AfterTargets="ProcessFrameworkReferences">
<ItemGroup>
<_ProblematicRIDs Include="linux-arm;linux-arm64;linux-x86;linux-x64" />
<PackageDownload Remove="Microsoft.AspNetCore.App.Runtime.%(_ProblematicRIDs.Identity)" />
</ItemGroup>
</Target>

<PropertyGroup Condition=" '$(_ComputeFilesToPublishForRuntimeIdentifiers)' == 'true' ">
<OutputPath Condition=" '$(_OuterOutputPath)' != '' ">$(_OuterOutputPath)</OutputPath>
<OutDir Condition=" '$(_OuterOutputPath)' != '' ">$(_OuterOutputPath)</OutDir>
Expand Down

0 comments on commit 24e8120

Please sign in to comment.