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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonrozsival merged 7 commits into from
Jun 11, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80cfaf1
[build] Remove Step_PrepareProps; fold values into eng/Versions.props
jonathanpeppers Jun 9, 2026
3ca0e9a
[build] Drop sentinel; single Versions.props import site
jonathanpeppers Jun 9, 2026
1393b8e
[build] Move MicrosoftAndroidSdkPackName back to Configuration.props
jonathanpeppers Jun 9, 2026
82c5215
[build] Move AndroidPackVersionSuffix to eng/Versions.props
jonathanpeppers Jun 9, 2026
2152b5f
Merge remote-tracking branch 'origin/main' into jonathanpeppers/remov…
jonathanpeppers Jun 10, 2026
d459a69
[tests] Also copy eng/Versions.props in CodeBehindTests temp setup
jonathanpeppers Jun 10, 2026
3da357e
Restore external/Java.Interop submodule pointer to b881d21
jonathanpeppers Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Configuration.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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')"
Expand Down
10 changes: 2 additions & 8 deletions Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<Project>

<Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />

<PropertyGroup>
<DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
<DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
Expand DownExpand Up@@ -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>
Expand All@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Documentation/guides/HowToBranch.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down
9 changes: 0 additions & 9 deletions build-tools/scripts/Configuration.Java.Interop.Override.in.props
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion build-tools/scripts/XAVersionInfo.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)"
Expand Down
2 changes: 0 additions & 2 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));
Expand DownExpand Up@@ -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;
Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 ());
}

Expand Down
42 changes: 0 additions & 42 deletions build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
18 changes: 18 additions & 0 deletions external/Java.Interop.override.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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>
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[build] Remove Step_PrepareProps; fold values into eng/Versions.props#11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jun 11, 2026
 Merged


[build] Remove Step_PrepareProps; fold values into eng/Versions.props
#11613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
80cfaf1

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


jonathanpeppers Jun 9, 2026
3ca0e9a

[build] Drop sentinel; single Versions.props import site


jonathanpeppers Jun 9, 2026
1393b8e

[build] Move MicrosoftAndroidSdkPackName back to Configuration.props


jonathanpeppers Jun 9, 2026
82c5215

[build] Move AndroidPackVersionSuffix to eng/Versions.props


jonathanpeppers Jun 9, 2026
2152b5f

Merge remote-tracking branch 'origin/main' into jonathanpeppers/remov…


jonathanpeppers Jun 10, 2026
d459a69

[tests] Also copy eng/Versions.props in CodeBehindTests temp setup


jonathanpeppers Jun 10, 2026
3da357e

Restore external/Java.Interop submodule pointer to b881d21


jonathanpeppers Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
Configuration.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')"
Expand Down

10 changes: 2 additions & 8 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<Project>

 <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />

 <PropertyGroup>
 <DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
 <DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
Expand DownExpand Up@@ -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>
Expand All@@ -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>
Expand Down

6 changes: 3 additions & 3 deletions
Documentation/guides/HowToBranch.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down

9 changes: 0 additions & 9 deletions
build-tools/scripts/Configuration.Java.Interop.Override.in.props

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
build-tools/scripts/XAVersionInfo.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)"
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));
Expand DownExpand Up@@ -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;
Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 ());
 }

Expand Down

42 changes: 0 additions & 42 deletions
build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs

View file


Open in desktop


This file was deleted.


13 changes: 13 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

18 changes: 18 additions & 0 deletions
external/Java.Interop.override.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>

1 change: 1 addition & 0 deletions
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[build] Remove Step_PrepareProps; fold values into eng/Versions.props#11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jun 11, 2026
 Merged


[build] Remove Step_PrepareProps; fold values into eng/Versions.props
#11613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
80cfaf1

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


jonathanpeppers Jun 9, 2026
3ca0e9a

[build] Drop sentinel; single Versions.props import site


jonathanpeppers Jun 9, 2026
1393b8e

[build] Move MicrosoftAndroidSdkPackName back to Configuration.props


jonathanpeppers Jun 9, 2026
82c5215

[build] Move AndroidPackVersionSuffix to eng/Versions.props


jonathanpeppers Jun 9, 2026
2152b5f

Merge remote-tracking branch 'origin/main' into jonathanpeppers/remov…


jonathanpeppers Jun 10, 2026
d459a69

[tests] Also copy eng/Versions.props in CodeBehindTests temp setup


jonathanpeppers Jun 10, 2026
3da357e

Restore external/Java.Interop submodule pointer to b881d21


jonathanpeppers Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
Configuration.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')"
Expand Down

10 changes: 2 additions & 8 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<Project>

 <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />

 <PropertyGroup>
 <DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
 <DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
Expand DownExpand Up@@ -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>
Expand All@@ -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>
Expand Down

6 changes: 3 additions & 3 deletions
Documentation/guides/HowToBranch.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down

9 changes: 0 additions & 9 deletions
build-tools/scripts/Configuration.Java.Interop.Override.in.props

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
build-tools/scripts/XAVersionInfo.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)"
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));
Expand DownExpand Up@@ -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;
Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 ());
 }

Expand Down

42 changes: 0 additions & 42 deletions
build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs

View file


Open in desktop


This file was deleted.


13 changes: 13 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

18 changes: 18 additions & 0 deletions
external/Java.Interop.override.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>

1 change: 1 addition & 0 deletions
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[build] Remove Step_PrepareProps; fold values into eng/Versions.props#11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jun 11, 2026
 Merged


[build] Remove Step_PrepareProps; fold values into eng/Versions.props
#11613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
80cfaf1

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


jonathanpeppers Jun 9, 2026
3ca0e9a

[build] Drop sentinel; single Versions.props import site


jonathanpeppers Jun 9, 2026
1393b8e

[build] Move MicrosoftAndroidSdkPackName back to Configuration.props


jonathanpeppers Jun 9, 2026
82c5215

[build] Move AndroidPackVersionSuffix to eng/Versions.props


jonathanpeppers Jun 9, 2026
2152b5f

Merge remote-tracking branch 'origin/main' into jonathanpeppers/remov…


jonathanpeppers Jun 10, 2026
d459a69

[tests] Also copy eng/Versions.props in CodeBehindTests temp setup


jonathanpeppers Jun 10, 2026
3da357e

Restore external/Java.Interop submodule pointer to b881d21


jonathanpeppers Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
Configuration.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')"
Expand Down

10 changes: 2 additions & 8 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<Project>

 <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />

 <PropertyGroup>
 <DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
 <DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
Expand DownExpand Up@@ -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>
Expand All@@ -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>
Expand Down

6 changes: 3 additions & 3 deletions
Documentation/guides/HowToBranch.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down

9 changes: 0 additions & 9 deletions
build-tools/scripts/Configuration.Java.Interop.Override.in.props

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
build-tools/scripts/XAVersionInfo.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)"
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));
Expand DownExpand Up@@ -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;
Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 ());
 }

Expand Down

42 changes: 0 additions & 42 deletions
build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs

View file


Open in desktop


This file was deleted.


13 changes: 13 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

18 changes: 18 additions & 0 deletions
external/Java.Interop.override.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>

1 change: 1 addition & 0 deletions
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[build] Remove Step_PrepareProps; fold values into eng/Versions.props#11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jun 11, 2026
 Merged


[build] Remove Step_PrepareProps; fold values into eng/Versions.props
#11613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
80cfaf1

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


jonathanpeppers Jun 9, 2026
3ca0e9a

[build] Drop sentinel; single Versions.props import site


jonathanpeppers Jun 9, 2026
1393b8e

[build] Move MicrosoftAndroidSdkPackName back to Configuration.props


jonathanpeppers Jun 9, 2026
82c5215

[build] Move AndroidPackVersionSuffix to eng/Versions.props


jonathanpeppers Jun 9, 2026
2152b5f

Merge remote-tracking branch 'origin/main' into jonathanpeppers/remov…


jonathanpeppers Jun 10, 2026
d459a69

[tests] Also copy eng/Versions.props in CodeBehindTests temp setup


jonathanpeppers Jun 10, 2026
3da357e

Restore external/Java.Interop submodule pointer to b881d21


jonathanpeppers Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
Configuration.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')"
Expand Down

10 changes: 2 additions & 8 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<Project>

 <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />

 <PropertyGroup>
 <DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
 <DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
Expand DownExpand Up@@ -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>
Expand All@@ -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>
Expand Down

6 changes: 3 additions & 3 deletions
Documentation/guides/HowToBranch.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down

9 changes: 0 additions & 9 deletions
build-tools/scripts/Configuration.Java.Interop.Override.in.props

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
build-tools/scripts/XAVersionInfo.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)"
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));
Expand DownExpand Up@@ -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;
Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 ());
 }

Expand Down

42 changes: 0 additions & 42 deletions
build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs

View file


Open in desktop


This file was deleted.


13 changes: 13 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

18 changes: 18 additions & 0 deletions
external/Java.Interop.override.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>

1 change: 1 addition & 0 deletions
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[build] Remove Step_PrepareProps; fold values into eng/Versions.props#11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jun 11, 2026
 Merged


[build] Remove Step_PrepareProps; fold values into eng/Versions.props
#11613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
80cfaf1

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


jonathanpeppers Jun 9, 2026
3ca0e9a

[build] Drop sentinel; single Versions.props import site


jonathanpeppers Jun 9, 2026
1393b8e

[build] Move MicrosoftAndroidSdkPackName back to Configuration.props


jonathanpeppers Jun 9, 2026
82c5215

[build] Move AndroidPackVersionSuffix to eng/Versions.props


jonathanpeppers Jun 9, 2026
2152b5f

Merge remote-tracking branch 'origin/main' into jonathanpeppers/remov…


jonathanpeppers Jun 10, 2026
d459a69

[tests] Also copy eng/Versions.props in CodeBehindTests temp setup


jonathanpeppers Jun 10, 2026
3da357e

Restore external/Java.Interop submodule pointer to b881d21


jonathanpeppers Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
Configuration.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')"
Expand Down

10 changes: 2 additions & 8 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<Project>

 <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />

 <PropertyGroup>
 <DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
 <DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
Expand DownExpand Up@@ -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>
Expand All@@ -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>
Expand Down

6 changes: 3 additions & 3 deletions
Documentation/guides/HowToBranch.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down

9 changes: 0 additions & 9 deletions
build-tools/scripts/Configuration.Java.Interop.Override.in.props

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
build-tools/scripts/XAVersionInfo.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)"
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));
Expand DownExpand Up@@ -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;
Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 ());
 }

Expand Down

42 changes: 0 additions & 42 deletions
build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs

View file


Open in desktop


This file was deleted.


13 changes: 13 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

18 changes: 18 additions & 0 deletions
external/Java.Interop.override.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>

1 change: 1 addition & 0 deletions
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[build] Remove Step_PrepareProps; fold values into eng/Versions.props#11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jun 11, 2026
 Merged


[build] Remove Step_PrepareProps; fold values into eng/Versions.props
#11613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
80cfaf1

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


jonathanpeppers Jun 9, 2026
3ca0e9a

[build] Drop sentinel; single Versions.props import site


jonathanpeppers Jun 9, 2026
1393b8e

[build] Move MicrosoftAndroidSdkPackName back to Configuration.props


jonathanpeppers Jun 9, 2026
82c5215

[build] Move AndroidPackVersionSuffix to eng/Versions.props


jonathanpeppers Jun 9, 2026
2152b5f

Merge remote-tracking branch 'origin/main' into jonathanpeppers/remov…


jonathanpeppers Jun 10, 2026
d459a69

[tests] Also copy eng/Versions.props in CodeBehindTests temp setup


jonathanpeppers Jun 10, 2026
3da357e

Restore external/Java.Interop submodule pointer to b881d21


jonathanpeppers Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
Configuration.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')"
Expand Down

10 changes: 2 additions & 8 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<Project>

 <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />

 <PropertyGroup>
 <DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
 <DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
Expand DownExpand Up@@ -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>
Expand All@@ -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>
Expand Down

6 changes: 3 additions & 3 deletions
Documentation/guides/HowToBranch.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down

9 changes: 0 additions & 9 deletions
build-tools/scripts/Configuration.Java.Interop.Override.in.props

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
build-tools/scripts/XAVersionInfo.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)"
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));
Expand DownExpand Up@@ -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;
Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 ());
 }

Expand Down

42 changes: 0 additions & 42 deletions
build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs

View file


Open in desktop


This file was deleted.


13 changes: 13 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

18 changes: 18 additions & 0 deletions
external/Java.Interop.override.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>

1 change: 1 addition & 0 deletions
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[build] Remove Step_PrepareProps; fold values into eng/Versions.props#11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

simonrozsival
merged 7 commits into

from

Jun 11, 2026
 Merged


[build] Remove Step_PrepareProps; fold values into eng/Versions.props
#11613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
80cfaf1

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


jonathanpeppers Jun 9, 2026
3ca0e9a

[build] Drop sentinel; single Versions.props import site


jonathanpeppers Jun 9, 2026
1393b8e

[build] Move MicrosoftAndroidSdkPackName back to Configuration.props


jonathanpeppers Jun 9, 2026
82c5215

[build] Move AndroidPackVersionSuffix to eng/Versions.props


jonathanpeppers Jun 9, 2026
2152b5f

Merge remote-tracking branch 'origin/main' into jonathanpeppers/remov…


jonathanpeppers Jun 10, 2026
d459a69

[tests] Also copy eng/Versions.props in CodeBehindTests temp setup


jonathanpeppers Jun 10, 2026
3da357e

Restore external/Java.Interop submodule pointer to b881d21


jonathanpeppers Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
Configuration.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')"
Expand Down

10 changes: 2 additions & 8 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
<Project>

 <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />

 <PropertyGroup>
 <DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
 <DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
Expand DownExpand Up@@ -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>
Expand All@@ -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>
Expand Down

6 changes: 3 additions & 3 deletions
Documentation/guides/HowToBranch.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand Down

9 changes: 0 additions & 9 deletions
build-tools/scripts/Configuration.Java.Interop.Override.in.props

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
build-tools/scripts/XAVersionInfo.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)"
Expand Down

2 changes: 0 additions & 2 deletions
build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));
Expand DownExpand Up@@ -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;
Expand Down

1 change: 0 additions & 1 deletion
build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 ());
 }

Expand Down

42 changes: 0 additions & 42 deletions
build-tools/xaprepare/xaprepare/Steps/Step_PrepareProps.cs

View file


Open in desktop


This file was deleted.


13 changes: 13 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

18 changes: 18 additions & 0 deletions
external/Java.Interop.override.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>

1 change: 1 addition & 0 deletions
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"));

Expand Down
Loading