Skip to content

Conversation

@akoeplinger
Copy link
Member

Otherwise we'd continue in the script and all sorts of weirdness would occur since TARGETS_DIR is empty.

Otherwise we'd continue in the script and all sorts of weirdness would occur since TARGETS_DIR is empty.
@jonpryor jonpryor merged commit 572f1fb into dotnet:master Oct 20, 2017
@akoeplinger akoeplinger deleted the xabuild-exit branch October 20, 2017 21:33
Redth pushed a commit to Redth/xamarin-android that referenced this pull request Oct 30, 2017
Otherwise we'd continue in the script and all sorts of weirdness
would occur since `$TARGETS_DIR` is empty.
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`.
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants