Skip to content

Commit 1c1bbf4

Browse files
rolfbjarnerolfbjarne
committed
Merge remote-tracking branch 'origin/main' into support-composer-icons
2 parents 99a4a0b + 9c6a586 commit 1c1bbf4

File tree

825 files changed

+351878
-14300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

825 files changed

+351878
-14300
lines changed

‎.github/workflows/linux-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: 'Checkout'
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
with:
1818
fetch-depth: 0
1919
submodules: recursive

‎Directory.Build.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
<SystemDrawingCommonPackageVersion>4.7.2</SystemDrawingCommonPackageVersion>
1818
<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.1 brought by Microsoft.Build.Tasks.Core package -->
1919
<SystemSecurityCryptographyXmlPackageVersion>8.0.0</SystemSecurityCryptographyXmlPackageVersion>
20+
21+
<ClangSharpPackageVersion>21.1.8.2</ClangSharpPackageVersion>
22+
<ICSharpCodeNRefactoryPackageVersion>5.5.1</ICSharpCodeNRefactoryPackageVersion>
23+
<libclangPackageVersion>21.1.8</libclangPackageVersion>
24+
<MicrosoftNETTestSdkPackageVersion>17.14.0</MicrosoftNETTestSdkPackageVersion>
25+
<MonoCecilPackageVersion>0.11.6</MonoCecilPackageVersion>
26+
<NUnit3TestAdapterPackageVersion>5.0.0</NUnit3TestAdapterPackageVersion>
27+
<NUnitAnalyzersPackageVersion>4.7.0</NUnitAnalyzersPackageVersion>
28+
<NUnitPackageVersion>4.3.2</NUnitPackageVersion>
2029
</PropertyGroup>
2130
<Import Project="Build.props" Condition="Exists('Build.props')" />
2231
</Project>

‎NOTICE.txt‎

Lines changed: 290 additions & 0 deletions
Large diffs are not rendered by default.

‎NuGet.config‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
<clear />
1111
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1212
<!-- Begin: Package sources from dotnet-dotnet -->
13-
<add key="darc-pub-dotnet-dotnet-455f135" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-455f1358/nuget/v3/index.json" />
1413
<!-- End: Package sources from dotnet-dotnet -->
1514
<!-- Begin: Package sources from dotnet-macios -->
16-
<add key="darc-pub-dotnet-macios-45f29c7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-45f29c7b/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-macios-3804943" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-38049439/nuget/v3/index.json" />
1716
<!-- End: Package sources from dotnet-macios -->
1817
<!-- Begin: Package sources from xamarin-xamarin-macios -->
1918
<!-- End: Package sources from xamarin-xamarin-macios -->

‎docs/api/UIKit/UITableView.xml‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -304,65 +304,6 @@
304304
<related type="recipe" href="https://docs.xamarin.com/recipes/ios/content_controls/tables">Tables and UITableViewController</related>
305305
<related type="externalDocumentation" href="https://developer.apple.com/library/ios/documentation/UIKit/Reference/UITableView_Class/index.html">Apple documentation for <c>UITableView</c></related>
306306
</Docs>
307-
<Docs DocId="M:UIKit.UITableView.RegisterClassForHeaderFooterViewReuse(System.Type,Foundation.NSString)">
308-
<param name="cellType">The type of a UIView to create when the specified reuseIdentifier is passed to DequeueReusableCell.</param>
309-
<param name="reuseIdentifier">The reuse identifier.</param>
310-
<summary>Registers a type to provide UIViews for headers or footers for a specific reuseIdentifier.</summary>
311-
<remarks>
312-
<para>
313-
You can use this method to register the type of a class
314-
that should be instantiated if the UITableView needs to
315-
create a new header or footer in response to a request in
316-
DequeueReusableHeaderFooterView for the specified reuseIdentifier.
317-
318-
</para>
319-
<para>
320-
Registering types with reuse identifiers helps reduce the
321-
amount of code that you have to write in your GetFooterView or GetHeaderView methods.
322-
It means that your code only needs to
323-
call DequeueReusableHeaderFooterView with the reuse identifier, and
324-
if there is no available cell, the UITableView will
325-
create an instance of the specified type and return it.
326-
327-
</para>
328-
<para>
329-
The type that you register must provide a constructor
330-
that takes an <see cref="NativeHandle" /> constructor and needs to chain to
331-
the <see cref="UIKit.UIView(NativeHandle)" />
332-
constructor.
333-
</para>
334-
</remarks>
335-
</Docs>
336-
<Docs DocId="M:UIKit.UITableView.RegisterClassForCellReuse(System.Type,Foundation.NSString)">
337-
<param name="cellType">The type of a UITableViewCell to create when the specified reuseIdentifier is passed to DequeueReusableCell.</param>
338-
<param name="reuseIdentifier">The reuse identifier.</param>
339-
<summary>Registers a type to provide UITableViewCells for a specific reuseIdentifier.</summary>
340-
<remarks>
341-
<para>
342-
Mono can use this method to register the type of a class
343-
that should be instantiated if the UITableView needs to
344-
create a new cell in response to a request in
345-
DequeueReusableCell for the specified reuseIdentifier.
346-
347-
</para>
348-
<para>
349-
Registering types with cell identifiers helps reduce the
350-
amount of code that you have to write in your GetCell
351-
method. It means that your GetCell method only needs to
352-
call DequeueReusableCell with the reuse identifier, and
353-
if there is no available cell, the UITableView will
354-
create an instance of the specified type and return it.
355-
356-
</para>
357-
<para>
358-
The type that you register must provide a constructor
359-
that takes an IntPtr constructor and needs to chain to
360-
the <see cref="UIKit.UITableViewCell(NativeHandle)" />
361-
constructor.
362-
363-
</para>
364-
</remarks>
365-
</Docs>
366307
<Docs DocId="M:UIKit.UITableView.DequeueReusableCell(Foundation.NSString)">
367308
<param name="identifier">A string identifying the cell type being requested.</param>
368309
<summary>Returns a reusable table view cell that was created with the given ReuseIdentifier.</summary>

‎docs/api/UIKit/UITableViewCell.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@
7979
<related type="article" href="https://docs.xamarin.com/guides/ios/user_interface/tables">Working with Tables and Cells</related>
8080
<related type="externalDocumentation" href="https://developer.apple.com/library/ios/documentation/UIKit/Reference/UITableViewCell_Class/index.html">Apple documentation for <c>UITableViewCell</c></related>
8181
</Docs>
82-
<Docs DocId="M:UIKit.UITableViewCell.#ctor(UIKit.UITableViewCellStyle,System.String)">
83-
<param name="style">The style to use for this cell.</param>
84-
<param name="reuseIdentifier">A string used to identify the cell object if it should be reused for mutiple rows in a table view. Pass <see langword="null" /> if the object should not be reused. The same reuse identifier string should be used for all cells that use the same class and layout.</param>
85-
<summary>Create a table cell with the given style and reuse identifier.</summary>
86-
<remarks>
87-
<para>The reuse identifier is associated with all cells (rows) in a table view that have the same layout (irrespective of their content) and can therefore be used interchangeably. The <see cref="UIKit.UITableViewSource.GetCell(UIKit.UITableView,Foundation.NSIndexPath)" /> implementation calls <see cref="UIKit.UITableView.DequeueReusableCell(Foundation.NSString)" /> with a specific reuse identifier string to obtain a cached cell object with a particular layout to use as the basis for the row being constructed for viewing.</para>
88-
<para>To produce a layout different to those built-in to <see cref="UIKit.UITableViewCell" />, create a custom cell. To set the row height of each cell differently, implement <see cref="UIKit.UITableViewSource.GetHeightForRow(UIKit.UITableView,Foundation.NSIndexPath)" />.</para>
89-
</remarks>
90-
</Docs>
9182
<Docs DocId="P:UIKit.UITableViewCell.Highlighted">
9283
<summary>Whether the cell is highlighted.</summary>
9384
<value>Default value is <see langword="false" />.</value>

‎docs/api/UIKit/UITextAttributes.xml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎dotnet/Workloads/SignList.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@
130130
<!-- Sign dylibs -->
131131
<MacDeveloperSign Include="MonoBundle\*.dylib" />
132132
<MacDeveloperSign Include="native\*.dylib" />
133+
<MacDeveloperSign Include="libclang.dylib" />
134+
<MacDeveloperSign Include="libClangSharp.dylib" />
133135
</ItemGroup>
134136

135137
<Import Project="$(MSBuildThisFileDirectory)SignList.targets" />

‎eng/Version.Details.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26110.110</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26110.110</MicrosoftDotNetBuildTasksFeedPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26113.113</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26113.113</MicrosoftDotNetBuildTasksFeedPackageVersion>
1111
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26070.104</MicrosoftDotNetCecilPackageVersion>
12-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.26110.110</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
12+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.26113.113</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
1313
<MicrosoftNETILLinkPackageVersion>10.0.3-servicing.26070.104</MicrosoftNETILLinkPackageVersion>
1414
<MicrosoftNETILLinkTasksPackageVersion>10.0.3</MicrosoftNETILLinkTasksPackageVersion>
1515
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.3</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16-
<MicrosoftNETSdkPackageVersion>10.0.200-preview.0.26110.110</MicrosoftNETSdkPackageVersion>
16+
<MicrosoftNETSdkPackageVersion>10.0.200-preview.0.26113.113</MicrosoftNETSdkPackageVersion>
1717
<MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.200-preview.26110.110</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
18+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.200-preview.26113.113</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1919
<!-- dotnet/macios dependencies -->
2020
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
2121
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
22-
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9788</MicrosoftiOSSdknet90_260PackageVersion>
22+
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9790</MicrosoftiOSSdknet90_260PackageVersion>
2323
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>
2424
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
25-
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9788</MicrosoftMacCatalystSdknet90_260PackageVersion>
25+
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9790</MicrosoftMacCatalystSdknet90_260PackageVersion>
2626
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.11017</MicrosoftmacOSSdknet100_260PackageVersion>
2727
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
28-
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9788</MicrosoftmacOSSdknet90_260PackageVersion>
28+
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9790</MicrosoftmacOSSdknet90_260PackageVersion>
2929
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
3030
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
31-
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9788</MicrosofttvOSSdknet90_260PackageVersion>
31+
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9790</MicrosofttvOSSdknet90_260PackageVersion>
3232
<!-- xamarin/xamarin-macios dependencies -->
3333
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
3434
<MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.200-preview.0.26110.110">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.200-preview.0.26113.113">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>24f66fec875855c1e7bcddebf0703b2fcab1ee3e</Sha>
5+
<Sha>05d9490471fb4b10d7ef4faa32c423e1b5adcaee</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.3-servicing.26070.104">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -60,21 +60,21 @@
6060
<Sha>797d30720e5e629d23eb146935da94cb1b61047e</Sha>
6161
</Dependency>
6262
<!-- This is a subscription of the .NET 9/Xcode 26.0 versions of our packages -->
63-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9788">
63+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9790">
6464
<Uri>https://github.com/dotnet/macios</Uri>
65-
<Sha>45f29c7bf558fc351e421d95d7b60d1bf14a5a7e</Sha>
65+
<Sha>3804943966098de96e6cf0710537e1eb996d3224</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9788">
67+
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9790">
6868
<Uri>https://github.com/dotnet/macios</Uri>
69-
<Sha>45f29c7bf558fc351e421d95d7b60d1bf14a5a7e</Sha>
69+
<Sha>3804943966098de96e6cf0710537e1eb996d3224</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9788">
71+
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9790">
7272
<Uri>https://github.com/dotnet/macios</Uri>
73-
<Sha>45f29c7bf558fc351e421d95d7b60d1bf14a5a7e</Sha>
73+
<Sha>3804943966098de96e6cf0710537e1eb996d3224</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9788">
75+
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9790">
7676
<Uri>https://github.com/dotnet/macios</Uri>
77-
<Sha>45f29c7bf558fc351e421d95d7b60d1bf14a5a7e</Sha>
77+
<Sha>3804943966098de96e6cf0710537e1eb996d3224</Sha>
7878
</Dependency>
7979
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
8080
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
@@ -95,25 +95,25 @@
9595
</Dependency>
9696
</ProductDependencies>
9797
<ToolsetDependencies>
98-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26110.110">
98+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26113.113">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>24f66fec875855c1e7bcddebf0703b2fcab1ee3e</Sha>
100+
<Sha>05d9490471fb4b10d7ef4faa32c423e1b5adcaee</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.26110.110">
102+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.26113.113">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>24f66fec875855c1e7bcddebf0703b2fcab1ee3e</Sha>
104+
<Sha>05d9490471fb4b10d7ef4faa32c423e1b5adcaee</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.200-preview.26110.110">
106+
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.200-preview.26113.113">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>24f66fec875855c1e7bcddebf0703b2fcab1ee3e</Sha>
108+
<Sha>05d9490471fb4b10d7ef4faa32c423e1b5adcaee</Sha>
109109
</Dependency>
110110
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26107.1">
111111
<Uri>https://github.com/dotnet/xharness</Uri>
112112
<Sha>bfbac237157e59cdbd19334325b2af80bd6e9828</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26110.110">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26113.113">
115115
<Uri>https://github.com/dotnet/dotnet</Uri>
116-
<Sha>24f66fec875855c1e7bcddebf0703b2fcab1ee3e</Sha>
116+
<Sha>05d9490471fb4b10d7ef4faa32c423e1b5adcaee</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
</ToolsetDependencies>

0 commit comments

Comments
 (0)