Update to latest skiasharp/harfbuzz

RichStringSandbox/Form1.cs

@@ -136,7 +136,7 @@ namespace RichStringSandbox
 
             if (_htr.ClosestCodePointIndex >= 0)
             {
-                var ci = _richString.GetCaretInfo(_htr.ClosestCodePointIndex, false);
+                var ci = _richString.GetCaretInfo(new CaretPosition(_htr.ClosestCodePointIndex, false));
                 using (var paint = new SKPaint()
                 {
                     Color = new SKColor(0xFF000000),

RichStringSandbox/RichStringSandbox.csproj

@@ -96,7 +96,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="2.80.2" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Sandbox/Sandbox.csproj

@@ -100,7 +100,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="2.80.2" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

SandboxDriver/SandboxDriver.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="2.80.2" />
   </ItemGroup>
   
   <ItemGroup>

Topten.RichTextKit.Test/Topten.RichTextKit.Test.csproj

@@ -14,15 +14,15 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Topten.RichTextKit\Topten.RichTextKit.csproj" />
+    <PackageReference Include="SkiaSharp" Version="2.80.2" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="TestData\*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Topten.RichTextKit\Topten.RichTextKit.csproj" />
+  </ItemGroup>
+
 </Project>

Topten.RichTextKit/RichString.cs

@@ -556,7 +556,7 @@ namespace Topten.RichTextKit
             {
                 if (!_revisionValid)
                 {
-                    _revision++;
+                    _revision = (uint)System.Threading.Interlocked.Increment(ref _nextRevision);
                     _revisionValid = true;
                 }
                 return _revision;
@@ -799,6 +799,7 @@ namespace Topten.RichTextKit
             return this;
         }
 
+        static int _nextRevision = 0;
         bool _revisionValid = false;
         uint _revision = 0;
         bool _needsLayout = true;

Topten.RichTextKit/Topten.RichTextKit.csproj

@@ -3,7 +3,7 @@
   <Import Project="../buildtools/Topten.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp2.1;net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -22,8 +22,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="2.80.2" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2" />
   </ItemGroup>
 
 </Project>