Skip to content

[release/6.0.1xx-preview7] Update dependencies from dotnet/installer #6097

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

Merged
merged 21 commits into from
Jul 21, 2021
Merged

[release/6.0.1xx-preview7] Update dependencies from dotnet/installer #6097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
74395f2
Create AndroidMessageHandler and restructure AndroidClientHander to c…
Jul 2, 2021
6673114
Merge remote-tracking branch 'upstream/main' into intro-android-messa…
Jul 8, 2021
f7498ba
Use reflection to get underlying handler from AndroidClientHandler
Jul 8, 2021
5118b6e
Split AndroidClientHandler between net6 and legacy. Excluded Compile…
Jul 9, 2021
53e9144
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 19, 2021
8b2f43c
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 19, 2021
a3cc84c
[xaprepare] always delete ~/android-toolchain/dotnet
jonathanpeppers Jul 19, 2021
69d1590
Merge remote-tracking branch 'steve/intro-android-messagehandler' int…
jonathanpeppers Jul 19, 2021
3b5179d
Remove $(SelfContained) = true by default
jonathanpeppers Jul 19, 2021
c32bb16
Bump to xamarin/java.interop/main@4fb7c147
jonathanpeppers Jul 19, 2021
7ee912e
Update .apkdesc files
jonathanpeppers Jul 20, 2021
eee3487
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 20, 2021
f4f0442
Merge branch 'release/6.0.1xx-preview7' into darc-release/6.0.1xx-pre…
jonathanpeppers Jul 20, 2021
fc82ca3
Revert "Update dependencies from https://github.com/dotnet/installer …
jonathanpeppers Jul 20, 2021
79ead3a
Fixes for AndroidClientHandler.GetUnderlyingHandler()
jonathanpeppers Jul 20, 2021
2fb7ea8
Add [DynamicDependency] for AndroidClientHandler.GetUnderlyingHandler()
jonathanpeppers Jul 20, 2021
84cebcf
Merge branch 'release/6.0.1xx-preview7' into darc-release/6.0.1xx-pre…
jonathanpeppers Jul 20, 2021
fb7f412
[tests] System.IO.FileSystem.dll no longer exists
jonathanpeppers Jul 20, 2021
8ac310b
Address PR comments
jonathanpeppers Jul 20, 2021
c7f8c29
Add default settings for AndroidMessageHandler
jonathanpeppers Jul 20, 2021
c146362
[tests] changes for AndroidClientHandlerTests to pass
jonathanpeppers Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
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.7.21327.2">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21369.5">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e8b3b6bea1e37086869ba9aeafe65caa298537e7</Sha>
<Sha>808795cca8cfaa143ef556cac0dc40d15d2dc186</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21322.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21365.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri>
<Sha>a07cab7b71a1321a9e68571c0b6095144a177b4e</Sha>
<Sha>9ecf5bd2809f93d98c1dbea640790ca5a88d35ec</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21368.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
<Sha>8d3afa3a4a42021be024ffa4a1dee77e35d33911</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21327.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21322.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21369.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21365.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21326.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21368.2</MicrosoftNETCoreAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Trim all characters after first `-` or `+` is encountered. -->
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from a5ed89 to 4fb7c1
8 changes: 5 additions & 3 deletions src/Mono.Android/Mono.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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 @@ -348,7 +348,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 @@ -377,7 +379,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
Open in desktop

Large diffs are not rendered by default.

Loading