-
Notifications
You must be signed in to change notification settings - Fork 528
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
[Xamarin.Android.Build.Tasks] Ignore AndroidAsset items which are folders. #1190
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ders. When adding a new subfolder in the IDE (VSForMac) we end up with a folder which has a build action of AndroidAsset. This causes the copy task to fail with Cannot copy <folder> to <destfolder>, as the source file doesn't exist", This is because we assume that all items in AndroidAsset (and AndroidResource) and files. It looks like this is not the case. While a work around is easy .. simply remove the item. It does require that the user manually update the csproj. So this commit uses `Directory.Exists` to check to see if the item is a directory or not. If it is we skip over it. Otherwise its a file so we should copy. We do this in `Files.cs` but also in `AndroidUpdateResDir.cs`. The latter has been changed to output a list of the "Resolved" files which will not include any folders.
build |
The cause of the PR build break:
is because the new (Compare to e.g. d15-6.) @dellis1972: Please update |
build |
yay green builds :) |
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Apr 21, 2021
Changes: xamarin/monodroid@45abd3f...ed584c7 * xamarin/monodroid@ed584c775: [tools/msbuild] Improve FastDeploy error messages (dotnet#1190) * xamarin/monodroid@74294dca0: Bump to xamarin/androidtools@47ec118f (dotnet#1195) * xamarin/monodroid@ff633623e: [tools/msbuild] Add additional diagnostic logging for FastDev. (dotnet#1194) * xamarin/monodroid@546d5fb58: [tools/msbuild] Add Better Diagnostic Logging for Fast Deployment. (dotnet#1185) * xamarin/monodroid@fa6a1a058: [tools/msbuild] incude PackageName in MAX_COMMAND adb check. (dotnet#1189) * xamarin/monodroid@ac447cb5d: Bump Xamarin.Android to bring in JDK Fixes (dotnet#1192)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Apr 22, 2021
Changes: xamarin/monodroid@ff63362...76c04cd * xamarin/monodroid@76c04cd15 [tools/msbuild] [MSB3680] The source file "obj/Debug/androidx/jl/classes.dex" does not exist (dotnet#1197) * xamarin/monodroid@ed584c775 [tools/msbuild] Improve FastDeploy error messages (dotnet#1190) * xamarin/monodroid@74294dca0 Bump to xamarin/androidtools@47ec118f (dotnet#1195)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Apr 22, 2021
Fixes: dotnet#5863 Changes: xamarin/monodroid@ff63362...76c04cd * xamarin/monodroid@76c04cd15 [tools/msbuild] [MSB3680] The source file "obj/Debug/androidx/jl/classes.dex" does not exist (dotnet#1197) * xamarin/monodroid@ed584c775 [tools/msbuild] Improve FastDeploy error messages (dotnet#1190) * xamarin/monodroid@74294dca0 Bump to xamarin/androidtools@47ec118f (dotnet#1195)
jonpryor
added a commit
that referenced
this pull request
Apr 26, 2021
Fixes: #5863 Changes: xamarin/monodroid@ff63362...76c04cd * xamarin/monodroid@76c04cd15 [tools/msbuild] [MSB3680] The source file "obj/Debug/androidx/jl/classes.dex" does not exist (#1197) * xamarin/monodroid@ed584c775 [tools/msbuild] Improve FastDeploy error messages (#1190) * xamarin/monodroid@74294dca0 Bump to xamarin/androidtools@47ec118f (#1195)
jonathanpeppers
pushed a commit
that referenced
this pull request
Apr 26, 2021
Fixes: #5863 Changes: xamarin/monodroid@ff63362...76c04cd * xamarin/monodroid@76c04cd15 [tools/msbuild] [MSB3680] The source file "obj/Debug/androidx/jl/classes.dex" does not exist (#1197) * xamarin/monodroid@ed584c775 [tools/msbuild] Improve FastDeploy error messages (#1190) * xamarin/monodroid@74294dca0 Bump to xamarin/androidtools@47ec118f (#1195)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When adding a new subfolder in the IDE (VSForMac) we end up
with a folder which has a build action of AndroidAsset.
This causes the copy task to fail with
This is because we assume that all items in AndroidAsset (and
AndroidResource) and files. It looks like this is not the case.
While a work around is easy .. simply remove the item. It does
require that the user manually update the csproj.
So this commit uses
Directory.Exists
to check to see if theitem is a directory or not. If it is we skip over it. Otherwise
its a file so we should copy.
We do this in
Files.cs
but also inAndroidUpdateResDir.cs
.The latter has been changed to output a list of the "Resolved"
files which will not include any folders.