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.

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

Jump to bottom

[msbuild] Remove usage of GitInfo in Xamarin.Messaging.Build. #19935

Merged
merged 1 commit into from
Jan 29, 2024
Merged

[msbuild] Remove usage of GitInfo in Xamarin.Messaging.Build. #19935

merged 1 commit into from
Jan 29, 2024

Conversation

rolfbjarne
Copy link
Member

  • The calculation GitInfo does is horribly wrong for us - it seems to pick a
    tag the most recent tag and parse it to pick out a version number:
    • This means for any given release it'll use the previous tag - because we
      don't necessarily tag until after the release build has been committed.
    • It's not a stable version: a build is made (finding one tag), a new tag
      is pushed, and if the same commit is built, it may find the new tag,
      thus creating a new version number.
    • We may have multiple tags for any given commit.
    • The version calculation is also wrong: right now it finds the tag
      xamarin-ios-15.5.0.5-4407-gd45f4e90a6, and comes up with the version
      number 0.5.0.4407.
  • I didn't investigate deeply, but GitInfo also touches .git/index and
    .git/HEAD somehow, which causes us to rebuild stuff.
  • We already have an established way of calculating version numbers and other
    build related information, so use that after extending it a bit.

@rolfbjarne
[msbuild] Remove usage of GitInfo in Xamarin.Messaging.Build.
4cb355a 
* The calculation GitInfo does is horribly wrong for us - it seems to pick a
  tag the most recent tag and parse it to pick out a version number:
	* This means for any given release it'll use the previous tag - because we
	  don't necessarily tag until after the release build has been committed.
	* It's not a stable version: a build is made (finding one tag), a new tag
	  is pushed, and if the same commit is built, it may find the new tag,
	  thus creating a new version number.
	* We may have multiple tags for any given commit.
	* The version calculation is also wrong: right now it finds the tag
	  `xamarin-ios-15.5.0.5-4407-gd45f4e90a6`, and comes up with the version
	  number 0.5.0.4407.
* I didn't investigate deeply, but GitInfo also touches .git/index and
  .git/HEAD somehow, which causes us to rebuild stuff.
* We already have an established way of calculating version numbers and other
  build related information, so use that after extending it a bit.
rolfbjarne added a commit to rolfbjarne/xamarin-macios that referenced this pull request Jan 26, 2024
@rolfbjarne
[msbuild] Explicitly exclude any GitInfo package references we've pul…
4beeae7 
…led in.

This is required to avoid GitInfo until these two PRs have been merged and
flowed to us:

* xamarin/XamarinVS#14408
* xamarin/Xamarin.Messaging#700

See also xamarin#19935.
@rolfbjarne rolfbjarne mentioned this pull request Jan 26, 2024
Merged
@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build] Tests on macOS M1 - Mac Ventura (13.0) passed 💻

✅ All tests on macOS M1 - Mac Ventura (13.0) passed.

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻

✅ All tests on macOS M1 - Mac Big Sur (11.5) passed.

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 4cb355a32fc50a5f17025b12d4d334962b11dae4 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
Legacy Xamarin (stable) vs .NET

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 4cb355a32fc50a5f17025b12d4d334962b11dae4 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 166 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 6 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 41 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 4cb355a32fc50a5f17025b12d4d334962b11dae4 [PR build]

rolfbjarne added a commit that referenced this pull request Jan 29, 2024
@rolfbjarne
[msbuild] Explicitly exclude any GitInfo package references we've pul…
15c2d80 
…led in. (#19937)

This is required to avoid GitInfo until these two PRs have been merged
and flowed to us:

* xamarin/XamarinVS#14408
* xamarin/Xamarin.Messaging#700

See also #19935.
@rolfbjarne rolfbjarne merged commit d199292 into xamarin:main Jan 29, 2024
68 checks passed
@rolfbjarne rolfbjarne deleted the msbuild-remove-gitinfo branch January 29, 2024 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalexsoto dalexsoto dalexsoto approved these changes

@mauroa mauroa mauroa approved these changes

@haritha-mohan haritha-mohan haritha-mohan approved these changes

@emaf emaf Awaiting requested review from emaf emaf is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rolfbjarne @vs-mobiletools-engineering-service2 @dalexsoto @mauroa @haritha-mohan