From 7b17ad6669b43e077863a8209331fcde159bbea8 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 27 Oct 2023 07:37:59 -0400 Subject: [PATCH] chore: Adjust tests validation --- ...urceDictionary_92716e07ff456818f6d4125e055d4d57.cs | 11 ++++++----- ...urceDictionary_92716e07ff456818f6d4125e055d4d57.cs | 11 ++++++----- ...urceDictionary_92716e07ff456818f6d4125e055d4d57.cs | 11 ++++++----- ...urceDictionary_92716e07ff456818f6d4125e055d4d57.cs | 11 ++++++----- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TDBMIDTIRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TDBMIDTIRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs index 9f75e1d7475b..e8653414aa5e 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TDBMIDTIRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs +++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TDBMIDTIRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs @@ -153,8 +153,8 @@ public sealed partial class GlobalStaticResources internal sealed class ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 : global::Uno.UI.IXamlResourceDictionaryProvider { private static global::Windows.UI.Xaml.NameScope __nameScope = new global::Windows.UI.Xaml.NameScope(); - private static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 __that; - internal static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 Instance + private static global::Uno.UI.IXamlResourceDictionaryProvider __that; + internal static global::Uno.UI.IXamlResourceDictionaryProvider Instance { get { @@ -167,9 +167,10 @@ internal static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff4568 } } - internal global::Uno.UI.Xaml.XamlParseContext __ParseContext_ {get; } + private readonly global::Uno.UI.Xaml.XamlParseContext __ParseContext_; + internal static global::Uno.UI.Xaml.XamlParseContext GetParseContext() => ((ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57)Instance).__ParseContext_; - private ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57() + public ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57() { __ParseContext_ = global::MyProject.GlobalStaticResources.__ParseContext_; } @@ -210,7 +211,7 @@ private object Get_1(object __ResourceOwner_1) => global::Windows.UI.Xaml.ResourceDictionary global::Uno.UI.IXamlResourceDictionaryProvider.GetResourceDictionary() => MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary; } - internal static global::Windows.UI.Xaml.ResourceDictionary MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary => ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.Instance.MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary; + internal static global::Windows.UI.Xaml.ResourceDictionary MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary => ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.Instance.GetResourceDictionary(); } } namespace MyProject.__Resources diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs index 37359d4b6cb8..9ea3de50f41d 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs +++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs @@ -44,8 +44,8 @@ public sealed partial class GlobalStaticResources internal sealed class ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 : global::Uno.UI.IXamlResourceDictionaryProvider { private static global::Windows.UI.Xaml.NameScope __nameScope = new global::Windows.UI.Xaml.NameScope(); - private static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 __that; - internal static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 Instance + private static global::Uno.UI.IXamlResourceDictionaryProvider __that; + internal static global::Uno.UI.IXamlResourceDictionaryProvider Instance { get { @@ -58,9 +58,10 @@ internal static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff4568 } } - internal global::Uno.UI.Xaml.XamlParseContext __ParseContext_ {get; } + private readonly global::Uno.UI.Xaml.XamlParseContext __ParseContext_; + internal static global::Uno.UI.Xaml.XamlParseContext GetParseContext() => ((ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57)Instance).__ParseContext_; - private ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57() + public ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57() { __ParseContext_ = global::MyProject.GlobalStaticResources.__ParseContext_; } @@ -104,7 +105,7 @@ private ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d412 global::Windows.UI.Xaml.ResourceDictionary global::Uno.UI.IXamlResourceDictionaryProvider.GetResourceDictionary() => MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary; } - internal static global::Windows.UI.Xaml.ResourceDictionary MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary => ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.Instance.MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary; + internal static global::Windows.UI.Xaml.ResourceDictionary MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary => ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.Instance.GetResourceDictionary(); } } namespace MyProject.__Resources diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMDWSRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMDWSRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs index c0dc5fef8cbc..5c6b67f4c62f 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMDWSRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs +++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMDWSRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs @@ -44,8 +44,8 @@ public sealed partial class GlobalStaticResources internal sealed class ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 : global::Uno.UI.IXamlResourceDictionaryProvider { private static global::Windows.UI.Xaml.NameScope __nameScope = new global::Windows.UI.Xaml.NameScope(); - private static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 __that; - internal static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 Instance + private static global::Uno.UI.IXamlResourceDictionaryProvider __that; + internal static global::Uno.UI.IXamlResourceDictionaryProvider Instance { get { @@ -58,9 +58,10 @@ internal static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff4568 } } - internal global::Uno.UI.Xaml.XamlParseContext __ParseContext_ {get; } + private readonly global::Uno.UI.Xaml.XamlParseContext __ParseContext_; + internal static global::Uno.UI.Xaml.XamlParseContext GetParseContext() => ((ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57)Instance).__ParseContext_; - private ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57() + public ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57() { __ParseContext_ = global::MyProject.GlobalStaticResources.__ParseContext_; } @@ -99,7 +100,7 @@ private ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d412 global::Windows.UI.Xaml.ResourceDictionary global::Uno.UI.IXamlResourceDictionaryProvider.GetResourceDictionary() => MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary; } - internal static global::Windows.UI.Xaml.ResourceDictionary MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary => ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.Instance.MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary; + internal static global::Windows.UI.Xaml.ResourceDictionary MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary => ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.Instance.GetResourceDictionary(); } } namespace MyProject.__Resources diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMDWTRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMDWTRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs index 48be1b5e5792..f1bb41562578 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMDWTRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs +++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Out/TTLNMDWTRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs @@ -44,8 +44,8 @@ public sealed partial class GlobalStaticResources internal sealed class ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 : global::Uno.UI.IXamlResourceDictionaryProvider { private static global::Windows.UI.Xaml.NameScope __nameScope = new global::Windows.UI.Xaml.NameScope(); - private static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 __that; - internal static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57 Instance + private static global::Uno.UI.IXamlResourceDictionaryProvider __that; + internal static global::Uno.UI.IXamlResourceDictionaryProvider Instance { get { @@ -58,9 +58,10 @@ internal static ResourceDictionarySingleton__MyResourceDictionary_92716e07ff4568 } } - internal global::Uno.UI.Xaml.XamlParseContext __ParseContext_ {get; } + private readonly global::Uno.UI.Xaml.XamlParseContext __ParseContext_; + internal static global::Uno.UI.Xaml.XamlParseContext GetParseContext() => ((ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57)Instance).__ParseContext_; - private ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57() + public ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57() { __ParseContext_ = global::MyProject.GlobalStaticResources.__ParseContext_; } @@ -102,7 +103,7 @@ private ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d412 global::Windows.UI.Xaml.ResourceDictionary global::Uno.UI.IXamlResourceDictionaryProvider.GetResourceDictionary() => MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary; } - internal static global::Windows.UI.Xaml.ResourceDictionary MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary => ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.Instance.MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary; + internal static global::Windows.UI.Xaml.ResourceDictionary MyResourceDictionary_92716e07ff456818f6d4125e055d4d57_ResourceDictionary => ResourceDictionarySingleton__MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.Instance.GetResourceDictionary(); } } namespace MyProject.__Resources