[build] Remove Step_PrepareProps; fold values into eng/Versions.props

Configuration.props

@@ -7,7 +7,6 @@
       Project="$(MSBuildThisFileDirectory)Configuration.OperatingSystem.props"
       Condition=" Exists('$(MSBuildThisFileDirectory)Configuration.OperatingSystem.props') And '$(DoNotLoadOSProperties)' != 'True' "
   />
-  <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />
   <Import
       Project="$(MSBuildThisFileDirectory)Build$(Configuration)\Configuration.Generated.props"
       Condition="Exists('$(MSBuildThisFileDirectory)Build$(Configuration)\Configuration.Generated.props')"

Directory.Build.props

@@ -1,5 +1,7 @@
 <Project>
 
+  <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />
+
   <PropertyGroup>
     <DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
     <DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
@@ -31,13 +33,6 @@
 
   <PropertyGroup>
     <ProductVersion>16.0.0</ProductVersion>
-    <!-- NuGet package version numbers. See Documentation/guides/OneDotNet.md.
-         Rules:
-         * Major/Minor match Android stable API level, such as 30.0 for API 30.
-         * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
-    -->
-    <AndroidPackVersion>37.0.0</AndroidPackVersion>
-    <AndroidPackVersionSuffix>preview.6</AndroidPackVersionSuffix>
     <!-- Final value set by GetXAVersionInfo target -->
     <IsStableBuild>false</IsStableBuild>
   </PropertyGroup>
@@ -46,7 +41,6 @@
   <PropertyGroup>
     <LibZipSharpVersion>3.3.0</LibZipSharpVersion>
     <MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
-    <MonoCecilVersion>0.11.5</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
     <NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>
     <LZ4PackageVersion>1.3.6</LZ4PackageVersion>

Documentation/guides/HowToBranch.md

@@ -32,10 +32,10 @@ darc add-default-channel --channel ".NET 10.0.1xx SDK Preview 42" --branch "rele
 See [eng/README.md][2] for details on `darc` commands.
 
 6. Open a PR to `dotnet/android/main`, such that
-   `$(AndroidPackVersionSuffix)` in `Directory.Build.props` is
+   `$(AndroidPackVersionSuffix)` in `eng/Versions.props` is
    incremented to the *next* version: `preview.43`. You may also need
-   to update `$(AndroidPackVersion)` if `main` needs to target a new
-   .NET version band.
+   to update `$(AndroidPackVersion)` in `eng/Versions.props` if `main`
+   needs to target a new .NET version band.
 
 Note that release candidates will use values such as `rc.1`, `rc.2`, etc.
 

build-tools/scripts/XAVersionInfo.targets

@@ -53,7 +53,7 @@
       <Output TaskParameter="CommitCount"             PropertyName="XAVersionCommitCount"   Condition=" '$(XAVersionCommitCount)' == '' " />
     </GitCommitsInRange>
     <GitBlame
-        FileName="Directory.Build.props"
+        FileName="eng/Versions.props"
         LineFilter="&lt;AndroidPackVersion&gt;"
         WorkingDirectory="$(XamarinAndroidSourcePath)"
         ToolPath="$(GitToolPath)"

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

@@ -165,7 +165,6 @@ public static partial class Paths
 			public static string ConfigurationPropsGeneratedPath     => GetCachedPath (ref configurationPropsGeneratedPath, ()     => Path.Combine (BuildBinDir, "Configuration.Generated.props"));
 			public static string MonoAndroidFrameworksSubDir         = Path.Combine ("xbuild-frameworks", "MonoAndroid");
 			public static string MonoAndroidFrameworksRootDir        => GetCachedPath (ref monoAndroidFrameworksRootDir, ()        => Path.Combine (XAInstallPrefix, MonoAndroidFrameworksSubDir));
-			public static string InstallMSBuildDir                   => GetCachedPath (ref installMSBuildDir, ()                   => ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftAndroidSdkOutDir));
 
 			// .NET 6+
 			public static string NetcoreAppRuntimeAndroidARM         => GetCachedPath (ref netcoreAppRuntimeAndroidARM, () => GetNetcoreAppRuntimePath (ctx, "arm"));
@@ -241,7 +240,6 @@ static string GetCachedPath (ref string? variable, Func<string> creator)
 			static string? testBinDir;
 			static string? buildBinDir;
 			static string? binDir;
-			static string? installMSBuildDir;
 			static string? monoAndroidFrameworksRootDir;
 			static string? externalJavaInteropDir;
 			static string? configurationPropsGeneratedPath;

build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

@@ -20,7 +20,6 @@ protected override void AddSteps (Context context)
 
 			Steps.Add (new Step_InstallDotNetPreview ());
 			Steps.Add (new Step_GenerateFiles (atBuildStart: true));
-			Steps.Add (new Step_PrepareProps ());
 			Steps.Add (new Step_GenerateCGManifest ());
 		}
 

eng/Versions.props

@@ -33,4 +33,17 @@
     <!-- NOTE: sometimes we hardcode this when transitioning to new version bands -->
     <DotNetAndroidManifestVersionBand>$(DotNetPreviewVersionBand)</DotNetAndroidManifestVersionBand>
   </PropertyGroup>
+  <PropertyGroup>
+    <!-- Properties shared between dotnet/android and the Java.Interop submodule.
+         Imported by Directory.Build.props, Configuration.props, and
+         external/Java.Interop.override.props. -->
+    <MonoCecilVersion>0.11.5</MonoCecilVersion>
+    <!-- NuGet package version numbers. See Documentation/guides/OneDotNet.md.
+         Rules:
+         * Major/Minor match Android stable API level, such as 30.0 for API 30.
+         * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
+    -->
+    <AndroidPackVersion>37.0.0</AndroidPackVersion>
+    <AndroidPackVersionSuffix>preview.6</AndroidPackVersionSuffix>
+  </PropertyGroup>
 </Project>

external/Java.Interop.override.props

@@ -1,11 +1,29 @@
 <Project>
 
+  <!-- Pull in dotnet/android's shared versions so Java.Interop sees the same
+       values (MonoCecilVersion, AndroidPackVersion). This file is restricted
+       to collision-free package-version-shaped properties; importing the full
+       Directory.Build.props/Configuration.props chain would overwrite
+       Java.Interop's own DotNetTargetFrameworkVersion. -->
+  <Import Project="$(MSBuildThisFileDirectory)..\eng\Versions.props" />
+
   <PropertyGroup>
     <XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
     <Standalone>True</Standalone>
+    <_XamarinAndroidCecilVersion>$(MonoCecilVersion)</_XamarinAndroidCecilVersion>
     <RestoreAdditionalProjectSources>
       https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-2b2a06c8/nuget/v3/index.json;
     </RestoreAdditionalProjectSources>
   </PropertyGroup>
 
+  <!-- Mirrors the OS-conditioned $(MicrosoftAndroidSdkPackName) block in
+       dotnet/android's Configuration.props, which we cannot import here
+       without TFM collisions. -->
+  <PropertyGroup>
+    <_MicrosoftAndroidSdkPackName Condition="$([MSBuild]::IsOSPlatform('windows'))">Microsoft.Android.Sdk.Windows</_MicrosoftAndroidSdkPackName>
+    <_MicrosoftAndroidSdkPackName Condition="$([MSBuild]::IsOSPlatform('linux'))">Microsoft.Android.Sdk.Linux</_MicrosoftAndroidSdkPackName>
+    <_MicrosoftAndroidSdkPackName Condition="$([MSBuild]::IsOSPlatform('osx'))">Microsoft.Android.Sdk.Darwin</_MicrosoftAndroidSdkPackName>
+    <UtilityOutputFullPathCoreApps>$(MSBuildThisFileDirectory)..\bin\$(Configuration)\lib\packs\$(_MicrosoftAndroidSdkPackName)\$(AndroidPackVersion)\tools\</UtilityOutputFullPathCoreApps>
+  </PropertyGroup>
+
 </Project>

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

@@ -734,6 +734,7 @@ string PrepareProject (string testName, bool isRelease, AndroidRuntime runtime)
 			CopyRecursively (TestProjectRootDirectory, temporaryProjectPath, ignore);
 			CopyRecursively (CommonSampleLibraryRootDirectory, Path.Combine (tempRoot, CommonSampleLibraryName), ignore);
 			CopyFile (Path.Combine (XABuildPaths.TopDirectory, "Directory.Build.props"), Path.Combine (tempRoot, "Directory.Build.props" ));
+			CopyFile (Path.Combine (XABuildPaths.TopDirectory, "eng", "Versions.props"), Path.Combine (tempRoot, "eng", "Versions.props"));
 			var project = new XamarinAndroidApplicationProject ();
 			project.CopyNuGetConfig (Path.Combine (tempRoot, "NuGet.config"));