update to avalonia 0.10-preview3

yatli · Aug 23, 2020 · 002a4ab · 002a4ab
1 parent 03095f0
commit 002a4ab
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 10 deletions.
diff --git a/App.xaml.fs b/App.xaml.fs
@@ -6,6 +6,8 @@ open Avalonia.Controls.Templates
 open Avalonia.Markup.Xaml
 open System
 
+open log
+
 type IViewModelContainer =
     abstract Target: obj
 
@@ -20,8 +22,9 @@ type ViewLocator() =
             if _type <> null 
             then Activator.CreateInstance(_type) :?> IControl;
             else TextBlock( Text = "Not Found: " + _name ) :> IControl
-        member this.Match(data: obj): bool = data :? ViewModelBase || data :? IViewModelContainer
-        member this.SupportsRecycling: bool = false
+        member this.Match(data: obj): bool = 
+            data :? ViewModelBase || data :? IViewModelContainer
+        //member this.SupportsRecycling: bool = false
 
 type App() =
     inherit Application()

diff --git a/Properties/PublishProfiles/FolderProfile.pubxml b/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+  </PropertyGroup>
+</Project>
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/fvim.fsproj b/fvim.fsproj
@@ -78,32 +78,32 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia" Version="0.10.0-preview3" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview3" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview3" />
     <PackageReference Include="FSharp.Control.Reactive" Version="4.4.2" />
     <PackageReference Include="FSharp.Data" Version="3.3.3" />
     <PackageReference Include="GitInfo" Version="2.0.26">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="HarfBuzzSharp" Version="2.6.1.5" />
-    <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.6.1.5" />
+    <PackageReference Include="HarfBuzzSharp" Version="2.6.1.6" />
+    <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.6.1.6" />
     <PackageReference Include="MessagePack" Version="1.9.11" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="NSubsys" Version="1.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.68.2.1" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.1" />
     <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
     <PackageReference Update="FSharp.Core" Version="4.7.2" />
     <PackageReference Include="UACHelper" Version="1.3.0.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview3" />
   </ItemGroup>
 
 </Project>
diff --git a/fvim.fsproj.user b/fvim.fsproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>C:\Users\sean.shang\Programmes\fvim\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>F:\git\fvim\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>