[main] Update dependencies from xamarin/xamarin-android (#1322)

* Update dependencies from https://github.com/xamarin/xamarin-android build main-6f532314cdf888a18bc0e1b33f4c0cf47339f91b-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.5.28 -> To Version 30.0.100-ci.main.38

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.5.21302.13 -> To Version 6.0.100-preview.6.21313.2 (parent: Microsoft.Android.Sdk.Windows

* Add dependency for dotnet/runtime

* Install the microsoft-net-runtime-android workload

* Update dependencies from https://github.com/xamarin/xamarin-android build main-7e9f595f23ebd5b53385b16e3890bc90f95f6fef-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.5.28 -> To Version 30.0.100-ci.main.40

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.5.21302.13 -> To Version 6.0.100-preview.6.21313.2 (parent: Microsoft.Android.Sdk.Windows

* [android] disable runtimeconfig.json under VS MSBuild

Context: 7e9f595f23/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.RuntimeConfig.targets (L16-L17)

Build was failing with:

    error MSB4062: The "RuntimeConfigParserTask" task could not be loaded from the assembly

For now, we can turn off `runtimeconfig.json` until we get this fix:

9af4b97f89

* [tests] remove usage of Assembly.Location

The linker gives a new error for:

    src/Core/tests/DeviceTests.Android/TestInstrumentation.cs(35,56): error IL3000: 'System.Reflection.Assembly.Location' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'.

I believe we should just be using `Assembly.GetName().Name` here instead.

* Update Directory.Build.props

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
This commit is contained in:
dotnet-maestro[bot] 2021-06-17 11:06:30 +01:00 коммит произвёл GitHub
Родитель 9d13b2b430
Коммит 7f697d90ab
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 25 добавлений и 7 удалений

Просмотреть файл

@ -9,6 +9,10 @@
<PropertyGroup Condition=" '$(CI)' == 'true' and ('$(REQUIRED_XCODE)' == '' or '$(REQUIRED_XCODE)' &lt; '12.5') ">
<PublishTrimmed Condition=" '$(TargetFramework)' == 'net6.0-ios' or '$(TargetFramework)' == 'net6.0-maccatalyst' ">false</PublishTrimmed>
</PropertyGroup>
<!-- Temporarily disable runtimeconfig.json under .NET framework MSBuild -->
<PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'Full' and '$(TargetFramework)' == 'net6.0-android' ">
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
</PropertyGroup>
<PropertyGroup Condition="'$(SingleProject)' == 'true'">
<!-- Required - Enable Launch Profiles for .NET 6 iOS/Android -->

Просмотреть файл

@ -1,12 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.5.21302.13" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21313.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>d6380bcae783600a01a9c8a6a151bb6a66c777b0</Sha>
<Sha>abb57b4610404b011c76ca8ea1d7ab40c58991d4</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-preview.5.28">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21306.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5b8e1780ad7740e632c285bc2af13a8d0b20c5a9</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-ci.main.40">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>5d6745e112c7c7605b64a82fed778cdead99bc85</Sha>
<Sha>7e9f595f23ebd5b53385b16e3890bc90f95f6fef</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.0.100-ci.main.25">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>

Просмотреть файл

@ -1,8 +1,9 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.5.21302.13</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-preview.5.28</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21313.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21306.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-ci.main.40</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.0.100-ci.main.25</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.0.100-ci.main.25</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.0.100-ci.main.25</MicrosofttvOSSdkPackageVersion>

Просмотреть файл

@ -32,7 +32,7 @@ namespace Microsoft.Maui.DeviceTests
foreach (var assembly in TestInstrumentation.TestAssemblies.Distinct())
{
// this is required to exist, but is not used
var path = Path.Combine(FileSystem.CacheDirectory, assembly.Location);
var path = Path.Combine(FileSystem.CacheDirectory, assembly.GetName().Name);
File.Create(path).Close();
yield return new TestAssemblyInfo(assembly, path);

Просмотреть файл

@ -3,6 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetPreviewVersionBand)" Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-$(DotNetPreviewVersionBand)" Version="[$(MicrosoftAndroidSdkWindowsPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-$(DotNetPreviewVersionBand)" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-$(DotNetPreviewVersionBand)" Version="[$(MicrosoftiOSSdkPackageVersion)]" />

Просмотреть файл

@ -23,6 +23,7 @@
_DownloadDotNetInstallScript;
_InstallDotNet;
_AcquireWorkloads;
_InstallMonoWorkload;
_AcquirePacks;
</_ProvisionDependsOn>
</PropertyGroup>
@ -164,6 +165,13 @@
<Touch Files="$(DotNetSdkManifestsDirectory).stamp" AlwaysCreate="true" />
</Target>
<Target Name="_InstallMonoWorkload">
<Exec
Command="&quot;$(DotNetToolPath)&quot; workload install microsoft-net-runtime-android --skip-manifest-update --verbosity diag"
WorkingDirectory="$(MauiRootDirectory)"
/>
</Target>
<Target Name="_AcquirePacks"
Condition=" '$(InstallWorkloadPacks)' == 'true' "
Inputs="$(_Inputs);Dependencies/Packs.csproj"