Skip to content

Commit c46e836

Browse files
dotnet-maestro[bot]jonathanpeppersSteve Pfister
authored and
jonpryor
committed
Bump to dotnet/installer@9c463710 6.0.100-rc.1.21369 (#6072)
Context: #6234 Context: 1e5bfa3 Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=5132407&view=logs&jobId=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&j=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&t=65256bb7-a34c-5353-bc4d-c02ee25dc133 Changes: dotnet/java-interop@48766c0...476bb5b * dotnet/java-interop@476bb5b7: [build] .NET 6 P7 Support (#869) * dotnet/java-interop@0028e32c: [build] set $(DisableImplicitNamespaceImports) by default (#859) We don't actually *care* about dotnet/installer@9c463710 bump. We care that the attempt to build PR #6234 fails to build: …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CompatApi command: /Users/builder/.nuget/packages/microsoft.dotnet.apicompat/5.0.0-beta.20181.7/tools/net472/Microsoft.DotNet.ApiCompat.exe "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/reference/Mono.Android.dll" -i "/Users/builder/azdo/_work/2/s/xamarin-android/bin/Release/lib/xamarin.android/xbuild-frameworks/Microsoft.Android/net6.0" --allow-default-interface-methods --baseline "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/acceptable-breakages-vReference.txt" --validate-baseline --exclude-attributes "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/api-compat-exclude-attributes.txt" …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CheckApiCompatibility found nonacceptable Api breakages for ApiLevel: v12.0. …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Compat issues with assembly Mono.Android: …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : TypesMustExist : Type 'Xamarin.Android.Net.AndroidMessageHandler' does not exist in the implementation but it does exist in the contract. …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Total Issues: 1 It fails to build because we `CheckApiCompatibility` expects the `Xamarin.Android.Net.AndroidMessageHandler` type to exist, and it doesn't exist, because it was added until… 1e5bfa3. That's the primary thing we're after. Everything else is fluff, and the dotnet/runtime-related changes are not otherwise needed -- or cared about -- on d16-11. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
1 parent 7c2f588 commit c46e836

File tree

11 files changed

+2122
-758
lines changed

11 files changed

+2122
-758
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.6.21306.2">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21369.3">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>c83bef2f34e5302bfc651d12df2f8bbcd2a981dc</Sha>
5+
<Sha>9c463710a333a48301a211fbd7b8ca3b15d4f1f7</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21304.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21366.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/mono/linker</Uri>
9-
<Sha>21df7dbbf881507c98026c1b9e7532303b3c0a06</Sha>
9+
<Sha>460dd6ddb329a5588d9e4399f4257ce28dfadaca</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21306.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21368.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>5b8e1780ad7740e632c285bc2af13a8d0b20c5a9</Sha>
13+
<Sha>96ce6b35359b3c159ef3e685dd67cf30bb46769b</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.6.21306.2</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21304.2</MicrosoftNETILLinkTasksPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21369.3</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21366.2</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.6.21306.1</MicrosoftNETCoreAppRefPackageVersion>
8+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21368.1</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
@@ -41,7 +41,7 @@
4141
<OutputPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\$(AndroidFrameworkVersion)\</OutputPath>
4242
</PropertyGroup>
4343

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

@@ -349,7 +349,9 @@
349349
<Compile Include="System.Drawing/SizeFConverter.cs" />
350350
<Compile Include="System.IO\AndroidExtensions.cs" />
351351
<Compile Include="System.Linq\Extensions.cs" />
352-
<Compile Include="Xamarin.Android.Net\AndroidClientHandler.cs" />
352+
<Compile Condition=" '$(TargetFramework)' != 'monoandroid10' " Include="Xamarin.Android.Net\AndroidClientHandler.cs" />
353+
<Compile Condition=" '$(TargetFramework)' == 'monoandroid10' " Include="Xamarin.Android.Net\AndroidClientHandler.Legacy.cs" />
354+
<Compile Include="Xamarin.Android.Net\AndroidMessageHandler.cs" />
353355
<Compile Include="Xamarin.Android.Net\AndroidHttpResponseMessage.cs" />
354356
<Compile Include="Xamarin.Android.Net\AuthDigestHeaderParser.cs" />
355357
<Compile Include="Xamarin.Android.Net\AuthDigestSession.cs" />
@@ -378,7 +380,7 @@
378380

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

‎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)