Browse Source
Temporarily fix datagrid loading by force-loading the DataGrid assembly on Markup.
pull/2109/head
Jumar Macato
7 years ago
No known key found for this signature in database
GPG Key ID: B19884DAC3A5BF3F
2 changed files with
2 additions and
0 deletions
-
src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
-
src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs
|
|
@ -57,6 +57,7 @@ |
|
|
<ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" /> |
|
|
|
|
|
<ProjectReference Include="..\..\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" /> |
|
|
<ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" /> |
|
|
|
|
|
@ -38,6 +38,7 @@ namespace Avalonia.Markup.Xaml.Context |
|
|
typeof(DataTemplate).GetTypeInfo().Assembly, |
|
|
typeof(DataTemplate).GetTypeInfo().Assembly, |
|
|
typeof(SolidColorBrush).GetTypeInfo().Assembly, |
|
|
typeof(SolidColorBrush).GetTypeInfo().Assembly, |
|
|
typeof(Binding).GetTypeInfo().Assembly, |
|
|
typeof(Binding).GetTypeInfo().Assembly, |
|
|
|
|
|
typeof(DataGrid).GetTypeInfo().Assembly |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
private Dictionary<string, HashSet<ClrNamespaceInfo>> _namespaces = new Dictionary<string, HashSet<ClrNamespaceInfo>>(); |
|
|
private Dictionary<string, HashSet<ClrNamespaceInfo>> _namespaces = new Dictionary<string, HashSet<ClrNamespaceInfo>>(); |
|
|
|
