Feature/support iuv a12

Directory.Build.props

@@ -7,7 +7,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
-    <Version>12.0.0</Version>
+    <Version>12.0.0-iuv2001</Version>
     <Authors>Avalonia Team</Authors>
     <Copyright>Copyright 2017-$([System.DateTime]::Now.ToString(`yyyy`)) &#169; The AvaloniaUI Project</Copyright>
     <RepositoryUrl>https://github.com/AvaloniaUI/AvaloniaEdit/</RepositoryUrl>
@@ -16,6 +16,8 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
+    <PackageOutputPath>$(SolutionDir)AvaloniaEdit-Package\</PackageOutputPath>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
@@ -28,4 +30,4 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
   </ItemGroup>
-</Project>
+</Project>

NuGet.config

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <!-- <clear /> -->
+    <!-- <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> -->
+    <!-- <add key="AvaloniaAll" value="https://nuget-feed-all.avaloniaui.net/v3/index.json" protocolVersion="3" /> -->
   </packageSources>
-  <packageSourceMapping>
-    <packageSource key="nuget.org">
-      <package pattern="*" />
-    </packageSource>
-  </packageSourceMapping>
 </configuration>

src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
     <PackageDescription>TextMate integration for AvaloniaEdit.</PackageDescription>
   </PropertyGroup>
 

src/AvaloniaEdit/AvaloniaEdit.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
     <WarningsNotAsErrors>0612,0618</WarningsNotAsErrors>
     <PackageId>Avalonia.AvaloniaEdit</PackageId>
     <PackageDescription>This project is a port of AvalonEdit, a WPF-based text editor for Avalonia.</PackageDescription>

src/AvaloniaEdit/Folding/FoldingManager.cs

@@ -331,6 +331,7 @@ public FoldingManagerInstallation(TextArea textArea) : base(textArea.Document)
             {
                 _textArea = textArea;
                 _margin = new FoldingMargin { FoldingManager = this };
+                _margin.OnFoldedChanged += RaiseOnFoldedChanged;
                 _generator = new FoldingElementGenerator { FoldingManager = this };
                 textArea.LeftMargins.Add(_margin);
                 textArea.TextView.Services.AddService(typeof(FoldingManager), this);
@@ -392,5 +393,19 @@ private void TextArea_Caret_PositionChanged(object sender, EventArgs e)
             }
         }
         #endregion
+
+        #region Event
+        /// <summary>
+        /// 代码折叠事件
+        /// </summary>
+        public event EventHandler OnFoldedChanged;
+        private void RaiseOnFoldedChanged(object sender, EventArgs e)
+        {
+            if (OnFoldedChanged != null)
+            {
+                OnFoldedChanged(this, e);
+            }
+        }
+        #endregion
     }
 }

src/AvaloniaEdit/Folding/FoldingMargin.cs

@@ -16,6 +16,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia;
@@ -40,6 +41,8 @@ public class FoldingMargin : AbstractMargin
 
         internal const double SizeFactor = Constants.PixelPerPoint;
 
+        public event EventHandler OnFoldedChanged;
+
         static FoldingMargin()
         {
             FoldingMarkerBrushProperty.Changed.Subscribe(OnUpdateBrushes);
@@ -165,6 +168,7 @@ protected override void OnTextViewVisualLinesChanged()
         {
             foreach (var m in _markers)
             {
+                m.OnFoldedChanged -= RaiseOnFoldedChanged;
                 VisualChildren.Remove(m);
             }
 
@@ -185,6 +189,7 @@ protected override void OnTextViewVisualLinesChanged()
                         };
                         ((ISetLogicalParent)m).SetParent(this);
 
+                        m.OnFoldedChanged += RaiseOnFoldedChanged;
                         _markers.Add(m);
                         VisualChildren.Add(m);
 
@@ -202,6 +207,11 @@ protected override void OnTextViewVisualLinesChanged()
             }
         }
 
+        private void RaiseOnFoldedChanged(object sender, EventArgs e)
+        {
+            OnFoldedChanged?.Invoke(this, e);
+        }
+
         private Pen _foldingControlPen = new Pen(FoldingMarkerBrushProperty.GetDefaultValue(typeof(FoldingMargin)));
         private Pen _selectedFoldingControlPen = new Pen(SelectedFoldingMarkerBrushProperty.GetDefaultValue(typeof(FoldingMargin)));
 

src/AvaloniaEdit/Folding/FoldingMarginMarker.cs

@@ -17,11 +17,12 @@
 // DEALINGS IN THE SOFTWARE.
 
 using Avalonia;
-using AvaloniaEdit.Rendering;
-using AvaloniaEdit.Utils;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Media;
+using AvaloniaEdit.Rendering;
+using AvaloniaEdit.Utils;
+using System;
 
 namespace AvaloniaEdit.Folding
 {
@@ -32,6 +33,8 @@ internal sealed class FoldingMarginMarker : Control
 
         private bool _isExpanded;
 
+        public event EventHandler OnFoldedChanged;
+
         public bool IsExpanded
         {
             get => _isExpanded;
@@ -43,7 +46,10 @@ public bool IsExpanded
                     InvalidateVisual();
                 }
                 if (FoldingSection != null)
+                {
                     FoldingSection.IsFolded = !value;
+                    OnFoldedChanged?.Invoke(this, EventArgs.Empty);
+                }
             }
         }