适应 Avalonia-11.1.0-beta1

feast107 · feast107 · commit 88ed4d76006b · 2024-04-26T10:22:59.000+08:00
适应对 ExpressionObserver 的调整
diff --git a/src/Antelcat.I18N.SourceGenerators.Shared/Generators/ResourceKeysGenerator.cs b/src/Antelcat.I18N.SourceGenerators.Shared/Generators/ResourceKeysGenerator.cs
@@ -8,6 +8,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Internal;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Antelcat.I18N.WPF.SourceGenerators.Generators;
diff --git a/src/Antelcat.I18N.sln b/src/Antelcat.I18N.sln
@@ -45,7 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Antelcat.I18N.Abstractions"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Antelcat.I18N.Abstractions.Shared", "Antelcat.I18N.Abstractions.Shared\Antelcat.I18N.Abstractions.Shared.shproj", "{F3F24657-983C-46FF-B928-ADD03557C562}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Feast.CodeAnalysis.LiteralGenerator", "..\extern\CodeAnalysis.Extensions\src\Feast.CodeAnalysis.LiteralGenerator\Feast.CodeAnalysis.LiteralGenerator.csproj", "{13AC62C7-D492-40B2-8231-B9A2545D7388}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Feast.CodeAnalysis.LiteralGenerator", "..\extern\CodeAnalysis.Extensions\src\Feast.CodeAnalysis.LiteralGenerator\Feast.CodeAnalysis.LiteralGenerator.csproj", "{13AC62C7-D492-40B2-8231-B9A2545D7388}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -116,6 +116,7 @@ Global
 		SolutionGuid = {73D6AEFA-1477-4119-9F85-0DA27E35BDB8}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\extern\CodeAnalysis.Extensions\src\Feast.CodeAnalysis.Shared\Feast.CodeAnalysis.Shared.projitems*{13ac62c7-d492-40b2-8231-b9a2545d7388}*SharedItemsImports = 5
 		Antelcat.I18N.SourceGenerators.Shared\Antelcat.I18N.SourceGenerators.Shared.projitems*{15d71dc2-f53d-42ec-85e4-4982f6e351a5}*SharedItemsImports = 13
 		Antelcat.I18N.Shared\Antelcat.I18N.Shared.projitems*{28f904c6-3b6d-4140-90ff-62a6bd87b0c6}*SharedItemsImports = 13
 		Antelcat.I18N.Abstractions.Shared\Antelcat.I18N.Abstractions.Shared.projitems*{2ba15a8e-6c3e-4b33-bff4-d9255202d71d}*SharedItemsImports = 5
diff --git a/src/Avalonia/Avalonia/Antelcat.I18N.Avalonia.csproj b/src/Avalonia/Avalonia/Antelcat.I18N.Avalonia.csproj
@@ -7,16 +7,16 @@
         <IsPackable>true</IsPackable>
         <LangVersion>preview</LangVersion>
 
-        <Version>1.0.1</Version>
-        <FileVersion>1.0.1</FileVersion>
-        <AssemblyVersion>1.0.1</AssemblyVersion>
+        <Version>1.0.2</Version>
+        <FileVersion>1.0.2</FileVersion>
+        <AssemblyVersion>1.0.2</AssemblyVersion>
         
         <Authors>Antelcat</Authors>
         <Title>Antelcat.I18N.Avalonia</Title>
         <PackageId>Antelcat.I18N.Avalonia</PackageId>
         <RootNamespace>Antelcat.I18N.Avalonia</RootNamespace>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageReleaseNotes>Fix string template using args of none string type</PackageReleaseNotes>
+        <PackageReleaseNotes>Adapt to avalonia-11.1.0-beta1</PackageReleaseNotes>
         <Copyright>Copyright Antelcat. All rights reserved</Copyright>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
         <PackageTags>dotnet;Avalonia;markup;extension;MVVM;i18n;language;binding;.NET;</PackageTags>
@@ -34,7 +34,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0"/>
+        <PackageReference Include="Avalonia" Version="11.1.0-beta1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Avalonia/Avalonia/I18NExtension.cs b/src/Avalonia/Avalonia/I18NExtension.cs
@@ -31,11 +31,8 @@ static I18NExtension()
         
         lock (ResourceProvider.Providers)
         {
-            foreach (var provider in ResourceProvider.Providers)
-            {
-                var action = RegisterLanguageSource(provider, true);
-                updateActions.Add(action);
-            }
+            updateActions.AddRange(
+                ResourceProvider.Providers.Select(provider => RegisterLanguageSource(provider, true)));
 
             ResourceProvider.Providers.CollectionChanged += (_, e) =>
             {
diff --git a/src/Avalonia/Avalonia/Internals/ExpandoObjectPropertyAccessorPlugin.cs b/src/Avalonia/Avalonia/Internals/ExpandoObjectPropertyAccessorPlugin.cs
@@ -17,14 +17,13 @@ public IPropertyAccessor Start(WeakReference<object?> reference, string property
 
     public static void Register(ExpandoObject target)
     {
-        if (Assembly.GetAssembly(typeof(IPropertyAccessorPlugin))
+        /*if (Assembly.GetAssembly(typeof(IPropertyAccessorPlugin))
                 .GetType("Avalonia.Data.Core.ExpressionObserver")
-                .GetField("PropertyAccessors", BindingFlags.Public | BindingFlags.Static)!
-                .GetValue(null) is IList<IPropertyAccessorPlugin> { } plugins)
-        {
-            plugins.Add(new ExpandoObjectPropertyAccessorPlugin(target));
-            ExpandoAccessor.Source = target;
-        }
+                .GetField("PropertyAccessors", BindingFlags.Public | BindingFlags.Static)?
+                .GetValue(null) is not IList<IPropertyAccessorPlugin> plugins) return;
+        plugins.Add(new ExpandoObjectPropertyAccessorPlugin(target));*/
+        BindingPlugins.PropertyAccessors.Add(new ExpandoObjectPropertyAccessorPlugin(target));
+        ExpandoAccessor.Source = target;
     }
 
     private class ExpandoAccessor : IPropertyAccessor
diff --git a/src/Avalonia/Demo/Antelcat.I18N.Avalonia.Demo.csproj b/src/Avalonia/Demo/Antelcat.I18N.Avalonia.Demo.csproj
@@ -22,11 +22,11 @@
         <TrimmableAssembly Include="Avalonia.Themes.Default" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.5" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+        <PackageReference Include="Avalonia" Version="11.1.0-beta1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.1.0-beta1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.5" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-beta1" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-beta1" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
         <PackageReference Include="FluentAvaloniaUI" Version="2.0.4" />
     </ItemGroup>
diff --git a/src/WPF/Library/Windows/MainWindow.xaml.cs b/src/WPF/Library/Windows/MainWindow.xaml.cs
@@ -12,5 +12,6 @@ public MainWindow()
             InitializeComponent();
             DataContext = new ViewModel();
         }
+        
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,8 @@ static I18NExtension()`
`31`	`31`
`32`	`32`	`lock (ResourceProvider.Providers)`
`33`	`33`	`{`
`34`		`- foreach (var provider in ResourceProvider.Providers)`
`35`		`- {`
`36`		`- var action = RegisterLanguageSource(provider, true);`
`37`		`- updateActions.Add(action);`
`38`		`- }`
	`34`	`+ updateActions.AddRange(`
	`35`	`+ ResourceProvider.Providers.Select(provider => RegisterLanguageSource(provider, true)));`
`39`	`36`
`40`	`37`	`ResourceProvider.Providers.CollectionChanged += (_, e) =>`
`41`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ public MainWindow()`
`12`	`12`	`InitializeComponent();`
`13`	`13`	`DataContext = new ViewModel();`
`14`	`14`	`}`
	`15`	`+`
`15`	`16`	`}`
`16`	`17`	`}`