Skip to content
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

Remove support for mkbundle #7772

Merged
merged 16 commits into from
Feb 28, 2023
Merged

Remove support for mkbundle #7772

merged 16 commits into from
Feb 28, 2023

Conversation

grendello
Copy link
Contributor

Fixes: #7764

Remove all usage of the $(BundleAssemblies) MSBuild property as well as all
the code affected by it. A couple of related properties remain in the BuildApk
and GeneratePackageManagerJava tasks, because they are still assigned to by
the debugger targets from monodroid:

  • Stop running bundle test apps on CI
  • Remove bundle unit tests
  • Remove the CodeGen-MkBundle project from the tests solution
  • Remove the Xamarin.Android.MakeBundle-Tests from the tests solution
  • Remove all native code (and configuration) related to mkbundle
  • Warn about $(BundleAssemblies) usage in .NET projects

@grendello
Remove support for mkbundle
ef0e7d7 
Fixes: dotnet#7764

Remove all usage of the `$(BundleAssemblies)` MSBuild property as well
as all the code affected by it.  A couple of related properties remain
in the `BuildApk` and `GeneratePackageManagerJava` tasks, because they
are still assigned to by the debugger targets from `monodroid`:

  - Stop running bundle test apps on CI
  - Remove bundle unit tests
  - Remove the `CodeGen-MkBundle` project from the tests solution
  - Remove the `Xamarin.Android.MakeBundle-Tests` from the tests
    solution
  - Remove all native code (and configuration) related to mkbundle
  - Warn about `$(BundleAssemblies)` usage in .NET projects
pjcollins
pjcollins reviewed Feb 6, 2023
View reviewed changes
Copy link
Member

@pjcollins pjcollins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'd also want to remove https://github.com/xamarin/xamarin-android/blob/main/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MakeBundleTests.cs

@grendello
Merge branch 'main' into no-bundleassemblies
f183316 
* main:
  [ci] Remove some Classic XA test stages/jobs. (dotnet#7770)
@grendello
Revert "Remove other legacy tests from CI"
a3d3cfe 
This reverts commit 58ccdaf.
@grendello
Merge branch 'main' into no-bundleassemblies
63b4245 
* main:
  [lgtm] Fix LGTM-reported issues (dotnet#1074)
  [ci] Report issues in the API docs build log (dotnet#7784)
jonpryor
jonpryor reviewed Feb 15, 2023
View reviewed changes
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs
} else {
Assert.IsTrue (helper.Exists ("assemblies/UnnamedProject.dll"), $"UnnamedProject.dll should be in the {proj.PackageName}-Signed.apk");
}
Assert.IsTrue (helper.Exists ("assemblies/UnnamedProject.dll"), $"UnnamedProject.dll should be in the {proj.PackageName}-Signed.apk");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this assert be conditioned on usesAssemblyBlobs?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The helper hides that from the tests.

@grendello
Merge branch 'main' into no-bundleassemblies
8032a0d 
* main:
  Add Unit Test for testOnly apps (dotnet#7637)
  [build] Only build the latest API level (dotnet#7786)
  [Xamarin.Android.Build.Tasks] Improve aapt2+file not found handling (dotnet#7644)
  [MSBuildDeviceIntegration] Fix duplicated test parameter (dotnet#7809)
  [tests] Bump NUnit versions to latest (dotnet#7802)
  [Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (dotnet#7803)
  [tests] `InstallAndroidDependenciesTest` can use `platform-tools` 34.0.0 (dotnet#7800)
  Bump to xamarin/Java.Interop/main@9e0a469 (dotnet#7797)
  [Xamarin.Android.Build.Tasks] FileWrites&libraryprojectimports.cache (dotnet#7780)
  Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)
@grendello
Merge branch 'main' into no-bundleassemblies
3c8fce6 
* main:
  LEGO: Merge pull request 7825
  Bump to xamarin/Java.Interop/main@bbaeda6f (dotnet#7799)
  Bump NDK to r25c (dotnet#7808)
  [Xamarin.Android.Build.Tests] Improve logcat logging in failed tests (dotnet#7816)
  [Mono.Android] Update api-compat reference file for current API-33 (dotnet#7822)
  Localized file check-in by OneLocBuild Task (dotnet#7820)
@grendello
Merge branch 'main' into no-bundleassemblies
ab016ec 
* main:
  Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)"
  LEGO: Merge pull request 7828
@grendello
Merge branch 'main' into no-bundleassemblies
68684e8 
* main:
  [ci] Use AZDO built-in parallelization strategy. (dotnet#7804)
  Bump to dotnet/installer@e3ab0b5 8.0.100-preview.2.23123.10 (dotnet#7813)
  [ci] Run nunit tests with stable .NET version (dotnet#7826)
  [monodroid] Update p/invoke symbol names from net8 alpha1 (dotnet#7829)
  Localized file check-in by OneLocBuild (dotnet#7827)
@jonpryor jonpryor merged commit d0701eb into dotnet:main Feb 28, 2023
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 28, 2023
@grendello
Merge branch 'main' into classloader-thread-init
8b2cb16 
* main:
  [Xamarin.Android.Build.Tasks] Remove support for mkbundle (dotnet#7772)
  [Xamarin.Android.Build.Tasks] `unable to open file as zip archive`? (dotnet#7759)
  [monodroid] Properly process satellite assemblies (dotnet#7823)
  Bump to xamarin/java.interop/main@77800dda (dotnet#7824)
grendello added a commit to grendello/xamarin-android that referenced this pull request Mar 1, 2023
@grendello
Merge branch 'main' into native-code-classic-cleanup
c0e4b12 
* main:
  Replace K4os.Hash.xxHash with System.IO.Hashing (dotnet#7831)
  $(AndroidPackVersionSuffix)=preview.3; net8 is 34.0.0-preview.3 (dotnet#7839)
  [Xamarin.Android.Build.Tasks] Remove support for mkbundle (dotnet#7772)
  [Xamarin.Android.Build.Tasks] `unable to open file as zip archive`? (dotnet#7759)
grendello added a commit to grendello/xamarin-android that referenced this pull request Mar 6, 2023
@grendello
Merge branch 'main' into no-ndk-lib-stubs
8e6f958 
* main: (22 commits)
  Bump to dotnet/installer@632ddca 8.0.100-preview.3.23128.1 (dotnet#7836)
  LEGO: Merge pull request 7852
  [ci] Reduce overhead for MSBuildIntegration unit test jobs. (dotnet#7832)
  [ci] Allow dynamic`$(NuGetArtifactName)` values (dotnet#7848)
  [Xamarin.Android.Build.Tasks] guard `AutoImport.props` against empty values (dotnet#7837)
  [Mono.Android] Print type & member remapping info (dotnet#7844)
  [Mono.Android] Tweak AndroidMessageHandler behavior for WCF support (dotnet#7785)
  LEGO: Merge pull request 7845
  Localized file check-in by OneLocBuild Task (dotnet#7842)
  [ci] Use compliance stage template (dotnet#7818)
  [build] pass `--skip-sign-check` to `dotnet workload` (dotnet#7840)
  Replace K4os.Hash.xxHash with System.IO.Hashing (dotnet#7831)
  $(AndroidPackVersionSuffix)=preview.3; net8 is 34.0.0-preview.3 (dotnet#7839)
  [Xamarin.Android.Build.Tasks] Remove support for mkbundle (dotnet#7772)
  [Xamarin.Android.Build.Tasks] `unable to open file as zip archive`? (dotnet#7759)
  [monodroid] Properly process satellite assemblies (dotnet#7823)
  Bump to xamarin/java.interop/main@77800dda (dotnet#7824)
  [ci] Use AZDO built-in parallelization strategy. (dotnet#7804)
  Bump to dotnet/installer@e3ab0b5 8.0.100-preview.2.23123.10 (dotnet#7813)
  [ci] Run nunit tests with stable .NET version (dotnet#7826)
  ...
@github-actions github-actions bot locked and limited conversation to collaborators Jan 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jonpryor jonpryor jonpryor left review comments

@dellis1972 dellis1972 dellis1972 left review comments

@pjcollins pjcollins pjcollins left review comments

@mcumming mcumming Awaiting requested review from mcumming mcumming is a code owner

@jonathanpeppers jonathanpeppers Awaiting requested review from jonathanpeppers jonathanpeppers is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

.NET 6 + $(BundleAssemblies)=True is broken
4 participants
@grendello @jonpryor @dellis1972 @pjcollins