Bump to Java.Interop/master/d8862d89 #1166
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
Fixes: dotnet#1149 Adds support for `$(JI_MAX_JDK)` (not yet used). Fix many, *many*, Gendarme warnings in `Java.Interop.dll`.
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Sep 13, 2018
We've been dealing with a head-scratching annoyance: `.apk` test would execute, pass, and have their `TestResults.xml` files extractable when the PR builds run the `.apk` tests, but *not* when `master` does. This makes it difficult to know whether or not we've broken anything. One "interesting" observation we've had is that the paths *differ* on the "downloadable" vs. "undownloadable" builds. For example, [master build dotnet#1166][0] uses an internal storage path: RunTestApks ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android/xamarin-android/tests/../bin/TestRelease/TestResult-Mono.Android_Tests.xml …/xamarin-android/build-tools/scripts/TestApks.targets(188,5): error : Command /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" failed with exit code 1 While the "same" command on [PR build dotnet#4003][1] uses an external path: RunTestApks: ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb -s emulator-5570 shell run-as Mono.Android_Tests cat "/storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/tests/../bin/TestDebug/TestResult-Mono.Android_Tests.xml *Why* do these paths differ? The paths differ -- internal storage on master, external on PR builds -- because `Xamarin.Android.NUnitLite.dll` only uses [external storage directories][2] when it's built against a `$(TargetFrameworkVersion)` value >= v4.4. This is true on PR builds, where we only build one API level, `$(AndroidFrameworkVersion)`, currently v9.0 (API-28). This is *not* true on master builds where we build for *all* API levels, and "really" build `Xamarin.Android.NUnitLite.dll` for the [*first* supported API level][3], v2.3 (API-10)! Update the `Xamarin.Android.NUnitLite.dll` build within `make framework-assemblies` so that instead of building for the *first* API level, we build for the *last* API level. This should allow our unit tests to work sanely on "full" builds. [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/1166/ [1]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android-pr-builder/4003/ [2]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/src/Xamarin.Android.NUnitLite/Gui/Instrumentations/TestSuiteInstrumentation.cs#L107-L110 [3]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/build-tools/scripts/BuildEverything.mk#L113-L118
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Sep 13, 2018
We've been dealing with a head-scratching annoyance: `.apk` test would execute, pass, and have their `TestResults.xml` files extractable when the PR builds run the `.apk` tests, but *not* when `master` does. This makes it difficult to know whether or not we've broken anything. One "interesting" observation we've had is that the paths *differ* on the "downloadable" vs. "undownloadable" builds. For example, [master build dotnet#1166][0] uses an internal storage path: RunTestApks ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android/xamarin-android/tests/../bin/TestRelease/TestResult-Mono.Android_Tests.xml …/xamarin-android/build-tools/scripts/TestApks.targets(188,5): error : Command /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" failed with exit code 1 While the "same" command on [PR build dotnet#4003][1] uses an external path: RunTestApks: ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb -s emulator-5570 shell run-as Mono.Android_Tests cat "/storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/tests/../bin/TestDebug/TestResult-Mono.Android_Tests.xml *Why* do these paths differ? The paths differ -- internal storage on master, external on PR builds -- because `Xamarin.Android.NUnitLite.dll` only uses [external storage directories][2] when it's built against a `$(TargetFrameworkVersion)` value >= v4.4. This is true on PR builds, where we only build one API level, `$(AndroidFrameworkVersion)`, currently v9.0 (API-28). This is *not* true on master builds where we build for *all* API levels, and "really" build `Xamarin.Android.NUnitLite.dll` for the [*first* supported API level][3], v2.3 (API-10)! Update the `Xamarin.Android.NUnitLite.dll` build within `make framework-assemblies` so that instead of building for the *first* API level, we build for the *last* API level. This should allow our unit tests to work sanely on "full" builds. Additionally, update/"partially revert" the `<RunInstrumentationTests/>` task so that it *always* performs `adb pull` to extract `TestResults.xml`, instead of using `adb shell run-as ... cat ...`, as introduced in 2e8f96f. The problem with `run-as ... cat` is that it doesn't work with non-debuggable packages, e.g. if you have a `Mono.Android_Tests-Signed.apk` built in the `Release` configuration, `run-as` will *fail*: $ adb shell run-as Mono.Android_Tests cat /storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml run-as: package not debuggable: Mono.Android_Tests Instead of special-casing `<RunInstrumentationTests/>` to try using `run-as` in some circumstances and `pull` in others, "revert" to pre-2e8f96f5 behavior and always use `adb pull`. [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/1166/ [1]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android-pr-builder/4003/ [2]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/src/Xamarin.Android.NUnitLite/Gui/Instrumentations/TestSuiteInstrumentation.cs#L107-L110 [3]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/build-tools/scripts/BuildEverything.mk#L113-L118
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Sep 13, 2018
We've been dealing with a head-scratching annoyance: `.apk` test would execute, pass, and have their `TestResults.xml` files extractable when the PR builds run the `.apk` tests, but *not* when `master` does. This makes it difficult to know whether or not we've broken anything. One "interesting" observation we've had is that the paths *differ* on the "downloadable" vs. "undownloadable" builds. For example, [master build dotnet#1166][0] uses an internal storage path: RunTestApks ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android/xamarin-android/tests/../bin/TestRelease/TestResult-Mono.Android_Tests.xml …/xamarin-android/build-tools/scripts/TestApks.targets(188,5): error : Command /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" failed with exit code 1 While the "same" command on [PR build dotnet#4003][1] uses an external path: RunTestApks: ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb -s emulator-5570 shell run-as Mono.Android_Tests cat "/storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/tests/../bin/TestDebug/TestResult-Mono.Android_Tests.xml *Why* do these paths differ? The paths differ -- internal storage on master, external on PR builds -- because `Xamarin.Android.NUnitLite.dll` only uses [external storage directories][2] when it's built against a `$(TargetFrameworkVersion)` value >= v4.4. This is true on PR builds, where we only build one API level, `$(AndroidFrameworkVersion)`, currently v9.0 (API-28). This is *not* true on master builds where we build for *all* API levels, and "really" build `Xamarin.Android.NUnitLite.dll` for the [*first* supported API level][3], v2.3 (API-10)! Update the `Xamarin.Android.NUnitLite.dll` build within `make framework-assemblies` so that instead of building for the *first* API level, we build for the *last* API level. This should allow our unit tests to work sanely on "full" builds. Additionally, update/"partially revert" the `<RunInstrumentationTests/>` task so that it *always* performs `adb pull` to extract `TestResults.xml`, instead of using `adb shell run-as ... cat ...`, as introduced in 2e8f96f. The problem with `run-as ... cat` is that it doesn't work with non-debuggable packages, e.g. if you have a `Mono.Android_Tests-Signed.apk` built in the `Release` configuration, `run-as` will *fail*: $ adb shell run-as Mono.Android_Tests cat /storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml run-as: package not debuggable: Mono.Android_Tests Instead of special-casing `<RunInstrumentationTests/>` to try using `run-as` in some circumstances and `pull` in others, "revert" to pre-2e8f96f5 behavior and always use `adb pull`. [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/1166/ [1]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android-pr-builder/4003/ [2]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/src/Xamarin.Android.NUnitLite/Gui/Instrumentations/TestSuiteInstrumentation.cs#L107-L110 [3]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/build-tools/scripts/BuildEverything.mk#L113-L118
grendello
pushed a commit
that referenced
this pull request
Sep 14, 2018
We've been dealing with a head-scratching annoyance: `.apk` test would execute, pass, and have their `TestResults.xml` files extractable when the PR builds run the `.apk` tests, but *not* when `master` does. This makes it difficult to know whether or not we've broken anything. One "interesting" observation we've had is that the paths *differ* on the "downloadable" vs. "undownloadable" builds. For example, [master build #1166][0] uses an internal storage path: RunTestApks ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android/xamarin-android/tests/../bin/TestRelease/TestResult-Mono.Android_Tests.xml …/xamarin-android/build-tools/scripts/TestApks.targets(188,5): error : Command /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" failed with exit code 1 While the "same" command on [PR build #4003][1] uses an external path: RunTestApks: ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb -s emulator-5570 shell run-as Mono.Android_Tests cat "/storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/tests/../bin/TestDebug/TestResult-Mono.Android_Tests.xml *Why* do these paths differ? The paths differ -- internal storage on master, external on PR builds -- because `Xamarin.Android.NUnitLite.dll` only uses [external storage directories][2] when it's built against a `$(TargetFrameworkVersion)` value >= v4.4. This is true on PR builds, where we only build one API level, `$(AndroidFrameworkVersion)`, currently v9.0 (API-28). This is *not* true on master builds where we build for *all* API levels, and "really" build `Xamarin.Android.NUnitLite.dll` for the [*first* supported API level][3], v2.3 (API-10)! Update the `Xamarin.Android.NUnitLite.dll` build within `make framework-assemblies` so that instead of building for the *first* API level, we build for the *last* API level. This should allow our unit tests to work sanely on "full" builds. Additionally, update/"partially revert" the `<RunInstrumentationTests/>` task so that it *always* performs `adb pull` to extract `TestResults.xml`, instead of using `adb shell run-as ... cat ...`, as introduced in 2e8f96f. The problem with `run-as ... cat` is that it doesn't work with non-debuggable packages, e.g. if you have a `Mono.Android_Tests-Signed.apk` built in the `Release` configuration, `run-as` will *fail*: $ adb shell run-as Mono.Android_Tests cat /storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml run-as: package not debuggable: Mono.Android_Tests Instead of special-casing `<RunInstrumentationTests/>` to try using `run-as` in some circumstances and `pull` in others, "revert" to pre-2e8f96f5 behavior and always use `adb pull`. [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/1166/ [1]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android-pr-builder/4003/ [2]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/src/Xamarin.Android.NUnitLite/Gui/Instrumentations/TestSuiteInstrumentation.cs#L107-L110 [3]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/build-tools/scripts/BuildEverything.mk#L113-L118
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Sep 14, 2018
We've been dealing with a head-scratching annoyance: `.apk` test would execute, pass, and have their `TestResults.xml` files extractable when the PR builds run the `.apk` tests, but *not* when `master` does. This makes it difficult to know whether or not we've broken anything. One "interesting" observation we've had is that the paths *differ* on the "downloadable" vs. "undownloadable" builds. For example, [master build dotnet#1166][0] uses an internal storage path: RunTestApks ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android/xamarin-android/tests/../bin/TestRelease/TestResult-Mono.Android_Tests.xml …/xamarin-android/build-tools/scripts/TestApks.targets(188,5): error : Command /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" failed with exit code 1 While the "same" command on [PR build dotnet#4003][1] uses an external path: RunTestApks: ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb -s emulator-5570 shell run-as Mono.Android_Tests cat "/storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/tests/../bin/TestDebug/TestResult-Mono.Android_Tests.xml *Why* do these paths differ? The paths differ -- internal storage on master, external on PR builds -- because `Xamarin.Android.NUnitLite.dll` only uses [external storage directories][2] when it's built against a `$(TargetFrameworkVersion)` value >= v4.4. This is true on PR builds, where we only build one API level, `$(AndroidFrameworkVersion)`, currently v9.0 (API-28). This is *not* true on master builds where we build for *all* API levels, and "really" build `Xamarin.Android.NUnitLite.dll` for the [*first* supported API level][3], v2.3 (API-10)! Update the `Xamarin.Android.NUnitLite.dll` build within `make framework-assemblies` so that instead of building for the *first* API level, we build for the *last* API level. This should allow our unit tests to work sanely on "full" builds. [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/1166/ [1]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android-pr-builder/4003/ [2]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/src/Xamarin.Android.NUnitLite/Gui/Instrumentations/TestSuiteInstrumentation.cs#L107-L110 [3]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/build-tools/scripts/BuildEverything.mk#L113-L118
jonpryor
added a commit
that referenced
this pull request
Sep 15, 2018
We've been dealing with a head-scratching annoyance: `.apk` test would execute, pass, and have their `TestResults.xml` files extractable when the PR builds run the `.apk` tests, but *not* when `master` does. This makes it difficult to know whether or not we've broken anything. One "interesting" observation we've had is that the paths *differ* on the "downloadable" vs. "undownloadable" builds. For example, [master build #1166][0] uses an internal storage path: RunTestApks ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android/xamarin-android/tests/../bin/TestRelease/TestResult-Mono.Android_Tests.xml …/xamarin-android/build-tools/scripts/TestApks.targets(188,5): error : Command /Users/builder/android-toolchain/sdk/platform-tools/adb shell run-as Mono.Android_Tests cat "/data/user/0/Mono.Android_Tests/files/.__override__/TestResults.xml" failed with exit code 1 While the "same" command on [PR build #4003][1] uses an external path: RunTestApks: ... Executing: /Users/builder/android-toolchain/sdk/platform-tools/adb -s emulator-5570 shell run-as Mono.Android_Tests cat "/storage/emulated/0/Android/data/Mono.Android_Tests/files/Documents/TestResults.xml" writing stdout to file: /Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/tests/../bin/TestDebug/TestResult-Mono.Android_Tests.xml *Why* do these paths differ? The paths differ -- internal storage on master, external on PR builds -- because `Xamarin.Android.NUnitLite.dll` only uses [external storage directories][2] when it's built against a `$(TargetFrameworkVersion)` value >= v4.4. This is true on PR builds, where we only build one API level, `$(AndroidFrameworkVersion)`, currently v9.0 (API-28). This is *not* true on master builds where we build for *all* API levels, and "really" build `Xamarin.Android.NUnitLite.dll` for the [*first* supported API level][3], v2.3 (API-10)! Update the `Xamarin.Android.NUnitLite.dll` build within `make framework-assemblies` so that instead of building for the *first* API level, we build for the *last* API level. This should allow our unit tests to work sanely on "full" builds. [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/1166/ [1]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android-pr-builder/4003/ [2]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/src/Xamarin.Android.NUnitLite/Gui/Instrumentations/TestSuiteInstrumentation.cs#L107-L110 [3]: https://github.com/xamarin/xamarin-android/blob/e153d42e51d36170487b3081c55310d978685b06/build-tools/scripts/BuildEverything.mk#L113-L118
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Mar 10, 2021
Context: https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1290661/ Context: dotnet#5710 Changes: xamarin/monodroid@5918966...b2a750a * xamarin/monodroid@b2a750a2b: Bump to xamarin/androidtools@91ca8a80 (dotnet#1179) * xamarin/monodroid@73e652c36: [tools/msbuild] Add File.Exists checks for Fast Deployment (dotnet#1166)
jonpryor
added a commit
that referenced
this pull request
Mar 10, 2021
Context: https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1290661/ Context: #5710 Changes: xamarin/monodroid@5918966...b2a750a * xamarin/monodroid@b2a750a2b: Bump to xamarin/androidtools@91ca8a80 (#1179) * xamarin/monodroid@73e652c36: [tools/msbuild] Add File.Exists checks for Fast Deployment (#1166)
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.
Fixes: #1149
Adds support for
$(JI_MAX_JDK)(not yet used).Fix many, many, Gendarme warnings in
Java.Interop.dll.