AsyncExを動かすために関連ライブラリーを更新した

diff --git a/Core/Direct2D/InlineChar.cs b/Core/Direct2D/InlineChar.cs
index 2e8c704..935acca 100644 (file)
--- a/Core/Direct2D/InlineChar.cs
+++ b/Core/Direct2D/InlineChar.cs
@@ -15,7 +15,7 @@ using DW = SharpDX.DirectWrite;
 
 namespace FooEditEngine
 {
-    sealed class InlineChar : DW.InlineObject
+    sealed class InlineChar : CallbackBase, DW.InlineObject
     {
         DW.TextLayout Layout;
         ColorBrushCollection brushes;
@@ -112,14 +112,16 @@ namespace FooEditEngine
             set;
         }
 
-        public void Dispose()
-        {
-            this.Layout.Dispose();
-            return;
-        }
+        //disposeしてはいけないらしい
+        //protected override void Dispose(bool disposing)
+        //{
+        //    base.Dispose(disposing);
+        //    this.Layout.Dispose();
+        //}
+
     }
 
-    sealed class InlineTab : DW.InlineObject
+    sealed class InlineTab : CallbackBase,DW.InlineObject
     {
         double _TabWidth;
         double LineHeight;
@@ -216,8 +218,5 @@ namespace FooEditEngine
             set;
         }
 
-        public void Dispose()
-        {
-        }
     }
 }

diff --git a/Core/Direct2D/MultiSet.cs b/Core/Direct2D/MultiSet.cs
index 97d67e2..801d279 100644 (file)
--- a/Core/Direct2D/MultiSet.cs
+++ b/Core/Direct2D/MultiSet.cs
@@ -228,9 +228,12 @@ namespace FooEditEngine
 
         public void Clear()
         {
+            /*
+             * Dispose()すると落ちる
             foreach (List<J> list in this.Collection.Values)
                 foreach (J value in list)
                     value.Dispose();
+            */
             this.Collection.Clear();
         }
 

diff --git a/UWP/FooEditEngine.UWP/Direct2D/D2DRenderBase.cs b/UWP/FooEditEngine.UWP/Direct2D/D2DRenderBase.cs
index 71d4753..0ee7b55 100644 (file)
--- a/UWP/FooEditEngine.UWP/Direct2D/D2DRenderBase.cs
+++ b/UWP/FooEditEngine.UWP/Direct2D/D2DRenderBase.cs
@@ -93,8 +93,9 @@ namespace FooEditEngine
         {
             this.Brushes.Clear();
             this.Strokes.Clear();
-            if (this.textRender != null)
-                this.textRender.Dispose();
+            //ここでDispose()する必要はない。すると落ちる
+            //if (this.textRender != null)
+            //    this.textRender.Dispose();
             if (this.D2DDevice != null)
                 this.D2DDevice.Dispose();
             if (this.D2DContext != null)

diff --git a/UWP/FooEditEngine.UWP/FooEditEngine.UWP.csproj b/UWP/FooEditEngine.UWP/FooEditEngine.UWP.csproj
index 2421c6d..247bece 100644 (file)
--- a/UWP/FooEditEngine.UWP/FooEditEngine.UWP.csproj
+++ b/UWP/FooEditEngine.UWP/FooEditEngine.UWP.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>FooEditEngine.UWP</AssemblyName>
     <DefaultLanguage>ja-JP</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -120,25 +120,25 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.4.2</Version>
+      <Version>6.2.8</Version>
     </PackageReference>
     <PackageReference Include="Nito.AsyncEx">
       <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX.Direct2D1">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX.Direct3D11">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX.DXGI">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX.Mathematics">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/UWP/Test/Test.csproj b/UWP/Test/Test.csproj
index a2b8cbd..7f9abc5 100644 (file)
--- a/UWP/Test/Test.csproj
+++ b/UWP/Test/Test.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>Test</AssemblyName>
     <DefaultLanguage>ja-JP</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -119,7 +119,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.4.2</Version>
+      <Version>6.2.8</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/WPF/FooEditEngine/Direct2D/D2DRender.cs b/WPF/FooEditEngine/Direct2D/D2DRender.cs
index 4bb0c50..a492978 100644 (file)
--- a/WPF/FooEditEngine/Direct2D/D2DRender.cs
+++ b/WPF/FooEditEngine/Direct2D/D2DRender.cs
@@ -428,8 +428,9 @@ namespace FooEditEngine.WPF
                 this.cachedBitMap.Dispose();
             this.Brushes.Clear();
             this.Strokes.Clear();
-            if (this.textRender != null)
-                this.textRender.Dispose();
+            //ここでDispose()すると落ちる
+            //if (this.textRender != null)
+            //    this.textRender.Dispose();
             if (this.texture != null)
                 this.texture.Dispose();
             if (this.surface != null)

diff --git a/WPF/FooEditEngine/FooEditEngine.csproj b/WPF/FooEditEngine/FooEditEngine.csproj
index f99d2a9..850ec6c 100644 (file)
--- a/WPF/FooEditEngine/FooEditEngine.csproj
+++ b/WPF/FooEditEngine/FooEditEngine.csproj
@@ -87,16 +87,16 @@
       <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX.Direct2D1">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX.Direct3D11">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX.Direct3D9">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="SharpDX.Mathematics">
-      <Version>4.0.1</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\..\Core\Core.projitems" Label="Shared" />