Skip to content

[build] set $(PackageVersionSuffix) for dotnet/android-tools #10325

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
jonathanpeppers merged 5 commits into from
Jul 23, 2025
Merged

[build] set $(PackageVersionSuffix) for dotnet/android-tools #10325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66f723e
[build] set `$(PackageVersionSuffix)` for dotnet/android-tools
jonathanpeppers Jul 23, 2025
8fe4a21
Update xamarin-android-tools.override.props
jonathanpeppers Jul 23, 2025
f67ed80
Use `TaskFactory="TaskHostFactory"`
jonathanpeppers Jul 23, 2025
b3b0e02
Revert "Use `TaskFactory="TaskHostFactory"`"
jonathanpeppers Jul 23, 2025
1a4477c
Only set android-tools version when packing
jonathanpeppers Jul 23, 2025
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
2 changes: 1 addition & 1 deletion build-tools/create-packs/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Windows.binlog&quot; -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.NET.Sdk.Android.binlog&quot; &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Android.proj&quot;" />
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Templates.binlog&quot; &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Xamarin.Android.Tools.AndroidSdk.binlog&quot; &quot;$(XamarinAndroidSourcePath)external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj&quot;" />
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:IsPacking=true &quot;$(_BinlogPrefix)Xamarin.Android.Tools.AndroidSdk.binlog&quot; &quot;$(XamarinAndroidSourcePath)external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj&quot;" />
<ReplaceFileContents
SourceFile="vs-workload.in.props"
DestinationFile="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\vs-workload.props"
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools
Open in desktop
Submodule xamarin-android-tools updated 1 files
+1 −1 Directory.Build.targets
10 changes: 10 additions & 0 deletions external/xamarin-android-tools.override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project>
<!-- Import $(LibZipSharpVersion) -->
<Import Project="..\Directory.Build.props" />
<Import Project="..\Configuration.props" />
<Import Project="..\build-tools\scripts\XAVersionInfo.targets" />
<PropertyGroup>
<AndroidToolsDisableMultiTargeting>true</AndroidToolsDisableMultiTargeting>
<PackageOutputPath>$(MSBuildThisFileDirectory)..\bin\Build$(Configuration)\nuget-unsigned\</PackageOutputPath>
Expand All @@ -9,4 +11,12 @@
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-061c8b71/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>
<Target Name="_GetXAVersionInfo"
Condition=" '$(IsPacking)' == 'true' "
BeforeTargets="SetVersion"
DependsOnTargets="GetXAVersionInfo">
<PropertyGroup>
<PackageVersionSuffix>-preview.$(PackVersionCommitCount)</PackageVersionSuffix>
</PropertyGroup>
</Target>
</Project>