Browse Source

Update XamlX and remove unused methods

pull/7812/head
Max Katz 4 years ago
parent
commit
bfc349e08a
  1. 5
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
  2. 2
      src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
  3. 10
      src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs

5
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs

@ -105,11 +105,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
public IXamlType ResourceDictionary { get; }
public IXamlMethod ResourceDictionaryDeferredAdd { get; }
public IXamlType OperatingSystemType { get; }
public IXamlMethod IsOnPlatformMethod { get; }
public IXamlType FormFactorType { get; set; }
public IXamlMethod IsOnFormFactorMethod { get; set; }
public AvaloniaXamlIlWellKnownTypes(TransformerConfiguration cfg)
{
RuntimeHelpers = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.XamlIl.Runtime.XamlIlRuntimeHelpers");

2
src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github

@ -1 +1 @@
Subproject commit dab9e09fa56064be92d80c7c4328793fb0f93dbf
Subproject commit 880ba5742e52b67afda048c4023cf7e3c3c16a46

10
src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs

@ -200,15 +200,5 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
}
}
}
public static bool IsOnPlatform(IServiceProvider serviceProvider, OperatingSystemType platform)
{
return serviceProvider.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem == platform;
}
public static bool IsOnFormFactor(IServiceProvider serviceProvider, FormFactorType formFactor)
{
return serviceProvider.GetService<IRuntimePlatform>().GetRuntimeInfo().FormFactor == formFactor;
}
}
}

Loading…
Cancel
Save