xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[main] Update dependencies from dotnet/installer (#11747) 

* Update dependencies from https://github.com/dotnet/installer build 20210530.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.6.21274.3 -> To Version 6.0.100-preview.6.21280.2

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-preview.5.21271.1 -> To Version 6.0.100-preview.6.21277.2 (parent: Microsoft.Dotnet.Sdk.Internal

* Bump to MSBuild.StructuredLogger v2.1.500 to get support for log format v14.

* [tests] Skip code that needs System.ComponentModel.Composition or System.Json due to #11710.

Ref: https://github.com/xamarin/xamarin-macios/issues/11710

* [tests] Adjust logic to find MSBuild items after the last MSBuild.StructuredLogger update.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
This commit is contained in:
dotnet-maestro[bot] 2021-06-02 07:48:29 +02:00 коммит произвёл GitHub
Родитель 071ac6463e
Коммит 0d3ecfc065
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 38 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
eng/Version.Details.xml
Просмотреть файл

@ -1,12 +1,12 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21274.3">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21280.2">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>a5d87f9fa13c48d0b46beb9be1a93b129345fd37</Sha>
<Sha>46b17bd1587380d190dcdfd45a61a5b5c1eb6c93</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21271.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21277.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri>
<Sha>4526d388102db2dc481522d9dee92b8f32414b23</Sha>
<Sha>50901f9ba5c8672c2758577a61f45fea3cc6cd76</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>

4
eng/Versions.props
Просмотреть файл

@ -1,8 +1,8 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21274.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.5.21271.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21280.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21277.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
</PropertyGroup>
</Project>

2
tests/bgen/bgen-tests.csproj
Просмотреть файл

@ -12,7 +12,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.472" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.500" />
</ItemGroup>
<ItemGroup>

2
tests/dotnet/UnitTests/DotNetUnitTests.csproj
Просмотреть файл

@ -10,7 +10,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.472" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.500" />
</ItemGroup>
<ItemGroup>

2
tests/generator/generator-tests.csproj
Просмотреть файл

@ -33,7 +33,7 @@
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="Mono.Cecil" Version="0.11.1" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.472" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.500" />
</ItemGroup>
<ItemGroup>
<Compile Include="ErrorTests.cs" />

5
tests/linker/ios/link all/MEFTests.cs
Просмотреть файл

@ -1,4 +1,5 @@
using System;
#if !NET // https://github.com/xamarin/xamarin-macios/issues/11710
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.ComponentModel.Composition.Hosting;
@ -78,3 +79,5 @@ namespace LinkAll.Mef {
}
}
}
#endif // !NET

4
tests/linker/ios/link sdk/LinkSdkRegressionTest.cs
Просмотреть файл

@ -6,7 +6,9 @@ using System.Data;
using System.Diagnostics;
using System.Globalization;
using System.IO;
#if !NET // https://github.com/xamarin/xamarin-macios/issues/11710
using System.Json;
#endif
using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
@ -623,6 +625,7 @@ namespace LinkSdk {
Assert.NotNull (getInstance (), "Location");
}
#if !NET // https://github.com/xamarin/xamarin-macios/issues/11710
[Test]
[Culture ("en")]
public void Json_Parse_4415 ()
@ -635,6 +638,7 @@ namespace LinkSdk {
f *= 10;
Assert.AreNotEqual (f, (float) v, "non-equal");
}
#endif // !NET
[Test]
[Culture ("en")]

2
tests/mmptest/mmptest.csproj
Просмотреть файл

@ -40,7 +40,7 @@
<HintPath>..\..\_mac-build\Library\Frameworks\Xamarin.Mac.framework\Versions\git\lib\mmp\mmp.exe</HintPath>
</Reference>
<PackageReference Include="Mono.Cecil" Version="0.11.1" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.472" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.500" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />

20
tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs
Просмотреть файл

@ -82,7 +82,20 @@ namespace Xamarin.Tests {
var rv = new List<MSBuildItem> ();
// Items inside ItemGroups
var items = build.FindChildrenRecursive<Item> (v => (v.Parent as Folder)?.Name == name);
var items = build.FindChildrenRecursive<Item> (v => {
var parent = v.Parent as NamedNode;
if (parent?.Name != name)
return false;
if (!(parent is Folder || (parent is AddItem && parent.Parent is Folder)))
return false;
parent = parent.Parent as NamedNode;
if (parent?.Name == "OutputItems")
return false;
return true;
});
foreach (var item in items) {
rv.Add (CreateItem (item));
}
@ -91,7 +104,10 @@ namespace Xamarin.Tests {
var resolvedProjectPath = PathUtils.ResolveSymbolicLinks (project.ProjectCSProjPath);
var outputItems = build.FindChildrenRecursive<Item> (v => {
var parent = v.Parent as NamedNode;
if (parent?.Name != name || !(parent is Parameter))
if (parent?.Name != name)
return false;
if (!(parent is Parameter || parent is AddItem))
return false;
parent = parent.Parent as NamedNode;

2
tests/msbuild/Xamarin.MacDev.Tests/Xamarin.MacDev.Tests.csproj
Просмотреть файл

@ -11,7 +11,7 @@
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="NUnit.Extension.NUnitV2ResultWriter" Version="3.6.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.1" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.472" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.500" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\mtouch\Cache.cs">

2
tests/mtouch/mtouchtests.csproj
Просмотреть файл

@ -27,7 +27,7 @@
<Reference Include="System.Xml" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.472" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.500" />
<Reference Include="Mono.Cecil">
<HintPath>..\..\builds\mono-ios-sdk-destdir\ios-bcl\monotouch_tools\Mono.Cecil.dll</HintPath>
</Reference>