Skip to content

Commit d72e109

Browse files
[tests] fix TestResolveToolsExists test (#10490)
Failing with: System.IO.DirectoryNotFoundException : Could not find a part of the path 'C:\a_work\1\s\bin\Release\dotnet\packs\Microsoft.Android.Ref.36.0'. This was introduced in 35d471e, but since the PR was from a fork we missed this one.
1 parent f4c6455 commit d72e109

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/TestEnvironment.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ public static bool IsLinux {
7474
/// </summary>
7575
public static string MonoAndroidFrameworkDirectory {
7676
get {
77-
var rootRefDir = Directory.GetDirectories (Path.Combine (DotNetPreviewPacksDirectory, $"Microsoft.Android.Ref.{XABuildConfig.AndroidDefaultTargetDotnetApiLevel}")).LastOrDefault ();
77+
var targetPlatform = XABuildConfig.AndroidDefaultTargetDotnetApiLevel;
78+
var versionString = targetPlatform.Minor == 0 ? $"{targetPlatform.Major}" : $"{targetPlatform.Major}.{targetPlatform.Minor}";
79+
var rootRefDir = Directory.GetDirectories (Path.Combine (DotNetPreviewPacksDirectory, $"Microsoft.Android.Ref.{versionString}")).LastOrDefault ();
7880
if (!Directory.Exists (rootRefDir)) {
7981
throw new DirectoryNotFoundException ($"Unable to locate Microsoft.Android.Ref.");
8082
}

0 commit comments

Comments
 (0)