Browse Source
Merge pull request #2275 from AvaloniaUI/update/portable-xaml
Update portable.xaml to latest upstream master.
pull/2279/head
Steven Kirk
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs
-
src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
|
|
@ -33,7 +33,7 @@ namespace Avalonia.Markup.Xaml.PortableXaml |
|
|
|
|
|
|
|
|
private IRuntimeTypeProvider _avaloniaTypeProvider; |
|
|
private IRuntimeTypeProvider _avaloniaTypeProvider; |
|
|
|
|
|
|
|
|
protected internal override XamlType GetXamlType(string xamlNamespace, string name, params XamlType[] typeArguments) |
|
|
protected override XamlType GetXamlType(string xamlNamespace, string name, params XamlType[] typeArguments) |
|
|
{ |
|
|
{ |
|
|
XamlType type = null; |
|
|
XamlType type = null; |
|
|
try |
|
|
try |
|
|
|
|
|
@ -1 +1 @@ |
|
|
Subproject commit 8abbe09592668efb573ac4d5548ba2d7e464ba78 |
|
|
Subproject commit ab5526173722b8988bc5ca3c03c8752ce89c0975 |
