Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions eng/NuGetVersions.targets
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,10 @@
Update="Microsoft.CodeAnalysis.PublicApiAnalyzers"
Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)"
/>
<PackageReference
Update="Mono.ApiTools.MSBuildTasks"
Version="$(MonoApiToolsMSBuildTasksPackageVersion)"
/>
<PackageReference
Update="Tizen.UIExtensions.NUI"
Version="$(TizenUIExtensionsVersion)"
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
<MicrosoftBuildFrameworkPackageVersion>17.9.5</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>17.9.5</MicrosoftBuildUtilitiesCorePackageVersion>
<MonoApiToolsMSBuildTasksPackageVersion>0.4.0</MonoApiToolsMSBuildTasksPackageVersion>
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
<!-- must be kept in sync with the binding library version to it here: -->
<_XamarinAndroidGlideVersion>4.16.0.13</_XamarinAndroidGlideVersion>
Expand Down
2 changes: 0 additions & 2 deletions src/Controls/src/Core/Element/Element.cs
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,7 @@ public bool EffectIsAttached(string name)

//this is only used by XAMLC, not added to public API
[EditorBrowsable(EditorBrowsableState.Never)]
#pragma warning disable RS0016 // Add public types and members to the declared API
public INameScope transientNamescope;
#pragma warning restore RS0016 // Add public types and members to the declared API

/// <summary>Returns the element that has the specified name.</summary>
/// <param name="name">The name of the element to be found.</param>
Expand Down
2 changes: 0 additions & 2 deletions src/Controls/src/Core/Layout/FlexLayout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,7 @@ void InitItemProperties(IView view, Flex.Item item)
// Until we can rewrite the FlexLayout engine to handle measurement properly (without the "in measure mode" hacks)
// we need to replace the default implementation of CrossPlatformMeasure.
// And we need to disable the public API analyzer briefly, because it doesn't understand hiding.
#pragma warning disable RS0016 // Add public types and members to the declared API
new public Graphics.Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
#pragma warning restore RS0016 // Add public types and members to the declared API
{
var layoutManager = _layoutManager ??= CreateLayoutManager();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
~Microsoft.Maui.Controls.Element.transientNamescope -> Microsoft.Maui.Controls.Internals.INameScope
Microsoft.Maui.Controls.FlexLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.WebResourceRequested -> System.EventHandler<Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs!>?
Microsoft.Maui.Controls.ICornerElement
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
~Microsoft.Maui.Controls.Element.transientNamescope -> Microsoft.Maui.Controls.Internals.INameScope
Microsoft.Maui.Controls.FlexLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView
Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MauiCollectionView(CoreGraphics.CGRect frame, UIKit.UICollectionViewLayout! layout) -> void
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
*REMOVED*~Microsoft.Maui.Controls.Handlers.Compatibility.ShellScrollViewTracker.ShellScrollViewTracker(Microsoft.Maui.IPlatformViewHandler renderer) -> void
~Microsoft.Maui.Controls.Element.transientNamescope -> Microsoft.Maui.Controls.Internals.INameScope
Microsoft.Maui.Controls.FlexLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView
Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MauiCollectionView(CoreGraphics.CGRect frame, UIKit.UICollectionViewLayout! layout) -> void
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Expand Down Expand Up @@ -146,7 +147,6 @@ override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertFrom(System.Comp
override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MovedToWindow() -> void
override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
*REMOVED*override Microsoft.Maui.Controls.Handlers.Items.StructuredItemsViewController<TItemsView>.ViewWillLayoutSubviews() -> void
~override Microsoft.Maui.Controls.HorizontalStackLayout.ComputeConstraintForView(Microsoft.Maui.Controls.View view) -> void
override Microsoft.Maui.Controls.ImageSourceConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
override Microsoft.Maui.Controls.ImageSourceConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
~Microsoft.Maui.Controls.Element.transientNamescope -> Microsoft.Maui.Controls.Internals.INameScope
Microsoft.Maui.Controls.FlexLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.WebResourceRequested -> System.EventHandler<Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs!>?
Microsoft.Maui.Controls.ICornerElement
Expand Down
2 changes: 2 additions & 0 deletions src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
~Microsoft.Maui.Controls.Element.transientNamescope -> Microsoft.Maui.Controls.Internals.INameScope
Microsoft.Maui.Controls.FlexLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.WebResourceRequested -> System.EventHandler<Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs!>?
Microsoft.Maui.Controls.ICornerElement
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
~Microsoft.Maui.Controls.Element.transientNamescope -> Microsoft.Maui.Controls.Internals.INameScope
Microsoft.Maui.Controls.FlexLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.WebResourceRequested -> System.EventHandler<Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs!>?
Microsoft.Maui.Controls.ICornerElement
Expand Down
33 changes: 31 additions & 2 deletions src/PublicAPI.targets
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
<Project>

<PropertyGroup>
<!-- The Copilot SWE always generates instead of trying to fix -->
<PublicApiType Condition="'$(PublicApiType)' == '' and '$(GITHUB_WORKFLOW)' == 'Copilot'">Generate</PublicApiType>
<!-- The normal CI workflows will NEVER generate, only validate -->
<PublicApiType Condition="'$(PublicApiType)' == '' and ('$(CI)' == 'true' or '$(TF_BUILD)' == 'true')">Validate</PublicApiType>
<!-- The Release builds will NEVER generate, only validate -->
<PublicApiType Condition="'$(PublicApiType)' == '' and '$(Configuration)' != 'Debug'">Validate</PublicApiType>
<!-- Local Debug workflows will generate -->
<!--<PublicApiType Condition="'$(PublicApiType)' == '' and '$(Configuration)' == 'Debug'">Generate</PublicApiType>-->
<!-- Fall back to validate -->
<PublicApiType Condition="'$(PublicApiType)' == ''">Validate</PublicApiType>
</PropertyGroup>

<ItemGroup>
<PackageReference Remove="Microsoft.CodeAnalysis.PublicApiAnalyzers" />
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" Condition="'$(PublicApiType)' != 'Generate'" />
<PackageReference Include="Mono.ApiTools.MSBuildTasks" PrivateAssets="all" Condition="'$(PublicApiType)' == 'Generate'" />
</ItemGroup>

<!-- for explicit TFMs -->
Expand All @@ -25,4 +39,19 @@
<AdditionalFiles Include="@(PublicAPIFiles)" />
</ItemGroup>

</Project>
<Target Name="_GeneratePublicApiFiles"
AfterTargets="Build"
Condition="'$(TargetFramework)' != '' and '$(PublicApiType)' == 'Generate'"
Inputs="$(TargetDir)$(AssemblyName).dll"
Outputs="$(IntermediateOutputPath)GeneratePublicApiFiles.stamp">
<GeneratePublicApiFiles
Assembly="$(TargetDir)$(AssemblyName).dll"
Files="@(PublicAPIFiles)"
ReferenceSearchPaths="@(ReferencePath)" />
<Touch Files="$(IntermediateOutputPath)GeneratePublicApiFiles.stamp" AlwaysCreate="True" />
<ItemGroup>
<FileWrites Include="$(IntermediateOutputPath)GeneratePublicApiFiles.stamp" />
</ItemGroup>
</Target>

</Project>
2 changes: 1 addition & 1 deletion src/SingleProject/Resizetizer/src/Resizetizer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<!-- A small task to make sure everything depends on the same version of SkiaSharp -->
<ItemGroup>
<PackageReference Include="Mono.ApiTools.MSBuildTasks" Version="0.3.0" PrivateAssets="all" />
<PackageReference Include="Mono.ApiTools.MSBuildTasks" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<_AdjustmentsAssembly>$(PkgSvg_Skia)\lib\netstandard2.0\Svg.Skia.dll</_AdjustmentsAssembly>
Expand Down
Loading