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

[illink] Ensure we replace the dotnet SDK path in the _ExtraTrimmerArgs for remote builds #16294

Merged
merged 1 commit into from
Oct 8, 2022

Conversation

mauroa
Copy link
Contributor

@mauroa mauroa commented Oct 7, 2022

…gs for remote builds

From net7, the original ILLInk targets are adding a new link attribute pointing to a supressions file inside the ILLink tasks folder, e.g: '--link-attributes "C:\Program Files\dotnet\sdk\7.0.100-rc.2.22477.23\Sdks\Microsoft.NET.ILLink.Tasks\build\6.0_suppressions.xml"'.

For remote builds, we need to replace the original dotnet folder with the XMA dotnet folder in the Mac, so in our override targets we replace this value before passing it to the ILLink task

@mauroa mauroa self-assigned this Oct 7, 2022
@mauroa mauroa added the not-notes-worthy Ignore for release notes label Oct 7, 2022
…gs for remote builds

From net7, the original ILLInk targets are adding a new link attribute pointing to a supressions file inside the ILLink tasks folder, e.g: '--link-attributes "C:\Program Files\dotnet\sdk\7.0.100-rc.2.22477.23\Sdks\Microsoft.NET.ILLink.Tasks\build\6.0_suppressions.xml"'.

For remote builds, we need to replace the original dotnet folder with the XMA dotnet folder in the Mac, so in our override targets we replace this value before passing it to the ILLink task
@dalexsoto
Copy link
Member

/sudo backport release/7.0.1xx-xcode14-rc2

@dalexsoto
Copy link
Member

/sudo backport release/7.0.1xx-rc2

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Backport Job to branch release/7.0.1xx-xcode14-rc2 Created! The magic is happening here

@dalexsoto
Copy link
Member

/sudo backport release/6.0.4xx-xcode14

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Backport Job to branch release/7.0.1xx-rc2 Created! The magic is happening here

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Backport Job to branch release/6.0.4xx-xcode14 Created! The magic is happening here

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Oh no! Backport failed! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6795203 for more details.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Oh no! Backport failed! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6795205 for more details.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Hooray! Backport succeeded! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6795211 for more details.

@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 is empty

Pipeline on Agent
Hash: ff7c0d03552c2e1cc062ac8e90f02f8f8f78639d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1104.Monterey'
Hash: ff7c0d03552c2e1cc062ac8e90f02f8f8f78639d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR 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: ff7c0d03552c2e1cc062ac8e90f02f8f8f78639d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 223 tests passed 🎉

Tests counts

✅ bcl: All 69 tests passed. Html Report (VSDrops) Download
✅ 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 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 23 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: [PR build]

@rolfbjarne rolfbjarne changed the title [illink] Ensure we replace the dotnet SDK path in the _ExtraTrimmerAr… [illink] Ensure we replace the dotnet SDK path in the _ExtraTrimmerArgs for remote builds Oct 8, 2022
@rolfbjarne rolfbjarne merged commit cc8c336 into main Oct 8, 2022
@rolfbjarne rolfbjarne deleted the dev/mag/main branch October 8, 2022 20:40
@mauroa
Copy link
Contributor Author

mauroa commented Oct 10, 2022

/sudo backport release/7.0.1xx-rc2

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Backport Job to branch release/7.0.1xx-rc2 Created! The magic is happening here

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Oh no! Backport failed! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6801407 for more details.

@mauroa
Copy link
Contributor Author

mauroa commented Oct 10, 2022

@dalexsoto @rolfbjarne the backport to release/7.0.1xx-rc2 keep failing :/

@rolfbjarne
Copy link
Member

@mauroa that branch only builds packages for macOS and Mac Catalyst (not iOS) - do we still need this patch in that case?

rolfbjarne pushed a commit that referenced this pull request Oct 10, 2022
…ath in the _ExtraTrimmerArgs for remote builds (#16295)

From net7, the original ILLInk targets are adding a new link attribute pointing to a supressions file inside the ILLink tasks folder, e.g: '--link-attributes "C:\Program Files\dotnet\sdk\7.0.100-rc.2.22477.23\Sdks\Microsoft.NET.ILLink.Tasks\build\6.0_suppressions.xml"'.

For remote builds, we need to replace the original dotnet folder with the XMA dotnet folder in the Mac, so in our override targets we replace this value before passing it to the ILLink task

Backport of #16294

Co-authored-by: Mauro Agnoletti <[email protected]>
@rolfbjarne
Copy link
Member

/sudo backport release/7.0.1xx-xcode14-rc2

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Backport Job to branch release/7.0.1xx-xcode14-rc2 Created! The magic is happening here

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Oh no! Backport failed! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6806668 for more details.

rolfbjarne pushed a commit to rolfbjarne/xamarin-macios that referenced this pull request Oct 11, 2022
…DK path in the _ExtraTrimmerArgs for remote builds.

From net7, the original ILLInk targets are adding a new link attribute pointing to a supressions file inside the ILLink tasks folder, e.g: '--link-attributes "C:\Program Files\dotnet\sdk\7.0.100-rc.2.22477.23\Sdks\Microsoft.NET.ILLink.Tasks\build\6.0_suppressions.xml"'.

For remote builds, we need to replace the original dotnet folder with the XMA dotnet folder in the Mac, so in our override targets we replace this value before passing it to the ILLink task

Backport of xamarin#16294.
rolfbjarne added a commit that referenced this pull request Oct 11, 2022
…DK path in the _ExtraTrimmerArgs for remote builds. (#16311)

From net7, the original ILLInk targets are adding a new link attribute pointing to a supressions file inside the ILLink tasks folder, e.g: '--link-attributes "C:\Program Files\dotnet\sdk\7.0.100-rc.2.22477.23\Sdks\Microsoft.NET.ILLink.Tasks\build\6.0_suppressions.xml"'.

For remote builds, we need to replace the original dotnet folder with the XMA dotnet folder in the Mac, so in our override targets we replace this value before passing it to the ILLink task

Backport of #16294.

Co-authored-by: Mauro Agnoletti <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-notes-worthy Ignore for release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants