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

Merge remote-tracking branch 'origin/net8.0' into bump-main-in-net8.0-2023-03-14

This commit is contained in:
Rolf Bjarne Kvinge 2023-03-23 08:36:36 +01:00
Родитель 4131267879 247d1a9838
Коммит 0d992d467b
2 изменённых файлов: 17 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -18,15 +18,7 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3265dc6a9b05c74b199aa39351e5413317df9ad5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100-preview.2" Version="8.0.0-preview.2.23108.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>a117e262c0c49e71a0017e96a0a1124ec990d05f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100-preview.2" Version="8.0.0-preview.2.23108.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>a117e262c0c49e71a0017e96a0a1124ec990d05f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2" Version="8.0.0-preview.2.23113.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.2.23113.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>d7ff0aa47c680be543905cc1410e2f62b54dfefe</Sha>
</Dependency>
@ -35,21 +27,21 @@
<Sha>68e0c35d0b4b6651b9a062a52e7dd694d7a43927</Sha>
</Dependency>
<!-- This is a subscription of the .NET 7 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.2.1051">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.2.1054">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>76c2f4bb2207459fa4bf8885b9ed81136e2fe0ab</Sha>
<Sha>58b2ef64a4ef68385a645f1fe3b2cfae71bdb8d8</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="13.1.1051">
<Dependency Name="Microsoft.macOS.Sdk" Version="13.1.1054">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>76c2f4bb2207459fa4bf8885b9ed81136e2fe0ab</Sha>
<Sha>58b2ef64a4ef68385a645f1fe3b2cfae71bdb8d8</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.2.1051">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.2.1054">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>76c2f4bb2207459fa4bf8885b9ed81136e2fe0ab</Sha>
<Sha>58b2ef64a4ef68385a645f1fe3b2cfae71bdb8d8</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.1548">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.1551">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>76c2f4bb2207459fa4bf8885b9ed81136e2fe0ab</Sha>
<Sha>58b2ef64a4ef68385a645f1fe3b2cfae71bdb8d8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>

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

@ -7,19 +7,17 @@
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23127.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptennet6Manifest80100preview2Version>8.0.0-preview.2.23108.1</MicrosoftNETWorkloadEmscriptennet6Manifest80100preview2Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest80100preview2Version>8.0.0-preview.2.23108.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100preview2Version>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>8.0.0-preview.2.23113.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.2.23113.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23113.1</MicrosoftDotNetCecilPackageVersion>
<!-- Manually updated versions -->
<Emscriptennet6WorkloadVersion>$(MicrosoftNETWorkloadEmscriptennet6Manifest80100preview2Version)</Emscriptennet6WorkloadVersion>
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100preview2Version)</Emscriptennet7WorkloadVersion>
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version)</EmscriptenWorkloadVersion>
<Emscriptennet6WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</Emscriptennet6WorkloadVersion>
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</Emscriptennet7WorkloadVersion>
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</EmscriptenWorkloadVersion>
<!-- This is a subscription of the .NET 7 versions of our packages -->
<MicrosoftMacCatalystSdkPackageVersion>16.2.1051</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.1.1051</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.2.1051</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.1.1548</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.2.1054</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.1.1054</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.2.1054</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.1.1551</MicrosofttvOSSdkPackageVersion>
</PropertyGroup>
</Project>