From 4ad03c6108768b251e34dee60b204f7171ce8a58 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 28 Jul 2020 10:20:57 -0300 Subject: [PATCH 1/2] order resources when passed to xamlx to ensure deterministic naming. --- src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs | 2 +- src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs index c1cc0e7bf0..c9c9c562bd 100644 --- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs +++ b/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 { diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github index 8d9fee734a..23f06e93fc 160000 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github @@ -1 +1 @@ -Subproject commit 8d9fee734afaced9366774fda41b6aa2ab19875f +Subproject commit 23f06e93fcccdc8d2e2b2b083bdfae02e015f295 From fe51ec856b23d864db92212c94512bf0c51991ed Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 28 Jul 2020 10:47:52 -0300 Subject: [PATCH 2/2] update xamlil --- src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github index 23f06e93fc..7d15a92274 160000 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github @@ -1 +1 @@ -Subproject commit 23f06e93fcccdc8d2e2b2b083bdfae02e015f295 +Subproject commit 7d15a9227461cf4d62bc2ed251fcc25c96b28aaf