Skip to content

Commit

Permalink
chore: Various sync generator fixes and adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinZikmund committed Dec 14, 2024
1 parent d2f7703 commit 2779b12
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 322 deletions.
2 changes: 1 addition & 1 deletion src/Uno.Foundation/Metadata/ApiInformation.shared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static bool IsApiContractPresent(string contractName, ushort majorVersion

case "Microsoft.UI.Xaml.Hosting.HostingContract":
// See C:\Program Files (x86)\Windows Kits\10\References\[version]\Microsoft.UI.Xaml.Hosting.HostingContract
return majorVersion <= 5; // SDK 10.0.22000.0
return majorVersion <= 5; // SDK 10.0.22000.0

case "Uno.WinUI":
#if HAS_UNO_WINUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Composition.SystemBackdrops
{
#if false
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class DesktopAcrylicController : global::Microsoft.UI.Composition.SystemBackdrops.ISystemBackdropController, global::System.IDisposable, global::Microsoft.UI.Composition.SystemBackdrops.ISystemBackdropControllerWithTargets, global::Microsoft.UI.IClosableNotifier
Expand Down Expand Up @@ -172,21 +172,9 @@ public void SetSystemBackdropConfiguration(global::Microsoft.UI.Composition.Syst
// Forced skipping of method Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController.LuminosityOpacity.set
// Forced skipping of method Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController.TintColor.get
// Forced skipping of method Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController.TintColor.set
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public DesktopAcrylicController()
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController", "DesktopAcrylicController.DesktopAcrylicController()");
}
#endif
// Skipping already declared method Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController.DesktopAcrylicController()
// Forced skipping of method Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController.DesktopAcrylicController()
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static bool IsSupported()
{
throw new global::System.NotImplementedException("The member bool DesktopAcrylicController.IsSupported() is not implemented. For more information, visit https://aka.platform.uno/notimplemented#m=bool%20DesktopAcrylicController.IsSupported%28%29");
}
#endif
// Skipping already declared method Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController.IsSupported()
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public event global::Windows.Foundation.TypedEventHandler<global::Microsoft.UI.Composition.SystemBackdrops.ISystemBackdropControllerWithTargets, object> StateChanged
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Composition.SystemBackdrops
{
#if false
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class MicaController : global::Microsoft.UI.Composition.SystemBackdrops.ISystemBackdropController, global::System.IDisposable, global::Microsoft.UI.Composition.SystemBackdrops.ISystemBackdropControllerWithTargets, global::Microsoft.UI.IClosableNotifier
Expand Down Expand Up @@ -172,21 +172,9 @@ public void SetSystemBackdropConfiguration(global::Microsoft.UI.Composition.Syst
// Forced skipping of method Microsoft.UI.Composition.SystemBackdrops.MicaController.LuminosityOpacity.set
// Forced skipping of method Microsoft.UI.Composition.SystemBackdrops.MicaController.TintColor.get
// Forced skipping of method Microsoft.UI.Composition.SystemBackdrops.MicaController.TintColor.set
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public MicaController()
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Microsoft.UI.Composition.SystemBackdrops.MicaController", "MicaController.MicaController()");
}
#endif
// Skipping already declared method Microsoft.UI.Composition.SystemBackdrops.MicaController.MicaController()
// Forced skipping of method Microsoft.UI.Composition.SystemBackdrops.MicaController.MicaController()
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static bool IsSupported()
{
throw new global::System.NotImplementedException("The member bool MicaController.IsSupported() is not implemented. For more information, visit https://aka.platform.uno/notimplemented#m=bool%20MicaController.IsSupported%28%29");
}
#endif
// Skipping already declared method Microsoft.UI.Composition.SystemBackdrops.MicaController.IsSupported()
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public event global::Windows.Foundation.TypedEventHandler<global::Microsoft.UI.Composition.SystemBackdrops.ISystemBackdropControllerWithTargets, object> StateChanged
Expand Down
170 changes: 14 additions & 156 deletions src/Uno.UI/Generated/3.0.0.0/Microsoft.UI.Xaml.Controls/ComboBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,163 +8,36 @@ namespace Microsoft.UI.Xaml.Controls
#endif
public partial class ComboBox
{
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public global::Microsoft.UI.Xaml.Style TextBoxStyle
{
get
{
return (global::Microsoft.UI.Xaml.Style)this.GetValue(TextBoxStyleProperty);
}
set
{
this.SetValue(TextBoxStyleProperty, value);
}
}
#endif
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public string Text
{
get
{
return (string)this.GetValue(TextProperty);
}
set
{
this.SetValue(TextProperty, value);
}
}
#endif
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public global::Microsoft.UI.Xaml.Controls.ComboBoxSelectionChangedTrigger SelectionChangedTrigger
{
get
{
return (global::Microsoft.UI.Xaml.Controls.ComboBoxSelectionChangedTrigger)this.GetValue(SelectionChangedTriggerProperty);
}
set
{
this.SetValue(SelectionChangedTriggerProperty, value);
}
}
#endif
// Skipping already declared property TextBoxStyle
// Skipping already declared property Text
// Skipping already declared property SelectionChangedTrigger
// Skipping already declared property PlaceholderText
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public global::Microsoft.UI.Xaml.Media.Brush PlaceholderForeground
{
get
{
return (global::Microsoft.UI.Xaml.Media.Brush)this.GetValue(PlaceholderForegroundProperty);
}
set
{
this.SetValue(PlaceholderForegroundProperty, value);
}
}
#endif
// Skipping already declared property PlaceholderForeground
// Skipping already declared property MaxDropDownHeight
// Skipping already declared property LightDismissOverlayMode
// Skipping already declared property IsTextSearchEnabled
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public bool IsEditable
{
get
{
return (bool)this.GetValue(IsEditableProperty);
}
set
{
this.SetValue(IsEditableProperty, value);
}
}
#endif
// Skipping already declared property IsEditable
// Skipping already declared property IsDropDownOpen
// Skipping already declared property HeaderTemplate
// Skipping already declared property Header
// Skipping already declared property Description
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public bool IsSelectionBoxHighlighted
{
get
{
throw new global::System.NotImplementedException("The member bool ComboBox.IsSelectionBoxHighlighted is not implemented. For more information, visit https://aka.platform.uno/notimplemented#m=bool%20ComboBox.IsSelectionBoxHighlighted");
}
}
#endif
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public object SelectionBoxItem
{
get
{
throw new global::System.NotImplementedException("The member object ComboBox.SelectionBoxItem is not implemented. For more information, visit https://aka.platform.uno/notimplemented#m=object%20ComboBox.SelectionBoxItem");
}
}
#endif
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public global::Microsoft.UI.Xaml.DataTemplate SelectionBoxItemTemplate
{
get
{
throw new global::System.NotImplementedException("The member DataTemplate ComboBox.SelectionBoxItemTemplate is not implemented. For more information, visit https://aka.platform.uno/notimplemented#m=DataTemplate%20ComboBox.SelectionBoxItemTemplate");
}
}
#endif
// Skipping already declared property IsSelectionBoxHighlighted
// Skipping already declared property SelectionBoxItem
// Skipping already declared property SelectionBoxItemTemplate
// Skipping already declared property TemplateSettings
// Skipping already declared property DescriptionProperty
// Skipping already declared property HeaderProperty
// Skipping already declared property HeaderTemplateProperty
// Skipping already declared property IsDropDownOpenProperty
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static global::Microsoft.UI.Xaml.DependencyProperty IsEditableProperty { get; } =
Microsoft.UI.Xaml.DependencyProperty.Register(
nameof(IsEditable), typeof(bool),
typeof(global::Microsoft.UI.Xaml.Controls.ComboBox),
new Microsoft.UI.Xaml.FrameworkPropertyMetadata(default(bool)));
#endif
// Skipping already declared property IsEditableProperty
// Skipping already declared property IsTextSearchEnabledProperty
// Skipping already declared property LightDismissOverlayModeProperty
// Skipping already declared property MaxDropDownHeightProperty
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static global::Microsoft.UI.Xaml.DependencyProperty PlaceholderForegroundProperty { get; } =
Microsoft.UI.Xaml.DependencyProperty.Register(
nameof(PlaceholderForeground), typeof(global::Microsoft.UI.Xaml.Media.Brush),
typeof(global::Microsoft.UI.Xaml.Controls.ComboBox),
new Microsoft.UI.Xaml.FrameworkPropertyMetadata(default(global::Microsoft.UI.Xaml.Media.Brush)));
#endif
// Skipping already declared property PlaceholderForegroundProperty
// Skipping already declared property PlaceholderTextProperty
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static global::Microsoft.UI.Xaml.DependencyProperty SelectionChangedTriggerProperty { get; } =
Microsoft.UI.Xaml.DependencyProperty.Register(
nameof(SelectionChangedTrigger), typeof(global::Microsoft.UI.Xaml.Controls.ComboBoxSelectionChangedTrigger),
typeof(global::Microsoft.UI.Xaml.Controls.ComboBox),
new Microsoft.UI.Xaml.FrameworkPropertyMetadata(default(global::Microsoft.UI.Xaml.Controls.ComboBoxSelectionChangedTrigger)));
#endif
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static global::Microsoft.UI.Xaml.DependencyProperty TextBoxStyleProperty { get; } =
Microsoft.UI.Xaml.DependencyProperty.Register(
nameof(TextBoxStyle), typeof(global::Microsoft.UI.Xaml.Style),
typeof(global::Microsoft.UI.Xaml.Controls.ComboBox),
new Microsoft.UI.Xaml.FrameworkPropertyMetadata(default(global::Microsoft.UI.Xaml.Style)));
#endif
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public static global::Microsoft.UI.Xaml.DependencyProperty TextProperty { get; } =
Microsoft.UI.Xaml.DependencyProperty.Register(
nameof(Text), typeof(string),
typeof(global::Microsoft.UI.Xaml.Controls.ComboBox),
new Microsoft.UI.Xaml.FrameworkPropertyMetadata(default(string)));
#endif
// Skipping already declared property SelectionChangedTriggerProperty
// Skipping already declared property TextBoxStyleProperty
// Skipping already declared property TextProperty
// Skipping already declared method Microsoft.UI.Xaml.Controls.ComboBox.ComboBox()
// Forced skipping of method Microsoft.UI.Xaml.Controls.ComboBox.ComboBox()
// Forced skipping of method Microsoft.UI.Xaml.Controls.ComboBox.IsDropDownOpen.get
Expand Down Expand Up @@ -220,21 +93,6 @@ public object SelectionBoxItem
// Forced skipping of method Microsoft.UI.Xaml.Controls.ComboBox.DescriptionProperty.get
// Skipping already declared event Microsoft.UI.Xaml.Controls.ComboBox.DropDownClosed
// Skipping already declared event Microsoft.UI.Xaml.Controls.ComboBox.DropDownOpened
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public event global::Windows.Foundation.TypedEventHandler<global::Microsoft.UI.Xaml.Controls.ComboBox, global::Microsoft.UI.Xaml.Controls.ComboBoxTextSubmittedEventArgs> TextSubmitted
{
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
add
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Microsoft.UI.Xaml.Controls.ComboBox", "event TypedEventHandler<ComboBox, ComboBoxTextSubmittedEventArgs> ComboBox.TextSubmitted");
}
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
remove
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Microsoft.UI.Xaml.Controls.ComboBox", "event TypedEventHandler<ComboBox, ComboBoxTextSubmittedEventArgs> ComboBox.TextSubmitted");
}
}
#endif
// Skipping already declared event Microsoft.UI.Xaml.Controls.ComboBox.TextSubmitted
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Xaml.Controls
{
#if false
#if false || false || false || false || false || false || false
public enum ComboBoxSelectionChangedTrigger
{
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
Committed = 0,
#endif
#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
Always = 1,
#endif
// Skipping already declared field Microsoft.UI.Xaml.Controls.ComboBoxSelectionChangedTrigger.Committed
// Skipping already declared field Microsoft.UI.Xaml.Controls.ComboBoxSelectionChangedTrigger.Always
}
#endif
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,13 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Xaml.Controls
{
#if false
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class ComboBoxTextSubmittedEventArgs
{
#if false
internal ComboBoxTextSubmittedEventArgs()
{
}
#endif
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public bool Handled
{
get
{
throw new global::System.NotImplementedException("The member bool ComboBoxTextSubmittedEventArgs.Handled is not implemented. For more information, visit https://aka.platform.uno/notimplemented#m=bool%20ComboBoxTextSubmittedEventArgs.Handled");
}
set
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Microsoft.UI.Xaml.Controls.ComboBoxTextSubmittedEventArgs", "bool ComboBoxTextSubmittedEventArgs.Handled");
}
}
#endif
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public string Text
{
get
{
throw new global::System.NotImplementedException("The member string ComboBoxTextSubmittedEventArgs.Text is not implemented. For more information, visit https://aka.platform.uno/notimplemented#m=string%20ComboBoxTextSubmittedEventArgs.Text");
}
}
#endif
// Skipping already declared property Handled
// Skipping already declared property Text
// Forced skipping of method Microsoft.UI.Xaml.Controls.ComboBoxTextSubmittedEventArgs.Text.get
// Forced skipping of method Microsoft.UI.Xaml.Controls.ComboBoxTextSubmittedEventArgs.Handled.get
// Forced skipping of method Microsoft.UI.Xaml.Controls.ComboBoxTextSubmittedEventArgs.Handled.set
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,13 @@
#pragma warning disable 114 // new keyword hiding
namespace Microsoft.UI.Xaml.Controls
{
#if false
#if false || false || false || false || false || false || false
[global::Uno.NotImplemented]
#endif
public partial class InputPropertyAttribute : global::System.Attribute
{
#if false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
public InputPropertyAttribute() : base()
{
global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Microsoft.UI.Xaml.Controls.InputPropertyAttribute", "InputPropertyAttribute.InputPropertyAttribute()");
}
#endif
// Skipping already declared method Microsoft.UI.Xaml.Controls.InputPropertyAttribute.InputPropertyAttribute()
// Forced skipping of method Microsoft.UI.Xaml.Controls.InputPropertyAttribute.InputPropertyAttribute()
#if false
public string Name;
#endif
// Skipping already declared field Microsoft.UI.Xaml.Controls.InputPropertyAttribute.Name
}
}
Loading

0 comments on commit 2779b12

Please sign in to comment.