Skip to content

[build] Update package metadata #9230

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
jonpryor merged 1 commit into from
Aug 20, 2024
Merged

[build] Update package metadata #9230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 1 addition & 19 deletions Documentation/guides/OneDotNet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ see the [net6-samples][net6-samples] repo.

## Package Versioning Scheme

This is the package version scheme: `OS-Major.OS-Minor.InternalRelease[-prereleaseX]+sha.1b2c3d4`.
This is the package version scheme: `OS-Major.OS-Minor.InternalRelease[-prereleaseX].CommitDistance`.

* Major: The highest stable API level, such as 30. On Apple platforms, this is the major OS version.
* Minor: Always 0 for Android. On Apple platforms, this is the minor OS version.
Expand Down Expand Up @@ -327,24 +327,6 @@ This is the package version scheme: `OS-Major.OS-Minor.InternalRelease[-prerelea
referencing `*-android-r.beta.*`
* It's still possible to sign up for all `android-r` builds, by
referencing `*-ci.android-r.*`
* Build metadata: Required Hash
* This is `sha.` + the short commit hash.
* Use the short hash because the long hash is quite long and
cumbersome. This leaves the complete version open for duplication,
but this is extremely unlikely.
* Example: `30.0.100+sha.1a2b3c`
* Example (CI build): `30.0.100-ci.master.1234+sha.1a2b3c`
* Since the build metadata is required for all builds, we're able to
recognize incomplete version numbers and determine if a particular
version string refers to a stable version or not.
* Example: `30.0.100`: incomplete version
* Example: `30.0.100+sha.1a2b3c`: stable
* Example: `30.0.100-ci.d17-0.1234+sha.1a2b3c`: CI build
* Example: `30.0.100-android-r.beta.1+sha.1a2b3c`: official
preview
* Technically it's possible to remove the prerelease part, but
we’d still be able to figure out it’s not a stable version by
using the commit hash.


[0]: https://github.com/dotnet/installer#installers-and-binaries
Expand Down
2 changes: 2 additions & 0 deletions build-tools/create-packs/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageType>DotnetPlatform</PackageType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<OutputPath>$(BootstrapOutputDirectory)nuget-unsigned\</OutputPath>
<GenerateDependencyFile>false</GenerateDependencyFile>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
Expand Down
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 @@ -39,7 +39,7 @@
<Target Name="_GetDefaultPackageVersion"
DependsOnTargets="GetXAVersionInfo" >
<PropertyGroup>
<PackageVersion>$(AndroidPackVersionLong)+sha.$(XAVersionHash)</PackageVersion>
<PackageVersion>$(AndroidPackVersionLong)</PackageVersion>
</PropertyGroup>
</Target>

Expand Down
Binary file added build-tools/create-packs/Icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion build-tools/create-packs/License.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
<PropertyGroup>
<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<PackageProjectUrl>https://github.com/dotnet/android</PackageProjectUrl>
<RepositoryUrl>https://github.com/dotnet/android</RepositoryUrl>
<PackageProjectUrl>https://dot.net</PackageProjectUrl>
<Owners>microsoft,dotnetframework</Owners>
<NuGetLicense Condition="Exists('$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt')">$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt</NuGetLicense>
<NuGetLicense Condition=" '$(NuGetLicense)' == '' or '$(PackageId)' != 'Microsoft.Android.Sdk.$(HostOS)' ">$(XamarinAndroidSourcePath)LICENSE.TXT</NuGetLicense>
<PackageLicenseFile>LICENSE.TXT</PackageLicenseFile>
<PackageIcon>Icon.png</PackageIcon>
<BeforePack>_GetLicense;$(BeforePack)</BeforePack>
</PropertyGroup>
<Target Name="_GetLicense">
Expand All @@ -19,6 +22,7 @@
<ItemGroup>
<_PackageFiles Include="$(IntermediateOutputPath)$(PackageLicenseFile)" PackagePath="\" />
<_PackageFiles Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" PackagePath="\" />
<_PackageFiles Include="$(MSBuildThisFileDirectory)Icon.png" PackagePath="\" />
</ItemGroup>
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.Android.Templates/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Target Name="_GetDefaultPackageVersion"
DependsOnTargets="GetXAVersionInfo" >
<PropertyGroup>
<TemplatePackVersion Condition="'$(TemplatePackVersion)' == ''">$(AndroidPackVersionLong)+sha.$(XAVersionHash)</TemplatePackVersion>
<TemplatePackVersion Condition="'$(TemplatePackVersion)' == ''">$(AndroidPackVersionLong)</TemplatePackVersion>
<PackageVersion>$(TemplatePackVersion)</PackageVersion>
</PropertyGroup>
</Target>
Expand Down