diff --git a/src/Mono.Android.Runtime/Mono.Android.Runtime.csproj b/src/Mono.Android.Runtime/Mono.Android.Runtime.csproj
index c672d490fe8..a73aaea64d9 100644
--- a/src/Mono.Android.Runtime/Mono.Android.Runtime.csproj
+++ b/src/Mono.Android.Runtime/Mono.Android.Runtime.csproj
@@ -1,5 +1,4 @@
 <Project>
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <Import Project="..\..\Configuration.props" />
   <Import Project="..\..\build-tools\scripts\XAVersionInfo.targets" />
@@ -11,12 +10,22 @@
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateRepositoryUrlAttribute>false</GenerateRepositoryUrlAttribute>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
+    <IsTrimmable>true</IsTrimmable>
     <NoStdLib>true</NoStdLib>
     <Nullable>enable</Nullable>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <SignAssembly>true</SignAssembly>
+    <AssemblyTitle>Mono.Android.Runtime.dll</AssemblyTitle>
+    <Product>.NET for Android</Product>
+    <Company>Microsoft Corporation</Company>
+    <_MonoAndroidRuntimeInternalsVisibleToPublicKey>0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db</_MonoAndroidRuntimeInternalsVisibleToPublicKey>
 
     <!-- Ignore "unused member" warnings from code that originates from Mono.CodeGeneration -->
     <NoWarn>$(NoWarn);CS0169;CS0414;CS0649</NoWarn>
@@ -43,8 +52,24 @@
     </BuildDependsOn>
   </PropertyGroup>
 
+  <Target Name="_SetGeneratedAssemblyInfoProperties"
+      DependsOnTargets="GetXAVersionInfo"
+      BeforeTargets="GetAssemblyAttributes">
+    <PropertyGroup>
+      <InformationalVersion>$(AndroidPackVersion).$(PackVersionCommitCount); git-rev-head:$(XAVersionHash); git-branch:$(XAVersionBranch)</InformationalVersion>
+      <TargetPlatformIdentifier>Android</TargetPlatformIdentifier>
+      <TargetPlatformVersion>$(AndroidApiLevel).0</TargetPlatformVersion>
+      <SupportedOSPlatformVersion>$(AndroidMinimumDotNetApiLevel).0</SupportedOSPlatformVersion>
+    </PropertyGroup>
+  </Target>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Mono.Android" Key="$(_MonoAndroidRuntimeInternalsVisibleToPublicKey)" />
+    <InternalsVisibleTo Include="Microsoft.Android.Runtime.NativeAOT" Key="$(_MonoAndroidRuntimeInternalsVisibleToPublicKey)" />
+    <InternalsVisibleTo Include="Mono.Android.NET-Tests" Key="$(_MonoAndroidRuntimeInternalsVisibleToPublicKey)" />
+  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
     <Compile Include="..\Mono.Android\Android.Runtime\AndroidRuntimeInternal.cs" />
     <Compile Include="..\Mono.Android\Android.Runtime\LogCategories.cs" />
     <Compile Include="..\Mono.Android\Android.Runtime\LogLevel.cs" />
diff --git a/src/Mono.Android.Runtime/Mono.Android.Runtime.targets b/src/Mono.Android.Runtime/Mono.Android.Runtime.targets
index e64a61d6a81..ac18aa0ff2a 100644
--- a/src/Mono.Android.Runtime/Mono.Android.Runtime.targets
+++ b/src/Mono.Android.Runtime/Mono.Android.Runtime.targets
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Creates 'AssemblyInfo.cs' with appropriate version information -->
-  <Target Name="_BuildAssemblyInfo_cs"
-      DependsOnTargets="GetXAVersionInfo"
-      BeforeTargets="CoreCompile"
-      Condition="!Exists ('$(IntermediateOutputPath)AssemblyInfo.cs')"
-      Inputs="Properties\AssemblyInfo.cs.in"
-      Outputs="$(IntermediateOutputPath)AssemblyInfo.cs">
-    <PropertyGroup>
-      <_PackageVersion>$(AndroidPackVersion)</_PackageVersion>
-      <_PackageVersionBuild>$(PackVersionCommitCount)</_PackageVersionBuild>
-    </PropertyGroup>
-    <ReplaceFileContents
-        SourceFile="Properties\AssemblyInfo.cs.in"
-        DestinationFile="$(IntermediateOutputPath)AssemblyInfo.cs"
-        Replacements="@PACKAGE_VERSION@=$(_PackageVersion);@PACKAGE_VERSION_BUILD@=$(_PackageVersionBuild);@PACKAGE_HEAD_REV@=$(XAVersionHash);@PACKAGE_HEAD_BRANCH@=$(XAVersionBranch);@API_LEVEL@=$(AndroidApiLevel);@MIN_API_LEVEL@=$(AndroidMinimumDotNetApiLevel)">
-    </ReplaceFileContents>
-  </Target>
-
   <Target Name="_CopyToPackDirs">
     <Copy
         SourceFiles="$(OutputPath)ref\Mono.Android.Runtime.dll"
diff --git a/src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in b/src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in
deleted file mode 100644
index fee83c88b9c..00000000000
--- a/src/Mono.Android.Runtime/Properties/AssemblyInfo.cs.in
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// AssemblyInfo.cs.in
-//
-// Authors:
-//   Jonathan Pryor (jonp@xamarin.com)
-//
-// Copyright 2014 Xamarin, Inc.
-// Copyright 2016 Microsoft Corporation.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.Versioning;
-
-[assembly: AssemblyInformationalVersion ("@PACKAGE_VERSION@.@PACKAGE_VERSION_BUILD@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")]
-[assembly: AssemblyTitle ("Mono.Android.Runtime.dll")]
-[assembly: AssemblyProduct (".NET for Android")]
-[assembly: AssemblyCompany ("Microsoft Corporation")]
-[assembly: TargetPlatform("Android@API_LEVEL@.0")]
-[assembly: SupportedOSPlatform("Android@MIN_API_LEVEL@.0")]
-
-[assembly: InternalsVisibleTo("Mono.Android, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
diff --git a/src/Mono.Android/Android.Runtime/AndroidRuntime.cs b/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
index cb05c9da9b1..adc0ad709a3 100644
--- a/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
+++ b/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
@@ -11,6 +11,7 @@
 using Java.Interop.Tools.TypeNameMappings;
 using Microsoft.Android.Runtime;
 using System.Diagnostics.CodeAnalysis;
+using RuntimeFeature = Microsoft.Android.Runtime.RuntimeFeature;
 
 #if JAVA_INTEROP
 namespace Android.Runtime {
diff --git a/src/Mono.Android/Android.Runtime/JNIEnv.cs b/src/Mono.Android/Android.Runtime/JNIEnv.cs
index 433d1a0d53e..140e1af82cc 100644
--- a/src/Mono.Android/Android.Runtime/JNIEnv.cs
+++ b/src/Mono.Android/Android.Runtime/JNIEnv.cs
@@ -14,6 +14,7 @@
 using Java.Interop;
 using Java.Interop.Tools.TypeNameMappings;
 using Microsoft.Android.Runtime;
+using RuntimeFeature = Microsoft.Android.Runtime.RuntimeFeature;
 
 namespace Android.Runtime {
 	public static partial class JNIEnv {
diff --git a/src/Mono.Android/Java.Interop/TypeManager.cs b/src/Mono.Android/Java.Interop/TypeManager.cs
index f856818e09f..3d9c68015e0 100644
--- a/src/Mono.Android/Java.Interop/TypeManager.cs
+++ b/src/Mono.Android/Java.Interop/TypeManager.cs
@@ -9,6 +9,7 @@
 
 using Android.Runtime;
 using Microsoft.Android.Runtime;
+using RuntimeFeature = Microsoft.Android.Runtime.RuntimeFeature;
 
 namespace Java.Interop {
 
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index c8c2c87a071..7b5c6f23afd 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -368,7 +368,6 @@
     <Compile Include="Microsoft.Android.Runtime\JavaMarshalRegisteredPeers.cs" />
     <Compile Include="Microsoft.Android.Runtime\JavaMarshalValueManager.cs" />
     <Compile Include="Microsoft.Android.Runtime\PrimitiveArrayInfo.cs" />
-    <Compile Include="Microsoft.Android.Runtime\RuntimeFeature.cs" />
     <Compile Include="Microsoft.Android.Runtime\SingleUniverseTypeMap.cs" />
     <Compile Include="Microsoft.Android.Runtime\TrimmableTypeMap.cs" />
     <Compile Include="Microsoft.Android.Runtime\TrimmableTypeMapTypeManager.cs" />