Skip to content

Commit

Permalink
Bump to dotnet/installer@9c463710 6.0.100-rc.1.21369 (#6072)
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Co-authored-by: Steve Pfister <[email protected]>
  • Loading branch information
@dotnet-maestro @jonathanpeppers @jonpryor
3 people authored and jonpryor committed Aug 26, 2021
1 parent dc1b3a4 commit 397f4de
Show file tree
Hide file tree
Showing 11 changed files with 2,122 additions and 758 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21306.2">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21369.3">
<Uri>https:/dotnet/installer</Uri>
<Sha>c83bef2f34e5302bfc651d12df2f8bbcd2a981dc</Sha>
<Sha>9c463710a333a48301a211fbd7b8ca3b15d4f1f7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21304.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21366.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https:/mono/linker</Uri>
<Sha>21df7dbbf881507c98026c1b9e7532303b3c0a06</Sha>
<Sha>460dd6ddb329a5588d9e4399f4257ce28dfadaca</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21306.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21368.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https:/dotnet/runtime</Uri>
<Sha>5b8e1780ad7740e632c285bc2af13a8d0b20c5a9</Sha>
<Sha>96ce6b35359b3c159ef3e685dd67cf30bb46769b</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21306.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21304.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21369.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21366.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21306.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21368.1</MicrosoftNETCoreAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Trim all characters after first `-` or `+` is encountered. -->
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Submodule Java.Interop updated from 48766c to 476bb5
8 changes: 5 additions & 3 deletions src/Mono.Android/Mono.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<OutputPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\$(AndroidFrameworkVersion)\</OutputPath>
</PropertyGroup>

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

Expand Down Expand Up @@ -349,7 +349,9 @@
<Compile Include="System.Drawing/SizeFConverter.cs" />
<Compile Include="System.IO\AndroidExtensions.cs" />
<Compile Include="System.Linq\Extensions.cs" />
<Compile Include="Xamarin.Android.Net\AndroidClientHandler.cs" />
<Compile Condition=" '$(TargetFramework)' != 'monoandroid10' " Include="Xamarin.Android.Net\AndroidClientHandler.cs" />
<Compile Condition=" '$(TargetFramework)' == 'monoandroid10' " Include="Xamarin.Android.Net\AndroidClientHandler.Legacy.cs" />
<Compile Include="Xamarin.Android.Net\AndroidMessageHandler.cs" />
<Compile Include="Xamarin.Android.Net\AndroidHttpResponseMessage.cs" />
<Compile Include="Xamarin.Android.Net\AuthDigestHeaderParser.cs" />
<Compile Include="Xamarin.Android.Net\AuthDigestSession.cs" />
Expand Down Expand Up @@ -378,7 +380,7 @@

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

Expand Down
1,011 changes: 1,011 additions & 0 deletions src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.Legacy.cs
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 397f4de

Please sign in to comment.