From 5a027c585ab9f827bea077cc0a23f9f0579f9bce Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 9 May 2022 12:44:07 +0100
Subject: [PATCH] Merge pull request #8103 from
 AvaloniaUI/fixes/deterministic-builds

Fixes/deterministic builds
---
 .../CompilerExtensions/XamlIlClrPropertyInfoHelper.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
index 871a2a2045..e76e2cd46e 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlClrPropertyInfoHelper.cs
@@ -55,7 +55,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                         return cached.get;
                 }
 
-                var name = lst.Count == 0 ? key : key + "_" + Guid.NewGuid().ToString("N");
+                var name = lst.Count == 0 ? key : key + "_" + context.Configuration.IdentifierGenerator.GenerateIdentifierPart();
                 
                 var field = _builder.DefineField(types.IPropertyInfo, name + "!Field", false, true);