Skip to content
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

[main] Update dependencies from dotnet/installer #5870

Merged
merged 7 commits into from
Apr 30, 2021
Merged

[main] Update dependencies from dotnet/installer #5870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
31181fe
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 26, 2021
dd68c6e
Merge branch 'main' into darc-main-0c32f9d6-417c-4614-8f51-1d5961ee5ccc
jonathanpeppers Apr 27, 2021
967b036
Track Microsoft.NET.ILLink.Tasks ID, make it a coherent dependency of…
pjcollins Apr 27, 2021
d213189
Update Microsoft.Android.Sdk.ILLink.csproj
jonathanpeppers Apr 27, 2021
2d885ab
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 29, 2021
f106b34
[tests] fix AllResourcesInClassLibrary
jonathanpeppers Apr 29, 2021
7cf9f1b
Merge remote-tracking branch 'origin/main' into darc-main-0c32f9d6-41…
pjcollins Apr 30, 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,12 +1,12 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.4.21221.10">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.5.21229.1">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>d9bf0d661ba2e1ac065ae119585dc7f0e3c29703</Sha>
<Sha>0b60950dad3cd50b07e130568454a33e058e2507</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="6.0.100-preview.2.21226.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21227.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri>
<Sha>1dfcf3077aca1ea77850f409d95c3192f03507b3</Sha>
<Sha>bf37b2909bbfb2942173e7b383642c9b32ae0e79</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,8 +1,8 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.4.21221.10</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>6.0.100-preview.2.21226.1</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.5.21229.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.5.21227.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputPath>$(XAInstallPrefix)xbuild\Xamarin\Android\</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkPackageVersion)" />
<PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
<ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Export\Java.Interop.Export.csproj" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=netcoreapp3.1" />

<Compile Include="..\Xamarin.Android.Build.Tasks\obj\$(Configuration)\Profile.g.cs" Link="Profile.g.cs" />
Expand Down
3 changes: 3 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3777,6 +3777,9 @@ public void AllResourcesInClassLibrary ([Values (true, false)] bool useAapt2)
};
lib.SetProperty ("AndroidApplication", "False");
lib.AndroidUseAapt2 = useAapt2;
if (Builder.UseDotNet) {
lib.RemoveProperty ("OutputType");
}

// Create an "app" that is basically empty and references the library
var app = new XamarinAndroidLibraryProject {
Expand Down