Skip to content

Commit b10fe09

Browse files
dotnet-maestro[bot]jonathanpeppersSteve Pfister
authored
Bump to dotnet/installer@808795cc 6.0.100-preview.7.21369.5 (#6097)
Fixes: dotnet/java-interop#854 Changes: dotnet/installer@e8b3b6b...808795c % git diff --shortstat e8b3b6be...808795cc 102 files changed, 2218 insertions(+), 2674 deletions(-) Changes: dotnet/linker@a07cab7...9ecf5bd % git diff --shortstat a07cab7b...9ecf5bd2 81 files changed, 2122 insertions(+), 246 deletions(-) Changes: dotnet/runtime@02f70d0...8d3afa3 % git diff --shortstat 02f70d0b...8d3afa3a 2518 files changed, 122843 insertions(+), 33676 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-preview.7.21369.5 * Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21322.1 to 6.0.100-preview.6.21365.1 * Microsoft.NETCore.App.Ref: from 6.0.0-preview.7.21326.8 to 6.0.0-preview.7.21368.2 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 4e6bf46 commit b10fe09

File tree

13 files changed

+2196
-829
lines changed

13 files changed

+2196
-829
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21327.2">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21369.5">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>e8b3b6bea1e37086869ba9aeafe65caa298537e7</Sha>
5+
<Sha>808795cca8cfaa143ef556cac0dc40d15d2dc186</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21322.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21365.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/mono/linker</Uri>
9-
<Sha>a07cab7b71a1321a9e68571c0b6095144a177b4e</Sha>
9+
<Sha>9ecf5bd2809f93d98c1dbea640790ca5a88d35ec</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21368.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
13+
<Sha>8d3afa3a4a42021be024ffa4a1dee77e35d33911</Sha>
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21327.2</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21322.1</MicrosoftNETILLinkTasksPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21369.5</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21365.1</MicrosoftNETILLinkTasksPackageVersion>
66
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
77
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
8-
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21326.8</MicrosoftNETCoreAppRefPackageVersion>
8+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21368.2</MicrosoftNETCoreAppRefPackageVersion>
99
</PropertyGroup>
1010
<PropertyGroup>
1111
<!-- Trim all characters after first `-` or `+` is encountered. -->

‎external/Java.Interop

‎src/Mono.Android/Mono.Android.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<OutputPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\$(AndroidFrameworkVersion)\</OutputPath>
4343
</PropertyGroup>
4444

45-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
45+
<PropertyGroup Condition=" '$(TargetFramework)' != 'monoandroid10' ">
4646
<OutputPath>$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\$(TargetFramework)\</OutputPath>
4747
</PropertyGroup>
4848

@@ -348,7 +348,9 @@
348348
<Compile Include="System.Drawing/SizeFConverter.cs" />
349349
<Compile Include="System.IO\AndroidExtensions.cs" />
350350
<Compile Include="System.Linq\Extensions.cs" />
351-
<Compile Include="Xamarin.Android.Net\AndroidClientHandler.cs" />
351+
<Compile Condition=" '$(TargetFramework)' != 'monoandroid10' " Include="Xamarin.Android.Net\AndroidClientHandler.cs" />
352+
<Compile Condition=" '$(TargetFramework)' == 'monoandroid10' " Include="Xamarin.Android.Net\AndroidClientHandler.Legacy.cs" />
353+
<Compile Include="Xamarin.Android.Net\AndroidMessageHandler.cs" />
352354
<Compile Include="Xamarin.Android.Net\AndroidHttpResponseMessage.cs" />
353355
<Compile Include="Xamarin.Android.Net\AuthDigestHeaderParser.cs" />
354356
<Compile Include="Xamarin.Android.Net\AuthDigestSession.cs" />
@@ -377,7 +379,7 @@
377379

378380
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
379381
<!-- Only build the 'net6.0' version of 'Mono.Android.dll' once for the latest stable Android version. -->
380-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' And '$(AndroidFrameworkVersion)' != '$(AndroidLatestStableFrameworkVersion)' ">
382+
<PropertyGroup Condition=" '$(TargetFramework)' != 'monoandroid10' And '$(AndroidFrameworkVersion)' != '$(AndroidLatestStableFrameworkVersion)' ">
381383
<BuildDependsOn></BuildDependsOn>
382384
</PropertyGroup>
383385

‎src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.Legacy.cs

Lines changed: 1011 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)