Skip to content

[msbuild] Get RecursiveDir directory name only if it isn't empty#17988

Merged
dalexsoto merged 1 commit intomainfrom
dev/ema/recursivedir
Apr 6, 2023
Merged

[msbuild] Get RecursiveDir directory name only if it isn't empty#17988
dalexsoto merged 1 commit intomainfrom
dev/ema/recursivedir

Conversation

@emaf
Copy link
Contributor

@emaf emaf commented Apr 6, 2023

If the RecursiveDir metadata is empty, the GetDirectoryName method throws an error because it isn't a valid path. This can happen on VS design time builds.

@emaf
[msbuild] Get RecursiveDir directory name only if it isn't empty
ba8b3ad 
If the `RecursiveDir` metadata is empty, the GetDirectoryName method throws an error because it isn't a valid path. This can happen on VS design time builds.
@emaf emaf requested a review from dalexsoto April 6, 2023 16:10
@dalexsoto
Copy link
Member

dalexsoto commented Apr 6, 2023

/sudo backport xcode14.3

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

Backport Job to branch xcode14.3 Created! The magic is happening here

@dalexsoto

This comment was marked as outdated.

Sign in to view
@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Sign in to view
@dalexsoto
Copy link
Member

dalexsoto commented Apr 6, 2023

/sudo backport release/7.0.2xx-xcode14.3

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

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

Merged
@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

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

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

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

mauroa
mauroa approved these changes Apr 6, 2023
View reviewed changes
dotnet/targets/Xamarin.Shared.Sdk.targets
<_BindingPackagesFromReferencedAssembliesWithDestinationDir Include="@(_BindingPackagesFromReferencedAssemblies)">
<DestinationSubDirectory>$([System.IO.Path]::GetFileName('%(OriginalItemSpec)'))\$([System.IO.Path]::GetDirectoryName('%(RecursiveDir)'))\</DestinationSubDirectory>
<DestinationSubDirectory>$([System.IO.Path]::GetFileName('%(OriginalItemSpec)'))\</DestinationSubDirectory>
<DestinationSubDirectory Condition="'%(RecursiveDir)' != ''">$([System.IO.Path]::GetFileName('%(OriginalItemSpec)'))\$([System.IO.Path]::GetDirectoryName('%(RecursiveDir)'))\</DestinationSubDirectory>
Copy link
Contributor

@mauroa mauroa Apr 6, 2023

Choose a reason for hiding this comment

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

Can you concatenate with $(DestinationSubDirectory) instead of writing the first part again?

Merged
@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

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

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

✅ 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: ba8b3ad3a704e52d3caf92bb8d9d48a5c768f514 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: ba8b3ad3a704e52d3caf92bb8d9d48a5c768f514 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

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

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

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

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

Pipeline on Agent
Hash: ba8b3ad3a704e52d3caf92bb8d9d48a5c768f514 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1181.Ventura
Hash: ba8b3ad3a704e52d3caf92bb8d9d48a5c768f514 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Apr 6, 2023

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 225 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 25 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: ba8b3ad3a704e52d3caf92bb8d9d48a5c768f514 [PR build]

@dalexsoto dalexsoto merged commit b7a486a into main Apr 6, 2023
@dalexsoto dalexsoto deleted the dev/ema/recursivedir branch April 6, 2023 21:21
dalexsoto pushed a commit that referenced this pull request Apr 6, 2023
@vs-mobiletools-engineering-service2 @emaf
[xcode14.3] [msbuild] Get RecursiveDir directory name only if it isn'…
f0c4c27 
…t empty (#17989)

If the `RecursiveDir` metadata is empty, the GetDirectoryName method
throws an error because it isn't a valid path. This can happen on VS
design time builds.


Backport of #17988

Co-authored-by: Emanuel Fernandez Dell'Oca <ema@xamarin.com>
dalexsoto pushed a commit that referenced this pull request Apr 6, 2023
@vs-mobiletools-engineering-service2 @emaf
[release/7.0.2xx-xcode14.3] [msbuild] Get RecursiveDir directory name…
86ef29d 
… only if it isn't empty (#17990)

If the `RecursiveDir` metadata is empty, the GetDirectoryName method
throws an error because it isn't a valid path. This can happen on VS
design time builds.


Backport of #17988

Co-authored-by: Emanuel Fernandez Dell'Oca <ema@xamarin.com>
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

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@emaf @dalexsoto @vs-mobiletools-engineering-service2 @mauroa