Commit 1e5bfa3
Bump to dotnet/installer@9c463710 6.0.100-rc.1.21369 (#6072)
Fixes: dotnet/java-interop#854
Changes: dotnet/installer@e8b3b6b...9c46371
% git diff --shortstat e8b3b6be...9c463710
103 files changed, 2301 insertions(+), 2757 deletions(-)
Changes: dotnet/linker@a07cab7...460dd6d
% git diff --shortstat a07cab7b...460dd6dd
84 files changed, 2403 insertions(+), 258 deletions(-)
Changes: dotnet/runtime@02f70d0...96ce6b3
% git diff --shortstat 02f70d0b90...96ce6b3535
2586 files changed, 123677 insertions(+), 34433 deletions(-)
Changes: dotnet/java-interop@a5ed891...4fb7c14
* dotnet/java-interop@4fb7c147: [build] set $(DisableImplicitNamespaceImports) by default (#859)
* dotnet/java-interop@855ecfa3: [generator] Don't generate unexpected NRT types like `void?` (#856)
* dotnet/java-interop@4a02bc32: Revert "[Xamarin.Android.Tools.Bytecode] hide nested types (#827)" (#855)
* dotnet/java-interop@95c9b79d: [generator] Avoid 'error (…):' construct in diagnostic messages (#851)
* dotnet/java-interop@7c4f7db0: [build] Bump to Mono with MSBuild 16.10 (#848)
* dotnet/java-interop@0227cdae: [generator] Gracefully handle BindingGeneratorException. (#845)
* dotnet/java-interop@ce1750fd: Add SECURITY.md (#846)
Context: dotnet/runtime#55384
Context: dotnet/sdk#18639
Updates:
* Microsoft.Dotnet.Sdk.Internal: from 6.0.100-preview.7.21327.2 to 6.0.100-rc.1.21369.3
* Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21322.1 to 6.0.100-preview.6.21366.2
* Microsoft.NETCore.App.Ref: from 6.0.0-preview.7.21326.8 to 6.0.0-rc.1.21368.1
dotnet/runtime#55384 broke how .NET 6 interacts with
`AndroidClientHandler`. Fix this by introducing a new
`Xamarin.Android.Net.AndroidMessageHandler` type for use on .NET 6,
and update the .NET 6 `AndroidClientHandler` to delegate to
`AndroidMessageHandler`.
`AndroidMessageHandler` doesn't exist on Legacy.
Update `.apkdesc` files:
* `BuildReleaseArm64SimpleDotNet` is ~37KB smaller
* `BuildReleaseArm64XFormsDotNet` is ~62KB larger.
Update `tests/api-compatibility/api-compat-exclude-attributes.txt`
so that `T:System.Runtime.CompilerServices.CompilerGeneratedAttribute`
is ignored. `[CompilerGeneratedAttribute]` is emitted as part of
C# 3 "auto-props":
public T Property { get; set; }
Converting this into a "real" property:
T value;
public T Property {
get => value;
set => this.value = value;
}
results in the `_CheckApiCompatibility` target complaining about an
API break. We don't care; ignore `[CompilerGeneratedAttribute]`.
Remove `$(SelfContained)` property: early on in .NET 5 (yes 5)
development, the Xamarin.Android SDK needed to specify
`$(SelfContained)` by default in order to produce `.apk` files.
After we became a proper workload, setting the value became
unnecessary. It also didn't actually do anything because
dotnet/sdk overwrote the value.
Starting in dotnet/sdk#18639,
`Microsoft.NET.RuntimeIdentifierInference.targets` is now being
imported *after* a workload, which meant that dotnet/sdk no longer
overwrote our `$(SelfContained)` value, which broke things:
error NETSDK1031: It is not supported to build or publish a self-contained application without specifying a RuntimeIdentifier. You must either specify a RuntimeIdentifier or set SelfContained to false.
We can simply remove `$(SelfContained)` now, and rely on
dotnet/sdk to set this value.
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>1 parent 27967ca commit 1e5bfa3
File tree
13 files changed
+2197
-830
lines changed- eng
- external
- src
- Mono.Android
- Xamarin.Android.Net
- Xamarin.Android.Build.Tasks
- Microsoft.Android.Sdk/targets
- Tests/Xamarin.ProjectTools/Resources/Base
- tests
- MSBuildDeviceIntegration/Tests
- Mono.Android-Tests/Xamarin.Android.Net
- api-compatibility
13 files changed
+2197
-830
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
Submodule Java.Interop updated from a5ed891 to 4fb7c14
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
348 | 348 | | |
349 | 349 | | |
350 | 350 | | |
351 | | - | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
352 | 354 | | |
353 | 355 | | |
354 | 356 | | |
| |||
377 | 379 | | |
378 | 380 | | |
379 | 381 | | |
380 | | - | |
| 382 | + | |
381 | 383 | | |
382 | 384 | | |
383 | 385 | | |
| |||
Lines changed: 1011 additions & 0 deletions
Large diffs are not rendered by default.
0 commit comments