Browse Source

Merge pull request #4394 from AvaloniaUI/feature/deterministic-xaml-compilation

order resources when passed to xamlx to ensure deterministic naming.
pull/4401/head
Jumar Macato 6 years ago
committed by GitHub
parent
commit
f6624785d6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
  2. 2
      src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github

2
src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs

@ -128,7 +128,7 @@ namespace Avalonia.Build.Tasks
asm.MainModule.Types.Add(typeDef);
var builder = typeSystem.CreateTypeBuilder(typeDef);
foreach (var res in group.Resources.Where(CheckXamlName))
foreach (var res in group.Resources.Where(CheckXamlName).OrderBy(x=>x.FilePath.ToLowerInvariant()))
{
try
{

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

@ -1 +1 @@
Subproject commit 8d9fee734afaced9366774fda41b6aa2ab19875f
Subproject commit 7d15a9227461cf4d62bc2ed251fcc25c96b28aaf
Loading…
Cancel
Save