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

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

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21426.20

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21427.35

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21428.23

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21430.3

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21431.4

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21451.9

Dependency coherency updates

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

* [tests] Adjust path changes for tvOS

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21452.10

Dependency coherency updates

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

* Looks like macOS/dotnet is not quite the legacy build (which works)

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21453.10

Dependency coherency updates

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

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21454.1

Dependency coherency updates

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

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21454.3

Dependency coherency updates

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

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

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-rc.2.21425.12 -> To Version 6.0.100-rc.2.21456.2

Dependency coherency updates

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Sebastien Pouliot <sebastien.pouliot@gmail.com>
Co-authored-by: Sebastien Pouliot <sebastien.pouliot@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2021-09-07 12:26:14 +02:00 коммит произвёл GitHub
Родитель 56dd828392
Коммит 8bfa57704f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 13 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1,12 +1,12 @@
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.2.21425.12"> <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.2.21456.2">
<Uri>https://github.com/dotnet/installer</Uri> <Uri>https://github.com/dotnet/installer</Uri>
<Sha>49485bd6125f6cd23c75e0af463c44c3ea0d6278</Sha> <Sha>2468b41f268df0a986e23e1b1f941caca9751062</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21419.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal"> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21452.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri> <Uri>https://github.com/mono/linker</Uri>
<Sha>5851f6d62fedd9eb2edea9712c9764ca2ad6ab60</Sha> <Sha>8a5c446a84922bddccfcfc6d3cb5c117dc3babd4</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>

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

@ -1,8 +1,8 @@
<Project> <Project>
<!--Package versions--> <!--Package versions-->
<PropertyGroup> <PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.2.21425.12</MicrosoftDotnetSdkInternalPackageVersion> <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.2.21456.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21419.1</MicrosoftNETILLinkTasksPackageVersion> <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21452.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion> <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -948,10 +948,16 @@ namespace LinkSdk {
path = TestFolder (Environment.SpecialFolder.DesktopDirectory, exists: myExists); path = TestFolder (Environment.SpecialFolder.DesktopDirectory, exists: myExists);
#if __TVOS__
path = TestFolder (Environment.SpecialFolder.Fonts, exists: true);
#else
path = TestFolder (Environment.SpecialFolder.Fonts, exists: myExists); path = TestFolder (Environment.SpecialFolder.Fonts, exists: myExists);
#endif
#if __MACOS__ #if __MACOS__
path = TestFolder (Environment.SpecialFolder.Templates, supported: false); path = TestFolder (Environment.SpecialFolder.Templates, supported: false);
#elif __TVOS__
path = TestFolder (Environment.SpecialFolder.Templates, exists: true);
#else #else
path = TestFolder (Environment.SpecialFolder.Templates, exists: false); path = TestFolder (Environment.SpecialFolder.Templates, exists: false);
#endif #endif
@ -1002,7 +1008,7 @@ namespace LinkSdk {
} }
#endif // __MACOS__ #endif // __MACOS__
#if !__WATCHOS__ && !NET #if !__WATCHOS__ && !__MACOS__
// tvOS (device sandbox) is more restrictive than iOS as it limit access to more // tvOS (device sandbox) is more restrictive than iOS as it limit access to more
// directories, mostly because they are not guaranteed to be preserved between executions // directories, mostly because they are not guaranteed to be preserved between executions
bool tvos = UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.TV; bool tvos = UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.TV;