diff --git a/.gitignore b/.gitignore
index e07e3e8..4add88b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -254,3 +254,4 @@ paket-files/
# Visual Studio Code
.vscode/
+.DS_Store
diff --git a/Directory.Build.props b/Directory.Build.props
index 1235526..bd636bd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,8 +2,32 @@
latest
true
- 11.0.4
- 1.0.55
+ 11.0.0
+ 11.0.5
+ 1.0.56
beta
+
+ true
+ true
+ true
+
+ 11.0.5
+ Avalonia Team
+ Copyright 2017-$([System.DateTime]::Now.ToString(`yyyy`)) © The AvaloniaUI Project
+ https://github.com/AvaloniaUI/AvaloniaEdit/
+ MIT
+ Icon.png
+ snupkg
+
+
+ true
+
+
+
+
+
+
+
+
diff --git a/Icon.png b/Icon.png
new file mode 100644
index 0000000..41a2a61
Binary files /dev/null and b/Icon.png differ
diff --git a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
index 9edbb13..a716f5c 100644
--- a/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
+++ b/src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
@@ -31,9 +31,9 @@
-
-
-
+
+
+
diff --git a/src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj b/src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj
index 9490a8a..94099bd 100644
--- a/src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj
+++ b/src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj
@@ -1,10 +1,9 @@
- netstandard2.0
+ netstandard2.0;net6.0
latest
- TextMate integration for AvaloniaEdit.
- MIT
+ TextMate integration for AvaloniaEdit.
diff --git a/src/AvaloniaEdit/AvaloniaEdit.csproj b/src/AvaloniaEdit/AvaloniaEdit.csproj
index 15a6baf..6605d29 100644
--- a/src/AvaloniaEdit/AvaloniaEdit.csproj
+++ b/src/AvaloniaEdit/AvaloniaEdit.csproj
@@ -1,11 +1,11 @@
- netstandard2.0
+ netstandard2.0;net6.0
0612,0618
Avalonia.AvaloniaEdit
- This project is a port of AvalonEdit, a WPF-based text editor for Avalonia.
- MIT
+ This project is a port of AvalonEdit, a WPF-based text editor for Avalonia.
+ editor;code-editor;avalonia;text-editor;netstandard
true
@@ -17,7 +17,7 @@
-
+
diff --git a/src/AvaloniaEdit/Snippets/SnippetReplaceableTextElement.cs b/src/AvaloniaEdit/Snippets/SnippetReplaceableTextElement.cs
index 4549c1c..878624e 100644
--- a/src/AvaloniaEdit/Snippets/SnippetReplaceableTextElement.cs
+++ b/src/AvaloniaEdit/Snippets/SnippetReplaceableTextElement.cs
@@ -202,7 +202,11 @@ namespace AvaloniaEdit.Snippets
if (Layer == KnownLayer.Background)
{
geoBuilder.AddSegment(textView, s);
- drawingContext.DrawGeometry(BackgroundBrush, null, geoBuilder.CreateGeometry());
+ var geometry = geoBuilder.CreateGeometry();
+ if(geometry != null)
+ {
+ drawingContext.DrawGeometry(BackgroundBrush, null, geometry);
+ }
}
else
{
@@ -218,7 +222,11 @@ namespace AvaloniaEdit.Snippets
geoBuilder.CloseFigure();
}
}
- drawingContext.DrawGeometry(null, ActiveBorderPen, geoBuilder.CreateGeometry());
+ var geometry = geoBuilder.CreateGeometry();
+ if(geometry != null)
+ {
+ drawingContext.DrawGeometry(null, ActiveBorderPen, geometry);
+ }
}
}
}
diff --git a/src/AvaloniaEdit/Themes/Simple/AvaloniaEdit.xaml b/src/AvaloniaEdit/Themes/Simple/AvaloniaEdit.xaml
index 35a3a3b..a42a147 100644
--- a/src/AvaloniaEdit/Themes/Simple/AvaloniaEdit.xaml
+++ b/src/AvaloniaEdit/Themes/Simple/AvaloniaEdit.xaml
@@ -15,7 +15,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
diff --git a/test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj b/test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj
index 3893f39..b88a834 100644
--- a/test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj
+++ b/test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj
@@ -5,10 +5,10 @@
-
-
-
-
+
+
+
+