Skip to content

Commit d70b61e

Browse files
authored
[xaprepare] Don't try to copy files that no longer exist (#9941)
Context: b7e21ad Commit b7e21ad moved `src/native/monodroid/` to `src/native/mono/monodroid` in order to add a parallel tree for the CoreCLR host. However, the `xaprepare` code which used to copy certain files from that directory wasn't updated, resulting in errors on CI similar to: Step Xamarin.Android.Prepare.Step_CopyExtraResultFilesForCI failed: Could not find a part of the path '/Users/runner/work/1/s/src/native/monodroid'. System.InvalidOperationException: Step Xamarin.Android.Prepare.Step_CopyExtraResultFilesForCI failed: Could not find a part of the path '/Users/runner/work/1/s/src/native/monodroid'. ---> System.IO.DirectoryNotFoundException: Could not find a part of the path '/Users/runner/work/1/s/src/native/monodroid'. Fix the error by removing the offending line from `xaprepare` completely, as we no longer have any `*.include.*` files there. There used to be serialized mono config and library mapping files here, but we no longer use them.
1 parent d5152b6 commit d70b61e

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

build-tools/xaprepare/xaprepare/Steps/Step_CopyExtraResultFilesForCI.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ void CopyExtraBuildFiles (string destinationRoot, Context context)
6969
filesToCopyPreserveRelative.AddRange (Directory.GetFiles (javaInteropBuildConfigDir, "*.props"));
7070
}
7171

72-
filesToCopyPreserveRelative.AddRange (Directory.GetFiles (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "src", "native", "monodroid"), "*.include.*"));
73-
7472
var buildConfigDir = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "bin", $"Build{context.Configuration}");
7573
if (Directory.Exists (buildConfigDir)) {
7674
foreach (var fileMatch in buildConfigFiles) {

0 commit comments

Comments
 (0)