Skip to content

[msbuild] Fix computing the output path for SceneKitAsset items with custom Link metadata. Fixes #15104. #15186

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
rolfbjarne merged 4 commits into from
Jun 7, 2022
Merged

[msbuild] Fix computing the output path for SceneKitAsset items with custom Link metadata. Fixes #15104. #15186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2eb686
[msbuild] Fix computing the output path for SceneKitAsset items with …
rolfbjarne Jun 2, 2022
a79ab1a
Merge remote-tracking branch 'origin/main' into msbuild-fix-compilesc…
rolfbjarne Jun 3, 2022
d5ab674
Improve logic to not run into invalid math.
rolfbjarne Jun 3, 2022
0279e81
Update msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileSceneKitAssetsT…
rolfbjarne Jun 7, 2022
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
11 changes: 11 additions & 0 deletions msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileSceneKitAssetsTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,17 @@ public override bool Execute ()
// .. and remove the @OriginalItemSpec which is for @asset
scnassetsItem.RemoveMetadata ("OriginalItemSpec");

// The Link metadata is for the asset, but 'scnassetsItem' is the containing *.scnasset directory,
// so we need to update the Link metadata accordingly (if it exists).
var link = scnassetsItem.GetMetadata ("Link");
if (!string.IsNullOrEmpty (link)) {
var newLinkLength = link.Length - (asset.ItemSpec.Length - scnassets.Length);
if (newLinkLength > 0 && newLinkLength < link.Length) {
link = link.Substring (0, newLinkLength);
scnassetsItem.SetMetadata ("Link", link);
}
}

var assetMetadata = asset.GetMetadata ("DefiningProjectFullPath");
if (assetMetadata != scnassetsItem.GetMetadata ("DefiningProjectFullPath")) {
// xbuild doesn't set this, so we'll do it
Expand Down
Binary file added tests/dotnet/AppWithResources/DirWithResources/linkedArt.scnassets/scene.scn
View file
Open in desktop
Binary file not shown.
Binary file added tests/dotnet/AppWithResources/DirWithResources/linkedArt.scnassets/texture.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.
2 changes: 2 additions & 0 deletions tests/dotnet/AppWithResources/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<!-- ImageAssets: included by default (each platform has a Resources/Images.xcassets directory) -->
<!-- InterfaceDefinition: included by default (each platform has a separate storyboard) -->
<SceneKitAsset Include="../*.scnassets/*" />
<SceneKitAsset Include="../*/linkedArt.scnassets/*" Link="%(RecursiveDir)%(FileName)%(Extension)" />

<Collada Include="../*.dae" />
<AtlasTexture Include="../*.atlas/**/*" />
<CoreMLModel Include="../*.mlmodel" />
Expand Down