Merge pull request #323 from dotnet/darc-main-f514bd6d-d72e-4bd4-88ed-19db4ff9175a

[main] Update dependencies from xamarin/xamarin-android
This commit is contained in:
Jonathan Dick 2022-03-01 17:27:17 -05:00 коммит произвёл GitHub
Родитель 430eab4094 d6c702777d
Коммит bc0840d414
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 10 добавлений и 8 удалений

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

@ -8,7 +8,7 @@
<add key="darc-pub-dotnet-emsdk-ee0a97a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ee0a97a0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-6dd808f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6dd808ff-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-3ba4b3f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-3ba4b3f4/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />

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

@ -129,6 +129,8 @@ stages:
- pwsh: |
Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
# Fix sdk band version in Tizen script
((Get-Content -path .\workload-install.ps1 -Raw) -replace 'DotnetVersionBand = "6.0.200"','DotnetVersionBand = "6.0.300"') | Set-Content -Path .\workload-install.ps1
.\workload-install.ps1
displayName: install tizen

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

@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.200-rtm.22107.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.300-preview.22128.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>c506cfba13ac8861afdaaeadacb34fe7f54cde88</Sha>
<Sha>2ea9c6a34e055586b6435d7dca837dd01def4f2a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6dd808ff7ae62512330d2f111eb1f60f1ae40125</Sha>
<Sha>3ba4b3f4eb0b5e25d3901090f921c88055cac1b0</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.200-preview.14.95">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.200-preview.14.106">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>0583ca1d3a44f4ffc6a29b487ef2b4ed33d2c067</Sha>
<Sha>c71dfe6705d8f2edd8c2c7d75a46ed4797d84982</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.2.302-preview.14.91">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>

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

@ -2,13 +2,13 @@
<!--Package versions-->
<PropertyGroup>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>6.0.200-rtm.22107.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.300-preview.22128.2</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>6.0.3</MicrosoftNETCoreAppRefPackageVersion>
<!-- dotnet/emsdk -->
<MicrosoftNETWorkloadEmscriptenPackageVersion>6.0.2</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.200-preview.14.95</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.200-preview.14.106</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftiOSSdkPackageVersion>15.2.302-preview.14.91</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.2.302-preview.14.91</MicrosoftMacCatalystSdkPackageVersion>