Skip to content
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.

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

[Build] Update builds, remove submodule, update AssemblyInfo with GitInfo #6068

Merged
merged 9 commits into from May 22, 2019

Conversation

rmarinho
Copy link
Member

@rmarinho rmarinho commented May 2, 2019

Description of Change

  • Remove Xamarin.Forms.Build submodule
  • Use GitInfo for Assembly version Metadata

Using msbuild and GitInfo to set the AssemblyVersion and the package name.

All projects will have the right information related to the commit and build from azdo.

The sdk projects support out of the box the GenerateAssemblyInfo, for the other "old" projects we use the Nuget MSBuild.GenerateAssemblyInfo

Issues Resolved

API Changes

None

Platforms Affected

  • Core/XAML (all platforms)
  • iOS
  • Android
  • UWP

Behavioral/Visual Changes

None

Before/After Screenshots

Not applicable

Testing Procedure

PR Checklist

  • Has automated tests
  • Rebased on top of the target branch at time of PR
  • Changes adhere to coding standard

Directory.Build.targets Outdated Show resolved Hide resolved
Directory.Build.targets Outdated Show resolved Hide resolved
Copy link
Contributor

@kzu kzu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggested a bunch of changes via individual comments. The approach can be simplified significantly by relying on the SDK-style project automatic assembly info generation, which the copied targets are intended to support/extend. See https://github.com/dotnet/sdk/blob/master/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets

@samhouts samhouts added this to In Progress in v3.6.0 May 2, 2019
@rmarinho rmarinho changed the title [Build] Update builds, remove submodule [Build] Update builds, remove submodule, update AssemblyInfo with GitInfo May 3, 2019
azure-pipelines.yml Outdated Show resolved Hide resolved
@rmarinho rmarinho marked this pull request as ready for review May 7, 2019 17:10
Directory.Build.props Show resolved Hide resolved
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: Guid ("d3f9fea6-cce8-4c30-b0d2-197b40c50757")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check with the Tizen guys, but I don't think this will be used as ComVisible is set to false

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yap, you are right. Can remove.

Copy link
Member

@samhouts samhouts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine to me. I discussed this with @StephaneDelcroix, and this works for him, too. If it turns out to be brittle, we can adjust it later as needed.

@PureWeen PureWeen removed their request for review May 21, 2019 00:57
@rmarinho
Copy link
Member Author

Added unit test for the .Core .Xaml .Maps .Build.Tasks.

Need to enable this check also , got some issues with IVT.

Looking at the info we know see :

[assembly: AssemblyMetadata ("Version", "3.6.0")]
[assembly: AssemblyMetadata ("PackageVersion", "3.6.0+0-pr.6068-sha.76dd5d67-azdo.2033")]
[assembly: AssemblyCompany ("Microsoft")]
[assembly: AssemblyConfiguration ("Debug")]
[assembly: AssemblyDescription ("Xamarin Forms Build Task")]
[assembly: AssemblyFileVersion ("3.6.0.0")]
[assembly: AssemblyInformationalVersion ("3.6.0+0-pr.6068-sha.76dd5d67-azdo.2033")]
[assembly: AssemblyProduct ("Xamarin.Forms")]
[assembly: AssemblyTitle ("Xamarin.Forms.Build.Tasks")]
[assembly: AssemblyVersion ("3.6.0.0")]
[assembly: AssemblyTitle ("Xamarin.Forms.Core")]
[assembly: AssemblyMetadata ("Version", "3.6.0")]
[assembly: AssemblyMetadata ("PackageVersion", "3.6.0+0-pr.6068-sha.76dd5d67-azdo.2033")]
[assembly: AssemblyCompany ("Microsoft")]
[assembly: AssemblyProduct ("Xamarin.Forms")]
[assembly: AssemblyConfiguration ("Debug")]
[assembly: AssemblyFileVersion ("3.6.0.0")]
[assembly: AssemblyInformationalVersion ("3.6.0+0-pr.6068-sha.76dd5d67-azdo.2033")]
[assembly: AssemblyVersion ("3.6.0.0")]

Platform side

[assembly: TargetFramework ("Xamarin.iOS,Version=v1.0", FrameworkDisplayName = "Xamarin.iOS")]
[assembly: AssemblyMetadata ("Version", "3.6.0")]
[assembly: AssemblyMetadata ("PackageVersion", "3.6.0+0-pr.6068-sha.76dd5d67-azdo.2033")]
[assembly: AssemblyCompany ("Microsoft")]
[assembly: AssemblyConfiguration ("Debug")]
[assembly: AssemblyDescription ("iOS Backend for Xamarin.Forms")]
[assembly: AssemblyFileVersion ("3.6.0.0")]
[assembly: AssemblyInformationalVersion ("3.6.0+0-pr.6068-sha.76dd5d67-azdo.2033")]
[assembly: AssemblyProduct ("Xamarin.Forms")]
[assembly: AssemblyVersion ("3.6.0.0")]
[assembly: AssemblyTitle ("Xamarin.Forms.Platform.iOS")]
``


@rmarinho rmarinho merged commit 9bc0fc6 into 3.6.0 May 22, 2019
v3.6.0 automation moved this from In Progress to Done May 22, 2019
@samhouts samhouts added this to the 4.0.0 milestone May 29, 2019
@samhouts samhouts added this to Done in v4.0.0 May 29, 2019
@samhouts samhouts deleted the yaml-pr-build branch June 1, 2019 01:34
@samhouts samhouts modified the milestones: 4.0.0, 3.6.0 Jun 20, 2019
@samhouts samhouts removed this from Done in v4.0.0 Jun 20, 2019
@samhouts samhouts added t/enhancement ➕ proposal-open t/housekeeping ♻︎ Internal only changes, won't be included in release notes labels Mar 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
a/maps 🌐 a/visual a/Xaml </> p/Android p/gtk p/iOS 🍎 p/macOS p/Tizen p/UWP p/WPF proposal-open retarget-branch-required PR or associated issues target a milestone. Please target this PR to the matching branch. t/enhancement ➕ t/housekeeping ♻︎ Internal only changes, won't be included in release notes
Projects
No open projects
v3.6.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

7 participants