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

[net7.0] Update dependencies from dotnet/installer (#15426) 

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-preview.6.22306.4 -> To Version 7.0.100-preview.7.22357.5

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22273.1 -> To Version 7.0.100-1.22354.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Update global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-preview.6.22306.4 -> To Version 7.0.100-preview.7.22358.13

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22273.1 -> To Version 7.0.100-1.22354.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Bump global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-preview.6.22306.4 -> To Version 7.0.100-preview.7.22361.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22273.1 -> To Version 7.0.100-1.22354.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Bump global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-preview.6.22306.4 -> To Version 7.0.100-preview.7.22362.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22273.1 -> To Version 7.0.100-1.22354.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Re-generate global.json

* [registrar] Improve naming of generated P/Invoke wrappers.

C# method names generated by the C# compiler can have all sorts of invalid
characters, so just sanitize this a bit.

* [tests] Adjust InvalidRuntimeIdentifier_Restore to expect failure for Mac Catalyst.

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-preview.6.22306.4 -> To Version 7.0.100-rc.1.22363.4

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22273.1 -> To Version 7.0.100-1.22362.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Re-generate global.json

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Co-authored-by: GitHub Actions <github-actions@xamarin.com>
This commit is contained in:
dotnet-maestro[bot] 2022-07-14 10:14:29 +02:00 коммит произвёл GitHub
Родитель 999e7235ea
Коммит ec949c9991
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 35 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1,21 +1,21 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.6.22306.4">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22363.4">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>1e2223659dbf25fc00f9119ad70629aae1f3d05f</Sha>
<Sha>691d82ff676ba35c1bb28ef94fbe7c9021481e1f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22273.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22362.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>d794136809e207f9cfe02914af68b308106cc2c3</Sha>
<Sha>33a76b856466b96dd3d179e599a7fc0118389641</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22304.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.7.22358.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bad2ab053c53f68a9b7b8ed7d0867fc58261bc9a</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.6.22303.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22362.16" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b806844373440a538192181652d466b621a14494</Sha>
<Sha>69c7a87cd8f05da9c05c373edfc0337c9e864d9e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>

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

@ -1,11 +1,11 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.6.22306.4</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22273.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22363.4</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22362.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22304.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
</PropertyGroup>
</Project>

2
global.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.100-preview.6.22306.4"
"version": "7.0.100-rc.1.22363.4"
}
}

5
tests/common/DotNet.cs
Просмотреть файл

@ -57,6 +57,11 @@ namespace Xamarin.Tests {
return Execute ("restore", project, properties, true);
}
public static ExecutionResult Restore (string project, Dictionary<string, string> properties = null)
{
return Execute ("restore", project, properties, false);
}
public static ExecutionResult AssertBuild (string project, Dictionary<string, string> properties = null)
{
return Execute ("build", project, properties, true);

20
tests/dotnet/UnitTests/ProjectTest.cs
Просмотреть файл

@ -487,11 +487,11 @@ namespace Xamarin.Tests {
}
[Test]
[TestCase (ApplePlatform.iOS, "win10-x86")]
[TestCase (ApplePlatform.TVOS, "win10-x64")]
[TestCase (ApplePlatform.MacOSX, "win10-arm")]
[TestCase (ApplePlatform.MacCatalyst, "win10-arm64")]
public void InvalidRuntimeIdentifier_Restore (ApplePlatform platform, string runtimeIdentifier)
[TestCase (ApplePlatform.iOS, "win10-x86", null)]
[TestCase (ApplePlatform.TVOS, "win10-x64", null)]
[TestCase (ApplePlatform.MacOSX, "win10-arm", null)]
[TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "Unable to find package Microsoft.NETCore.App.Runtime.Mono.win-arm64. No packages exist with this id in source[(]s[)]:.*")]
public void InvalidRuntimeIdentifier_Restore (ApplePlatform platform, string runtimeIdentifier, string? failureMessagePattern)
{
var project = "MySimpleApp";
Configuration.IgnoreIfIgnoredPlatform (platform);
@ -499,7 +499,15 @@ namespace Xamarin.Tests {
var project_path = GetProjectPath (project, platform: platform);
Clean (project_path);
var properties = GetDefaultProperties (runtimeIdentifier);
DotNet.AssertRestore (project_path, properties);
if (string.IsNullOrEmpty (failureMessagePattern)) {
DotNet.AssertRestore (project_path, properties);
} else {
var rv = DotNet.Restore (project_path, properties);
Assert.AreNotEqual (0, rv.ExitCode, "Expected failure");
var errors = BinLog.GetBuildLogErrors (rv.BinLogPath).ToArray ();
Assert.That (errors.Length, Is.GreaterThan (0), "Error count");
Assert.That (errors [0].Message, Does.Match (failureMessagePattern), "Message failure");
}
}
[Test]

6
tools/common/StaticRegistrar.cs
Просмотреть файл

@ -4945,10 +4945,12 @@ namespace Registrar {
string wrapperName;
if (!signatures.TryGetValue (signature.ToString (), out wrapperName)) {
var name = "xamarin_pinvoke_wrapper_" + method.Name;
var methodName = method.Name.Replace ('<', '_').Replace ('>', '_').Replace ('|', '_');
var baseName = "xamarin_pinvoke_wrapper_" + methodName;
var name = baseName;
var counter = 0;
while (names.Contains (name)) {
name = "xamarin_pinvoke_wrapper_" + method.Name + (++counter).ToString ();
name = baseName + (++counter).ToString ();
}
names.Add (name);
signatures [signature.ToString ()] = wrapperName = name;