Try to get the control catalog working in NativeAOT builds (#423)

* Try to get the control catalog working in NativeAOT builds * Replace another sprintf with a string interpolation
fsprojects · Sep 24, 2024 · f156f6e · f156f6e
1 parent f39980a
commit f156f6e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/...alog/Avalonia.FuncUI.ControlCatalog.Desktop/Avalonia.FuncUI.ControlCatalog.Desktop.fsproj b/...alog/Avalonia.FuncUI.ControlCatalog.Desktop/Avalonia.FuncUI.ControlCatalog.Desktop.fsproj
@@ -17,4 +17,8 @@
     <ProjectReference Include="..\Avalonia.FuncUI.ControlCatalog\Avalonia.FuncUI.ControlCatalog.fsproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <TrimmerRootAssembly Include="Avalonia.FuncUI.ControlCatalog" />
+  </ItemGroup>
+
 </Project>
diff --git a/...uncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog.fsproj b/...uncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog.fsproj
@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
+        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/...lonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/Tabs/DataTemplateDemo.fs b/...lonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/Tabs/DataTemplateDemo.fs
@@ -161,7 +161,7 @@ module DataTemplateDemo =
                 TextBlock.create [
                     TextBlock.dock Dock.Top
                     TextBlock.margin 5.0
-                    TextBlock.text (sprintf "Total Products: %i" state.Products.Length)
+                    TextBlock.text ($"Total Products: %i{state.Products.Length}")
                 ]    
 
                 productDetailsView state.Selected dispatch

diff --git a/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/Tabs/DragDropDemo.fs b/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/Tabs/DragDropDemo.fs
@@ -29,7 +29,7 @@ module DragDropDemo =
     let doDrag (e, dragCount) =
         async {
             let dragData = DataObject()
-            dragData.Set(DataFormats.Text, sprintf "You have dragged text %d times" dragCount)
+            dragData.Set(DataFormats.Text, $"You have dragged text %d{dragCount} times")
 
             let! result = Dispatcher.UIThread.InvokeAsync<DragDropEffects>
                               (fun _ -> DragDrop.DoDragDrop(e, dragData, DragDropEffects.Copy)) |> Async.AwaitTask

diff --git a/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/Tabs/GridDemo.fs b/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/Views/Tabs/GridDemo.fs
@@ -48,8 +48,8 @@ module GridDemo =
                     )
                 ]
                 Grid.create [
-                    Grid.columnDefinitions (sprintf "%i, 1*" state.cellWidth)
-                    Grid.rowDefinitions (sprintf "%i, 1*" state.cellHeight)
+                    Grid.columnDefinitions ($"%i{state.cellWidth}, 1*")
+                    Grid.rowDefinitions ($"%i{state.cellHeight}, 1*")
                     Grid.showGridLines true
                     Grid.children [
                         Border.create [