diff --git a/Configuration.props b/Configuration.props
index faac18fa377..4af1c485c98 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -7,7 +7,6 @@
Project="$(MSBuildThisFileDirectory)Configuration.OperatingSystem.props"
Condition=" Exists('$(MSBuildThisFileDirectory)Configuration.OperatingSystem.props') And '$(DoNotLoadOSProperties)' != 'True' "
/>
-
+
+
true
11.0
@@ -31,13 +33,6 @@
16.0.0
-
- 37.0.0
- preview.6
false
@@ -46,7 +41,6 @@
3.3.0
1.0.0
- 0.11.5
13.0.3
5.4.0
1.3.6
diff --git a/Documentation/guides/HowToBranch.md b/Documentation/guides/HowToBranch.md
index 1c3eced2df0..559433559d9 100644
--- a/Documentation/guides/HowToBranch.md
+++ b/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.
diff --git a/build-tools/scripts/Configuration.Java.Interop.Override.in.props b/build-tools/scripts/Configuration.Java.Interop.Override.in.props
deleted file mode 100644
index 76ac996a267..00000000000
--- a/build-tools/scripts/Configuration.Java.Interop.Override.in.props
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- <_XamarinAndroidCecilVersion>@MonoCecilVersion@
- $(MSBuildThisFileDirectory)..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\
- @MicrosoftAndroidSdkOutDir@
- $(MSBuildThisFileDirectory)..\..\external\xamarin-android-tools
-
-
diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets
index 72083c497a4..72cd05dcd46 100644
--- a/build-tools/scripts/XAVersionInfo.targets
+++ b/build-tools/scripts/XAVersionInfo.targets
@@ -53,7 +53,7 @@
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 creator)
static string? testBinDir;
static string? buildBinDir;
static string? binDir;
- static string? installMSBuildDir;
static string? monoAndroidFrameworksRootDir;
static string? externalJavaInteropDir;
static string? configurationPropsGeneratedPath;
diff --git a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs
index 560994a1505..862c752e07a 100644
--- a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs
+++ b/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 ());
}
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs
deleted file mode 100644
index 75da0887772..00000000000
--- a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace Xamarin.Android.Prepare
-{
- class Step_PrepareProps : Step
- {
- const ConsoleColor StepColor = ConsoleColor.White;
-
- public Step_PrepareProps ()
- : base ("Preparing property files")
- {}
-
-#pragma warning disable CS1998
- protected override async Task Execute (Context context)
- {
- string javaInteropDir = Configurables.Paths.ExternalJavaInteropDir;
-
- LogStep (context, "Configuring Java.Interop property overrides");
- var jiOverrideProps = new GeneratedPlaceholdersFile (
- new Dictionary (StringComparer.Ordinal) {
- { "@MonoCecilVersion@", Context.Instance.Properties.GetRequiredValue (KnownProperties.MonoCecilVersion) },
- { "@MicrosoftAndroidSdkOutDir@", Configurables.Paths.InstallMSBuildDir }
- },
- Path.Combine (Configurables.Paths.BuildToolsScriptsDir, "Configuration.Java.Interop.Override.in.props"),
- Path.Combine (javaInteropDir, "Configuration.Override.props")
- );
- jiOverrideProps.Generate (context);
-
- return true;
- }
-
- void LogStep (Context context, string step)
- {
- Log.StatusLine ($" {context.Characters.Bullet} {step}", StepColor);
- }
-
-#pragma warning restore CS1998
- }
-}
diff --git a/eng/Versions.props b/eng/Versions.props
index f1e542936ce..b25e4f62345 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,4 +33,17 @@
$(DotNetPreviewVersionBand)
+
+
+ 0.11.5
+
+ 37.0.0
+ preview.6
+
diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props
index 530fe2d9d48..1741aae7ac0 100644
--- a/external/Java.Interop.override.props
+++ b/external/Java.Interop.override.props
@@ -1,11 +1,29 @@
+
+
+
$(MSBuildThisFileDirectory)xamarin-android-tools
True
+ <_XamarinAndroidCecilVersion>$(MonoCecilVersion)
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-2b2a06c8/nuget/v3/index.json;
+
+
+ <_MicrosoftAndroidSdkPackName Condition="$([MSBuild]::IsOSPlatform('windows'))">Microsoft.Android.Sdk.Windows
+ <_MicrosoftAndroidSdkPackName Condition="$([MSBuild]::IsOSPlatform('linux'))">Microsoft.Android.Sdk.Linux
+ <_MicrosoftAndroidSdkPackName Condition="$([MSBuild]::IsOSPlatform('osx'))">Microsoft.Android.Sdk.Darwin
+ $(MSBuildThisFileDirectory)..\bin\$(Configuration)\lib\packs\$(_MicrosoftAndroidSdkPackName)\$(AndroidPackVersion)\tools\
+
+
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs
index f24b67f3599..c1af443792c 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs
+++ b/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"));