[net8.0] Update dependencies from xamarin/xamarin-android (#17656)

* Update dependencies from https://github.com/xamarin/xamarin-android build 8.0.1xx-rc2-4c7b6455b7bbf60268520e8d55996133210d1a37-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-rc.2.464 -> To Version 34.0.0-rc.2.465

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23472.8 (parent: Microsoft.Android.Sdk.Windows

* Add missing feeds

* Update dependencies from https://github.com/xamarin/xamarin-android build 8.0.1xx-rc2-36bf7fbea070bd94155029a09aa079e52ca0e33e-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-rc.2.464 -> To Version 34.0.0-rc.2.467

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23472.8 (parent: Microsoft.Android.Sdk.Windows

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
This commit is contained in:
dotnet-maestro[bot] 2023-09-29 00:30:43 +00:00 коммит произвёл GitHub
Родитель 64f8afd8fc
Коммит f9ff50e888
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 15 добавлений и 15 удалений

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

@ -21,9 +21,9 @@
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
<add key="wasdk-internal" value="https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
<add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 7.0.11 -->
<add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-0ece505" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0ece5051/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 7.0.12 -->
<add key="darc-pub-dotnet-emsdk-9506882" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-95068821/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-26e0f82" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />

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

@ -17,4 +17,4 @@ if ($Target) { $cakeArguments += "--target=$Target" }
$cakeArguments += $ScriptArgs
& dotnet tool run dotnet-cake -- $cakeArguments
exit $LASTEXITCODE
exit $LASTEXITCODE

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

@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.2.23468.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.2.23472.8" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e1fd7d964980ed478fa30457cf750e81105caee1</Sha>
<Sha>e13fd5c19e383f99132b1bfd2496857db089b680</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.2.23457.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>da3500bb02343b1d0424c74ccdddbc592b5b3f4f</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-rc.2.464">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-rc.2.468">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>a7922449b00a9fc2bba076fe3c092c627f61ccbb</Sha>
<Sha>27347a7c258a62b9bf212f27f5492b4a7d16ac7b</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk.net8.0_16.4" Version="16.4.8911-net8-rc2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>

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

@ -3,7 +3,7 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>7.0.96</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23468.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23472.8</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.2.23457.7</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
@ -23,7 +23,7 @@
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-rc.2.23457.7</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0-rc.2.23457.7</MicrosoftExtensionsPrimitivesVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-rc.2.464</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-rc.2.468</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdknet80_164PackageVersion>16.4.8911-net8-rc2</MicrosoftMacCatalystSdknet80_164PackageVersion>
<MicrosoftmacOSSdknet80_133PackageVersion>13.3.8911-net8-rc2</MicrosoftmacOSSdknet80_133PackageVersion>

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

@ -110,8 +110,11 @@ Task("Test")
// Because we retry on CI we don't want to delete the previous failures
// We want to publish those files for reference
DeleteFiles(Directory(TEST_RESULTS).Path.Combine("*.*").FullPath);
SetDotNetEnvironmentVariables("/Users/runner/hostedtoolcache/dotnet");
}
var settings = new DotNetToolSettings {
DiagnosticOutput = true,
ArgumentCustomization = args => args.Append("run xharness apple test " +

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

@ -28,9 +28,6 @@ steps:
DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
PRIVATE_BUILD: $(PrivateBuild)
- pwsh: echo "##vso[task.prependpath]$(DotNet.Dir)"
displayName: 'Add .NET to PATH'
- ${{ if eq(parameters.useArtifacts, true) }}:
- task: DownloadBuildArtifacts@0
@ -52,7 +49,7 @@ steps:
PRIVATE_BUILD: $(PrivateBuild)
- ${{ else }}:
- pwsh: ./build.ps1 --target=dotnet-buildtasks --configuration="Release"
- pwsh: dotnet cake --target=dotnet-buildtasks --configuration="Release"
displayName: 'Build the MSBuild Tasks'
- pwsh: ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }}

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

@ -6,7 +6,7 @@ variables:
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
value: true
- name: DOTNET_VERSION
value: 7.0.203
value: 7.0.401
- name: REQUIRED_XCODE
value: 14.3.1
- name: DEVICETESTS_REQUIRED_XCODE