Skip to content

[main] Update dependencies from dotnet/installer #6363

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 12 commits into from
Oct 20, 2021
Merged

[main] Update dependencies from dotnet/installer #6363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b7dd0c6
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 4, 2021
daf20a1
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 11, 2021
18bcd74
Merge branch 'main' into darc-main-14333f32-1f73-4599-8639-ac5d3fcbe79d
jonathanpeppers Oct 15, 2021
d91fe45
Testing https://github.com/xamarin/java.interop/pull/893
jonathanpeppers Oct 15, 2021
9660c36
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 18, 2021
94461c9
Revert "Testing https://github.com/xamarin/java.interop/pull/893"
jonathanpeppers Oct 19, 2021
71b7d3b
Merge branch 'main' into darc-main-14333f32-1f73-4599-8639-ac5d3fcbe79d
jonathanpeppers Oct 19, 2021
b6d1a0a
Testing: https://github.com/xamarin/java.interop/pull/895
jonathanpeppers Oct 19, 2021
13fa9e9
Set IgnoreInterpreter category for UseInterpreter=true
jonathanpeppers Oct 19, 2021
3674016
Revert "Testing: https://github.com/xamarin/java.interop/pull/895"
jonathanpeppers Oct 20, 2021
f50301f
Merge branch 'main' into darc-main-14333f32-1f73-4599-8639-ac5d3fcbe79d
jonathanpeppers Oct 20, 2021
bc57246
Bump to xamarin/java.interop/main@d1d64c10
jonathanpeppers Oct 20, 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
8 changes: 4 additions & 4 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-rtm.21476.2">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rtm.21518.6">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>885ff3819901e75ee1782185a53a3ab4ea6deac8</Sha>
<Sha>4cba5995022e769f2f9688ce44d8fc204559e4d9</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21473.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>d51cc207fac85547787bbba83f54f69d8e72e9f5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rtm.21472.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rtm.21517.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>491ed9a112559872c31ae40da8f6d9977ba4ce3a</Sha>
<Sha>92ff02435693486da161626246f016b4f1e7b8e8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 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-rtm.21476.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rtm.21518.6</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-1.21473.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rtm.21472.13</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rtm.21517.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 2d5431 to d1d64c
1 change: 1 addition & 0 deletions tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
-->
<ExcludeCategories>DotNetIgnore</ExcludeCategories>
<ExcludeCategories Condition=" '$(RunAOTCompilation)' == 'true' ">$(ExcludeCategories):InetAccess</ExcludeCategories>
<ExcludeCategories Condition=" '$(UseInterpreter)' == 'true' ">$(ExcludeCategories):IgnoreInterpreter</ExcludeCategories>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down