[Xamarin.Android.Build.Tasks] Don't get resources in DTB #952
Conversation
This file contains hidden or 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
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60080 Context: 1cd582e It appears that the `<GetAdditionalResourcesFromAssemblies/>` task is causing Visual Studio 2015 to hang when loading projects. In the interests of expediency, "revert" to d15-3 behavior and make the `<GetAdditionalResourcesFromAssemblies/>` task invocation conditional on `$(DesignTimeBuild)` being False, i.e. only execute `<GetAdditionalResourcesFromAssemblies/>` when performing *normal* builds, *not* Design-Time builds.
dellis1972
approved these changes
Oct 20, 2017
Contributor
|
@jonpryor looks good. I can't merge it though |
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Feb 11, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Feb 11, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Feb 11, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Feb 14, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Feb 14, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Feb 14, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Feb 14, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Feb 15, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
jonpryor
added a commit
that referenced
this pull request
Feb 16, 2022
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (#948) Of particular note is dotnet/java-interop@cbd96668, which changes the version of `Java.Interop.dll` in the net6.0 profile from 0.1.0.0 to 6.0.0.0, and the version of "utility libs" like `Xamarin.SourceWriter.dll` from being identical to their non-net6.0 counterparts, to instead having `6.0.0.*` version numbers. This change in turn necessitates: * Updating `build-tools/create-packs` and `build-tools/installers` so that the "utility libs" are grabbed from their appropriate build directory, so that we don't distribute e.g. "legacy" `Xamarin.SourceWriter, Version=0.2.0.0` in the .net 6 package. * Updating `tests/**/*.csproj` to specify a "full" `$(TargetFramework)`=net6.0-android32 instead of `$(TargetFramework)`=net6.0-android. If we don't use the "full" version, we'll use the net6.0-android31.0 targeting pack, which has the wrong version for `Java.Interop.dll`, possibly resulting in compilation errors: error CS0433: The type 'JavaObject' exists in both 'Java.Interop, Version=0.1.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065' and 'Java.Interop, Version=6.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065'. dotnet/java-interop@e587cf6b simplified the Java.Interop build system, necessitating changes to `build-tools/xaprepare` -- `make prepare-core` is no longer needed -- but also required adding `Java.Runtime.Environment.csproj` to `Xamarin.Android.sln`, so that it's build-time Target could properly create `Java.Runtime.Environment.dll.config`. TODO: Better deal with the `Java.Interop.dll` version change that is now part of `net6.0-android32.0`. We should consider "removing" the `net6.0-android31.0` targeting pack, and make `net6.0-android` be an alias for `net6.0-android32.0`.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60080
Context: 1cd582e
It appears that the
<GetAdditionalResourcesFromAssemblies/>task iscausing Visual Studio 2015 to hang when loading projects.
In the interests of expediency, "revert" to d15-3 behavior and make
the
<GetAdditionalResourcesFromAssemblies/>task invocationconditional on
$(DesignTimeBuild)being False, i.e. only execute<GetAdditionalResourcesFromAssemblies/>when performing normalbuilds, not Design-Time builds.