diff --git a/build-tools/create-packs/Microsoft.Android.Sdk.proj b/build-tools/create-packs/Microsoft.Android.Sdk.proj
index 5b0cb52d458..6777d109cbf 100644
--- a/build-tools/create-packs/Microsoft.Android.Sdk.proj
+++ b/build-tools/create-packs/Microsoft.Android.Sdk.proj
@@ -77,6 +77,7 @@ core workload SDK packs imported by WorkloadManifest.targets.
+
diff --git a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
index 6c4368fd7d2..6d3aa528fa1 100644
--- a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
+++ b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
@@ -38,6 +38,10 @@
..\PreserveLists\%(Filename)%(Extension)
PreserveNewest
+
+ ..\PreserveLists\%(Filename)%(Extension)
+ PreserveNewest
+
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs
index 8318413eeb2..15938fd1439 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs
@@ -1,3 +1,4 @@
+using System.IO;
using NUnit.Framework;
using Xamarin.Android.Tasks;
using Xamarin.ProjectTools;
@@ -48,5 +49,13 @@ public void Build_WithTrimmableTypeMap_IncrementalBuild ()
builder.Output.IsTargetSkipped ("_GenerateJavaStubs"),
"_GenerateJavaStubs should be skipped on incremental build.");
}
+
+ [Test]
+ public void TrimmableTypeMap_PreserveList_IsPackagedInSdk ()
+ {
+ var path = Path.Combine (TestEnvironment.DotNetPreviewAndroidSdkDirectory, "PreserveLists", "Trimmable.CoreCLR.xml");
+
+ FileAssert.Exists (path, $"{path} should exist in the SDK pack.");
+ }
}
}