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
jonpryor merged 21 commits into from
Jul 21, 2021
Merged

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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge branch 'release/6.0.1xx-preview7' into darc-release/6.0.1xx-pre… 
…view7-31fefe12-06c3-45a5-90b6-27e71336c01e
  • Loading branch information
@jonathanpeppers
jonathanpeppers committed Jul 20, 2021
commit 84cebcfb98b26c8cec1f884035a28526f902ba9b

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.