Skip to content

[Xamarin.ProjectTools] Fix path to xabuild for monodroid. #948

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

Jump to bottom
Merged
merged 1 commit into from
Oct 19, 2017
Merged

[Xamarin.ProjectTools] Fix path to xabuild for monodroid. #948

merged 1 commit into from
Oct 19, 2017

Conversation

@dellis1972
Copy link
Contributor

@dellis1972 dellis1972 commented Oct 19, 2017

The Builder was not checking for the xabuild script in the
out directory for the monodroid tree.

@dellis1972
[Xamarin.ProjectTools] Fix path to xabuild for monodroid.
af2597c 
The Builder was not checking for the xabuild script in the
`out` directory for the monodroid tree.
@jonpryor jonpryor merged commit d871bf8 into dotnet:master Oct 19, 2017
Redth pushed a commit to Redth/xamarin-android that referenced this pull request Oct 30, 2017
@dellis1972 @Redth
[Xamarin.ProjectTools] Fix path to xabuild for monodroi. (dotnet#948)
73f8e81 
The Builder was not checking for the xabuild script in the
`out` directory for the monodroid tree.
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Feb 11, 2022
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668
e2f2162 
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 jonpryor mentioned this pull request Feb 11, 2022
Merged
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Feb 11, 2022
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668
04d5f62 
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
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668
ccc7b55 
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
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668
34760e3 
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
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668
2f2620a 
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
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668
103f24e 
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
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668
ddb2338 
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
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668
d03215f 
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
@jonpryor
Bump to xamarin/Java.Interop/main@cbd96668 (#6737)
db56e38 
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`.
@github-actions github-actions bot locked and limited conversation to collaborators Feb 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dellis1972 @jonpryor @dnfclas