Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add test to 'Adding System.Windows.Media.Animation.BackEase as known type.' #28

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Add test to 'Adding System.Windows.Media.Animation.BackEase as known type.' #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60fcfb2
Adding System.Windows.Media.Animation.BackEase as known type.
lindexi Jul 19, 2023
0547454
Add the method attribute to Create_BamlType_BackEase
lindexi Jul 19, 2023
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
3 changes: 2 additions & 1 deletion ...DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006KnownTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal static class KnownTypes
public const Int16 XamlPointCollectionSerializer = 748;
public const Int16 XamlVector3DCollectionSerializer = 752;

public const Int16 MaxKnownType = 759;
public const Int16 MaxKnownType = 760;
public const Int16 MaxKnownProperty = 268;
public const Int16 MinKnownProperty = -268;

Expand Down Expand Up @@ -853,6 +853,7 @@ public static Type GetKnownType(Int16 typeId)
case 757: t = () => typeof(XmlLanguageConverter); break;
case 758: t = () => typeof(XmlNamespaceMapping); break;
case 759: t = () => typeof(ZoomPercentageConverter); break;
case 760: t = () => typeof(System.Windows.Media.Animation.BackEase); break;
default: t = () => null; break;
}

Expand Down
16 changes: 15 additions & 1 deletion ...et.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfGeneratedKnownTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace System.Windows.Baml2006
{
partial class WpfSharedBamlSchemaContext : XamlSchemaContext
{
const int KnownTypeCount = 759;
const int KnownTypeCount = 760;


private WpfKnownType CreateKnownBamlType(short bamlNumber, bool isBamlType, bool useV3Rules)
Expand Down Expand Up @@ -777,6 +777,7 @@ private WpfKnownType CreateKnownBamlType(short bamlNumber, bool isBamlType, bool
case 757: return Create_BamlType_XmlLanguageConverter(isBamlType, useV3Rules); // type converter
case 758: return Create_BamlType_XmlNamespaceMapping(isBamlType, useV3Rules);
case 759: return Create_BamlType_ZoomPercentageConverter(isBamlType, useV3Rules);
case 760: return Create_BamlType_BackEase(isBamlType, useV3Rules);
default:
throw new InvalidOperationException("Invalid BAML number");
}
Expand Down Expand Up @@ -982,6 +983,7 @@ protected WpfKnownType CreateKnownBamlType(string typeName, bool isBamlType, boo
case 897706848 : return Create_BamlType_TextBlock(isBamlType, useV3Rules);
case 905080928 : return Create_BamlType_FixedDocumentSequence(isBamlType, useV3Rules);
case 906240700 : return Create_BamlType_UserControl(isBamlType, useV3Rules);
case 907931051 : return Create_BamlType_BackEase(isBamlType, useV3Rules);
case 912040738 : return Create_BamlType_TextEffectCollection(isBamlType, useV3Rules);
case 916823320 : return Create_BamlType_InputDevice(isBamlType, useV3Rules);
case 921174220 : return Create_BamlType_TriggerCollection(isBamlType, useV3Rules);
Expand Down Expand Up @@ -11530,6 +11532,18 @@ private WpfKnownType Create_BamlType_ZoomPercentageConverter(bool isBamlType, bo
return bamlType;
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private WpfKnownType Create_BamlType_BackEase(bool isBamlType, bool useV3Rules)
{
var bamlType = new WpfKnownType(this, // SchemaContext
760, "BackEase",
typeof(System.Windows.Media.Animation.BackEase),
isBamlType, useV3Rules);
bamlType.DefaultConstructor = delegate () { return new System.Windows.Media.Animation.BackEase(); };
bamlType.Freeze();
return bamlType;
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private WpfKnownType Create_BamlType_CommandBinding(bool isBamlType, bool useV3Rules)
{
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/KnownTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,8 @@ internal enum KnownElements : short
XmlLanguageConverter,
XmlNamespaceMapping,
ZoomPercentageConverter,
MaxElement
BackEase,
MaxElement,
}

// This enum specifies the IDs we use for known CLR and DP Properties in BAML.
Expand Down Expand Up @@ -1668,6 +1669,7 @@ internal static object CreateKnownElement(KnownElements knownElement)
case KnownElements.XmlLanguageConverter: o = new System.Windows.Markup.XmlLanguageConverter(); break;
case KnownElements.XmlNamespaceMapping: o = new System.Windows.Data.XmlNamespaceMapping(); break;
case KnownElements.ZoomPercentageConverter: o = new System.Windows.Documents.ZoomPercentageConverter(); break;
case KnownElements.BackEase: o = new System.Windows.Media.Animation.BackEase(); break;
}
return o;
}
Expand Down Expand Up @@ -4949,7 +4951,8 @@ private Type InitializeOneType(KnownElements knownElement)
case KnownElements.Typography: t = _asmFramework.GetType("System.Windows.Documents.Typography"); break;
case KnownElements.Underline: t = _asmFramework.GetType("System.Windows.Documents.Underline"); break;
case KnownElements.ZoomPercentageConverter: t = _asmFramework.GetType("System.Windows.Documents.ZoomPercentageConverter"); break;
case KnownElements.DynamicResourceExtension: t = _asmFramework.GetType("System.Windows.DynamicResourceExtension"); break;
case KnownElements.BackEase: t = _asmFramework.GetType("System.Windows.Media.Animation.BackEase"); break;
case KnownElements.DynamicResourceExtension: t = _asmFramework.GetType("System.Windows.DynamicResourceExtension"); break;
case KnownElements.DynamicResourceExtensionConverter: t = _asmFramework.GetType("System.Windows.DynamicResourceExtensionConverter"); break;
case KnownElements.SetterBase: t = _asmFramework.GetType("System.Windows.SetterBase"); break;
case KnownElements.EventSetter: t = _asmFramework.GetType("System.Windows.EventSetter"); break;
Expand Down Expand Up @@ -6297,6 +6300,7 @@ private Type InitializeOneType(KnownElements knownElement)
case KnownElements.XmlLanguageConverter: t = typeof(System.Windows.Markup.XmlLanguageConverter); break;
case KnownElements.XmlNamespaceMapping: t = typeof(System.Windows.Data.XmlNamespaceMapping); break;
case KnownElements.ZoomPercentageConverter: t = typeof(System.Windows.Documents.ZoomPercentageConverter); break;
case KnownElements.BackEase: t = typeof(System.Windows.Media.Animation.BackEase); break;
}

return t;
Expand Down