From 410903868fe40659235315c40d04236fe9cad245 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 5 Mar 2022 18:25:32 +0000
Subject: [PATCH 01/17] update existing projects and remove traces of
 reactiveui

---
 .../xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj    | 4 +---
 templates/csharp/xplat/AvaloniaTest.NetCore/Program.cs        | 3 +--
 templates/csharp/xplat/AvaloniaTest.Web/App.razor.cs          | 2 --
 .../csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj     | 3 ++-
 templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj       | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj b/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
index a68cfbc1..81ca759b 100644
--- a/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
@@ -3,8 +3,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <RootNamespace>AvaloniaTest.NetCore</RootNamespace>
-    <AvaloniaVersion>0.10.12</AvaloniaVersion>
+    <AvaloniaVersion>0.10.13</AvaloniaVersion>
 	<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 	<TrimMode>copyused</TrimMode>
 	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
@@ -20,7 +19,6 @@
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AvaloniaTest\AvaloniaTest.csproj" />
diff --git a/templates/csharp/xplat/AvaloniaTest.NetCore/Program.cs b/templates/csharp/xplat/AvaloniaTest.NetCore/Program.cs
index 715cbc3b..d85bcdda 100644
--- a/templates/csharp/xplat/AvaloniaTest.NetCore/Program.cs
+++ b/templates/csharp/xplat/AvaloniaTest.NetCore/Program.cs
@@ -17,7 +17,6 @@ public static void Main(string[] args) => BuildAvaloniaApp()
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
-                .LogToTrace()
-                .UseReactiveUI();
+                .LogToTrace();
     }
 }
diff --git a/templates/csharp/xplat/AvaloniaTest.Web/App.razor.cs b/templates/csharp/xplat/AvaloniaTest.Web/App.razor.cs
index 7aca99da..e761ee8c 100644
--- a/templates/csharp/xplat/AvaloniaTest.Web/App.razor.cs
+++ b/templates/csharp/xplat/AvaloniaTest.Web/App.razor.cs
@@ -1,4 +1,3 @@
-using Avalonia.ReactiveUI;
 using Avalonia.Web.Blazor;
 
 namespace AvaloniaTest.Web;
@@ -10,7 +9,6 @@ protected override void OnParametersSet()
         base.OnParametersSet();
         
         WebAppBuilder.Configure<AvaloniaTest.App>()
-            .UseReactiveUI()
             .SetupWithSingleViewLifetime();
     }
 }
\ No newline at end of file
diff --git a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
index c3afe2ea..e7329867 100644
--- a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
@@ -4,6 +4,7 @@
     <Nullable>enable</Nullable>
     <!--Temporal hack that fixes compilation in VS-->
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+    <AvaloniaVersion>0.10.13</AvaloniaVersion>
   </PropertyGroup>
 
   <!-- In debug, make builds faster by reducing optimizations -->
@@ -24,7 +25,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="Avalonia.Web.Blazor" Version="0.10.11" />
+    <PackageReference Include="Avalonia.Web.Blazor" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
index 4f03d491..13dcdaa8 100644
--- a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
+++ b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <AvaloniaVersion>0.10.12</AvaloniaVersion>
+    <AvaloniaVersion>0.10.13</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>    
     <AvaloniaResource Include="Assets\**" />

From 6ffa6263d8ad17441832e7513219f9bea084dff5 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 5 Mar 2022 18:34:40 +0000
Subject: [PATCH 02/17] add ios project template.

also updates to 0.10.13.
---
 .../xplat/AvaloniaTest.iOS/AppDelegate.cs     | 18 +++++++
 .../AvaloniaTest.iOS/AvaloniaTest.iOS.csproj  | 23 +++++++++
 .../xplat/AvaloniaTest.iOS/Entitlements.plist |  5 ++
 .../csharp/xplat/AvaloniaTest.iOS/Info.plist  | 47 +++++++++++++++++++
 .../csharp/xplat/AvaloniaTest.iOS/Main.cs     | 15 ++++++
 .../Resources/LaunchScreen.xib                | 43 +++++++++++++++++
 templates/csharp/xplat/AvaloniaTest.sln       |  6 +++
 7 files changed, 157 insertions(+)
 create mode 100644 templates/csharp/xplat/AvaloniaTest.iOS/AppDelegate.cs
 create mode 100644 templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
 create mode 100644 templates/csharp/xplat/AvaloniaTest.iOS/Entitlements.plist
 create mode 100644 templates/csharp/xplat/AvaloniaTest.iOS/Info.plist
 create mode 100644 templates/csharp/xplat/AvaloniaTest.iOS/Main.cs
 create mode 100644 templates/csharp/xplat/AvaloniaTest.iOS/Resources/LaunchScreen.xib

diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/AppDelegate.cs b/templates/csharp/xplat/AvaloniaTest.iOS/AppDelegate.cs
new file mode 100644
index 00000000..045f65c4
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/AppDelegate.cs
@@ -0,0 +1,18 @@
+using Foundation;
+using UIKit;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.iOS;
+using Avalonia.Media;
+
+namespace AvaloniaTest.iOS
+{
+    // The UIApplicationDelegate for the application. This class is responsible for launching the 
+    // User Interface of the application, as well as listening (and optionally responding) to 
+    // application events from iOS.
+    [Register("AppDelegate")]
+    public partial class AppDelegate : AvaloniaAppDelegate<App>
+    {
+        
+    }
+}
diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
new file mode 100644
index 00000000..ec3819be
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0-ios</TargetFramework>
+    <AvaloniaVersion>0.10.999-cibuild0019029-beta</AvaloniaVersion>
+    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
+    <ProvisioningType>manual</ProvisioningType>
+    <Nullable>enable</Nullable>
+    <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
+    
+    <!-- These properties need to be set in order to run on a real iDevice -->
+    <!--<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>-->
+    <!--<CodesignKey></CodesignKey>-->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AvaloniaTest\AvaloniaTest.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/Entitlements.plist b/templates/csharp/xplat/AvaloniaTest.iOS/Entitlements.plist
new file mode 100644
index 00000000..0c67376e
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/Entitlements.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/Info.plist b/templates/csharp/xplat/AvaloniaTest.iOS/Info.plist
new file mode 100644
index 00000000..d3674e9c
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/Info.plist
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>IosTest1</string>
+	<key>CFBundleIdentifier</key>
+	<string>Avalonia.IosTest1</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>10.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIStatusBarHidden</key>
+	<true/>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
+</plist>
diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/Main.cs b/templates/csharp/xplat/AvaloniaTest.iOS/Main.cs
new file mode 100644
index 00000000..6e975ef4
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/Main.cs
@@ -0,0 +1,15 @@
+using UIKit;
+
+namespace AvaloniaTest.iOS
+{
+    public class Application
+    {
+        // This is the main entry point of the application.
+        static void Main(string[] args)
+        {
+            // if you want to use a different Application Delegate class from "AppDelegate"
+            // you can specify it here.
+            UIApplication.Main(args, null, typeof(AppDelegate));
+        }
+    }
+}
diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/Resources/LaunchScreen.xib b/templates/csharp/xplat/AvaloniaTest.iOS/Resources/LaunchScreen.xib
new file mode 100644
index 00000000..5d3ccc97
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/Resources/LaunchScreen.xib
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+	<dependencies>
+		<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
+		<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
+	</dependencies>
+	<objects>
+		<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
+		<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
+		<view contentMode="scaleToFill" id="iN0-l3-epB">
+			<rect key="frame" x="0.0" y="0.0" width="480" height="480" />
+			<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
+			<subviews>
+				<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2022 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
+					minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+					<rect key="frame" x="20" y="439" width="441" height="21" />
+					<fontDescription key="fontDescription" type="system" pointSize="17" />
+					<color key="textColor" cocoaTouchSystemColor="darkTextColor" />
+					<nil key="highlightedColor" />
+				</label>
+				<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ControlCatalog.iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
+					minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+					<rect key="frame" x="20" y="140" width="441" height="43" />
+					<fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
+					<color key="textColor" cocoaTouchSystemColor="darkTextColor" />
+					<nil key="highlightedColor" />
+				</label>
+			</subviews>
+			<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
+			<constraints>
+				<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
+				<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
+				<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
+				<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
+				<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
+				<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
+			</constraints>
+			<nil key="simulatedStatusBarMetrics" />
+			<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
+			<point key="canvasLocation" x="548" y="455" />
+		</view>
+	</objects>
+</document>
diff --git a/templates/csharp/xplat/AvaloniaTest.sln b/templates/csharp/xplat/AvaloniaTest.sln
index f2967be6..23b0d713 100644
--- a/templates/csharp/xplat/AvaloniaTest.sln
+++ b/templates/csharp/xplat/AvaloniaTest.sln
@@ -6,6 +6,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.NetCore", "Ava
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.Web", "AvaloniaTest.Web\AvaloniaTest.Web.csproj", "{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.iOS", "AvaloniaTest.iOS\AvaloniaTest.iOS.csproj", "{EBD9022F-BC83-4846-9A11-6F7F3772DC64}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,5 +26,9 @@ Global
 		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

From 52ee9bb1eb2c8d22f35c7b004137e5492d8eef9d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 5 Mar 2022 18:40:00 +0000
Subject: [PATCH 03/17] fix plist bundle identifier.

---
 templates/csharp/xplat/AvaloniaTest.iOS/Info.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/Info.plist b/templates/csharp/xplat/AvaloniaTest.iOS/Info.plist
index d3674e9c..ee5f7cb4 100644
--- a/templates/csharp/xplat/AvaloniaTest.iOS/Info.plist
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/Info.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDisplayName</key>
-	<string>IosTest1</string>
+	<string>AvaloniaTest</string>
 	<key>CFBundleIdentifier</key>
-	<string>Avalonia.IosTest1</string>
+	<string>companyName.AvaloniaTest</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>

From 19604d86224471341a936faeb825d7e843b37ca1 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 5 Mar 2022 19:27:06 +0000
Subject: [PATCH 04/17] bump version

---
 Avalonia.Templates.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Avalonia.Templates.csproj b/Avalonia.Templates.csproj
index 7787ae40..e64f788c 100644
--- a/Avalonia.Templates.csproj
+++ b/Avalonia.Templates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>0.10.12.1</PackageVersion>
+    <PackageVersion>0.10.13</PackageVersion>
     <PackageId>Avalonia.Templates</PackageId>
     <Title>Avalonia Templates</Title>
     <Description>Templates for creating Avalonia applications and libraries.</Description>

From b13eb3e3c072dcc63dc22c839950fbb6754aa7e3 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 8 Mar 2022 22:48:41 +0000
Subject: [PATCH 05/17] add android.

---
 .../AvaloniaTest.Android.csproj               |  45 ++++++++++++++++++
 .../xplat/AvaloniaTest.Android/Icon.png       | Bin 0 -> 14349 bytes
 .../AvaloniaTest.Android/MainActivity.cs      |  16 +++++++
 .../Properties/AndroidManifest.xml            |   5 ++
 .../Resources/drawable/splash_screen.xml      |  13 +++++
 .../Resources/values/colors.xml               |   4 ++
 .../Resources/values/styles.xml               |  17 +++++++
 .../AvaloniaTest.Android/SplashActivity.cs    |  17 +++++++
 templates/csharp/xplat/AvaloniaTest.sln       |   6 +++
 9 files changed, 123 insertions(+)
 create mode 100644 templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
 create mode 100644 templates/csharp/xplat/AvaloniaTest.Android/Icon.png
 create mode 100644 templates/csharp/xplat/AvaloniaTest.Android/MainActivity.cs
 create mode 100644 templates/csharp/xplat/AvaloniaTest.Android/Properties/AndroidManifest.xml
 create mode 100644 templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable/splash_screen.xml
 create mode 100644 templates/csharp/xplat/AvaloniaTest.Android/Resources/values/colors.xml
 create mode 100644 templates/csharp/xplat/AvaloniaTest.Android/Resources/values/styles.xml
 create mode 100644 templates/csharp/xplat/AvaloniaTest.Android/SplashActivity.cs

diff --git a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
new file mode 100644
index 00000000..e4841c2a
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0-android</TargetFramework>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+    <Nullable>enable</Nullable>
+    <ApplicationId>com.CompanyName.AvaloniaTest</ApplicationId>
+    <ApplicationVersion>1</ApplicationVersion>
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <AndroidPackageFormat>apk</AndroidPackageFormat>
+    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
+    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
+    <!--<RunAOTCompilation>true</RunAOTCompilation>
+    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>-->
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Assets\AboutAssets.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Icon.png">
+      <Link>Resources\drawable\Icon.png</Link>
+    </AndroidResource>
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
+    <RunAOTCompilation>True</RunAOTCompilation>
+    <EnableLLVM>True</EnableLLVM>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
+    <RunAOTCompilation>False</RunAOTCompilation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel" Version="2.3.1.3" />
+    <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\AvaloniaTest\AvaloniaTest.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/templates/csharp/xplat/AvaloniaTest.Android/Icon.png b/templates/csharp/xplat/AvaloniaTest.Android/Icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..41a2a618fb02e4cb7f6a15caf572b693bfe1ebb1
GIT binary patch
literal 14349
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
H8T|hMTHCz{

literal 0
HcmV?d00001

diff --git a/templates/csharp/xplat/AvaloniaTest.Android/MainActivity.cs b/templates/csharp/xplat/AvaloniaTest.Android/MainActivity.cs
new file mode 100644
index 00000000..36beba7c
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.Android/MainActivity.cs
@@ -0,0 +1,16 @@
+using Android.App;
+using Android.Content.PM;
+using Avalonia.Android;
+using Avalonia;
+
+namespace AvaloniaTest.Android
+{
+    [Activity(Label = "AvaloniaTest.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleInstance, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
+    public class MainActivity : AvaloniaActivity<App>
+    {
+        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+        {
+            return base.CustomizeAppBuilder(builder);
+        }
+    }
+}
diff --git a/templates/csharp/xplat/AvaloniaTest.Android/Properties/AndroidManifest.xml b/templates/csharp/xplat/AvaloniaTest.Android/Properties/AndroidManifest.xml
new file mode 100644
index 00000000..a561c56a
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.Android/Properties/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
+	<uses-permission android:name="android.permission.INTERNET" />
+	<application android:label="AvaloniaTest" android:icon="@drawable/Icon" />
+</manifest>
diff --git a/templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable/splash_screen.xml b/templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable/splash_screen.xml
new file mode 100644
index 00000000..2e920b4b
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable/splash_screen.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item>
+    <color android:color="@color/splash_background"/>
+  </item>
+
+  <item android:drawable="@drawable/icon"
+        android:width="120dp"
+        android:height="120dp"
+        android:gravity="center" />
+
+</layer-list>
diff --git a/templates/csharp/xplat/AvaloniaTest.Android/Resources/values/colors.xml b/templates/csharp/xplat/AvaloniaTest.Android/Resources/values/colors.xml
new file mode 100644
index 00000000..59279d5d
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.Android/Resources/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="splash_background">#FFFFFF</color>
+</resources>
diff --git a/templates/csharp/xplat/AvaloniaTest.Android/Resources/values/styles.xml b/templates/csharp/xplat/AvaloniaTest.Android/Resources/values/styles.xml
new file mode 100644
index 00000000..2759d290
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.Android/Resources/values/styles.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+
+  <style name="MyTheme">
+  </style>
+
+  <style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowNoTitle">true</item>
+  </style>
+
+  <style name="MyTheme.Splash" parent ="MyTheme.NoActionBar">
+    <item name="android:windowBackground">@drawable/splash_screen</item>
+    <item name="android:windowContentOverlay">@null</item>
+  </style>
+
+</resources>
diff --git a/templates/csharp/xplat/AvaloniaTest.Android/SplashActivity.cs b/templates/csharp/xplat/AvaloniaTest.Android/SplashActivity.cs
new file mode 100644
index 00000000..0f1be4c3
--- /dev/null
+++ b/templates/csharp/xplat/AvaloniaTest.Android/SplashActivity.cs
@@ -0,0 +1,17 @@
+using Android.App;
+using Android.Content;
+using Application = Android.App.Application;
+
+namespace AvaloniaTest.Android
+{
+    [Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
+    public class SplashActivity : Activity
+    {
+        protected override void OnResume()
+        {
+            base.OnResume();
+
+            StartActivity(new Intent(Application.Context, typeof(MainActivity)));
+        }
+    }
+}
diff --git a/templates/csharp/xplat/AvaloniaTest.sln b/templates/csharp/xplat/AvaloniaTest.sln
index 23b0d713..530b0938 100644
--- a/templates/csharp/xplat/AvaloniaTest.sln
+++ b/templates/csharp/xplat/AvaloniaTest.sln
@@ -8,6 +8,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.Web", "Avaloni
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.iOS", "AvaloniaTest.iOS\AvaloniaTest.iOS.csproj", "{EBD9022F-BC83-4846-9A11-6F7F3772DC64}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.Android", "AvaloniaTest.Android\AvaloniaTest.Android.csproj", "{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -30,5 +32,9 @@ Global
 		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

From 04305090834d98bbfb846226b38c0bc70542437a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 8 Mar 2022 22:55:18 +0000
Subject: [PATCH 06/17] workloads for ios and android. update avalonia

---
 azure-pipelines.yml                                  |  2 +-
 nuget.config                                         |  2 +-
 .../AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj |  2 +-
 .../xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj   |  2 +-
 .../xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj   |  2 +-
 .../csharp/xplat/AvaloniaTest/AvaloniaTest.csproj    |  2 +-
 templates/csharp/xplat/global.json                   | 12 ++++++++++++
 7 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 templates/csharp/xplat/global.json

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 04461cce..6ab088bf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,7 +20,7 @@ steps:
   - task: CmdLine@2
     displayName: 'Install WASM workload'
     inputs:
-      script: 'dotnet workload install wasm-tools' 
+      script: 'dotnet workload install --no-cache --disable-parallel ios android wasm-tools --skip-manifest-update --source "https://api.nuget.org/v3/index.json"' 
   - task: PowerShell@2
     displayName: 'Run Tests'
     inputs:
diff --git a/nuget.config b/nuget.config
index 6c273ab3..9b43eeb0 100644
--- a/nuget.config
+++ b/nuget.config
@@ -6,6 +6,6 @@
 
 <configuration>
   <packageSources>
-    <add key="AvaloniaCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
+    <add key="AvaloniaCI" value="https://nuget.avaloniaui.net/repository/avalonia-nightly/index.json" />
   </packageSources>
 </configuration>
diff --git a/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj b/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
index 81ca759b..e7b1ceaa 100644
--- a/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>0.10.13</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
 	<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 	<TrimMode>copyused</TrimMode>
 	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
diff --git a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
index e7329867..5c57ff51 100644
--- a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <!--Temporal hack that fixes compilation in VS-->
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <AvaloniaVersion>0.10.13</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
   </PropertyGroup>
 
   <!-- In debug, make builds faster by reducing optimizations -->
diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
index ec3819be..20c5ce7e 100644
--- a/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0-ios</TargetFramework>
-    <AvaloniaVersion>0.10.999-cibuild0019029-beta</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
     <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <ProvisioningType>manual</ProvisioningType>
     <Nullable>enable</Nullable>
diff --git a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
index 13dcdaa8..29b95bcc 100644
--- a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
+++ b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <AvaloniaVersion>0.10.13</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>    
     <AvaloniaResource Include="Assets\**" />
diff --git a/templates/csharp/xplat/global.json b/templates/csharp/xplat/global.json
new file mode 100644
index 00000000..30265268
--- /dev/null
+++ b/templates/csharp/xplat/global.json
@@ -0,0 +1,12 @@
+{
+    "sdk": {
+        "version": "6.0.200",
+        "rollForward": "latestFeature"
+    },
+    "msbuild-sdks": {
+        "Microsoft.Build.Traversal": "1.0.43",
+        "Xamarin.Legacy.Sdk": "0.1.2-alpha6",
+        "MSBuild.Sdk.Extras": "3.0.22",
+        "AggregatePackage.NuGet.Sdk" : "0.1.12"
+    }
+}

From 18236e52bf42b0817ee071183e54d8ab271daefc Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 8 Mar 2022 23:22:57 +0000
Subject: [PATCH 07/17] use nightly package for avalonia.

---
 .../xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj      | 2 +-
 .../xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj      | 2 +-
 templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj | 2 +-
 templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj | 2 +-
 templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
index e4841c2a..75864ac1 100644
--- a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
@@ -9,7 +9,7 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
-    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
     <!--<RunAOTCompilation>true</RunAOTCompilation>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>-->
   </PropertyGroup>
diff --git a/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj b/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
index e7b1ceaa..7c90d851 100644
--- a/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
 	<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 	<TrimMode>copyused</TrimMode>
 	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
diff --git a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
index 5c57ff51..dd3d32e1 100644
--- a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <!--Temporal hack that fixes compilation in VS-->
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
   </PropertyGroup>
 
   <!-- In debug, make builds faster by reducing optimizations -->
diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
index 20c5ce7e..2378570f 100644
--- a/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0-ios</TargetFramework>
-    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
     <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <ProvisioningType>manual</ProvisioningType>
     <Nullable>enable</Nullable>
diff --git a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
index 29b95bcc..7633e422 100644
--- a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
+++ b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <AvaloniaVersion>0.10.999-cibuild0019067-beta</AvaloniaVersion>
+    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>    
     <AvaloniaResource Include="Assets\**" />

From f47c26ab07308772a7c71fd17cfca12c3eac1970 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 8 Mar 2022 23:32:22 +0000
Subject: [PATCH 08/17] rename to desktop.

---
 .../AvaloniaTest.Desktop.csproj}                                 | 1 +
 .../{AvaloniaTest.NetCore => AvaloniaTest.Desktop}/Program.cs    | 0
 2 files changed, 1 insertion(+)
 rename templates/csharp/xplat/{AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj => AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj} (94%)
 rename templates/csharp/xplat/{AvaloniaTest.NetCore => AvaloniaTest.Desktop}/Program.cs (100%)

diff --git a/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
similarity index 94%
rename from templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
rename to templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
index 7c90d851..196d32b5 100644
--- a/templates/csharp/xplat/AvaloniaTest.NetCore/AvaloniaTest.NetCore.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
@@ -7,6 +7,7 @@
 	<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 	<TrimMode>copyused</TrimMode>
 	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+	<RootNamespace>AvaloniaTest.NetCore</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
 	<!--This helps with theme dll-s trimming.
diff --git a/templates/csharp/xplat/AvaloniaTest.NetCore/Program.cs b/templates/csharp/xplat/AvaloniaTest.Desktop/Program.cs
similarity index 100%
rename from templates/csharp/xplat/AvaloniaTest.NetCore/Program.cs
rename to templates/csharp/xplat/AvaloniaTest.Desktop/Program.cs

From 16e9f0d802227a683f8f0f6977d4462822090c57 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 8 Mar 2022 23:32:35 +0000
Subject: [PATCH 09/17] fix warnings on viewlocator.

---
 templates/csharp/xplat/AvaloniaTest/ViewLocator.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/csharp/xplat/AvaloniaTest/ViewLocator.cs b/templates/csharp/xplat/AvaloniaTest/ViewLocator.cs
index 42c0b5ef..b5e44450 100644
--- a/templates/csharp/xplat/AvaloniaTest/ViewLocator.cs
+++ b/templates/csharp/xplat/AvaloniaTest/ViewLocator.cs
@@ -7,8 +7,11 @@ namespace AvaloniaTest
 {
     public class ViewLocator : IDataTemplate
     {
-        public IControl Build(object data)
+        public IControl? Build(object? data)
         {
+            if (data is null)
+                return null;
+
             var name = data.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);
 
@@ -16,13 +19,11 @@ public IControl Build(object data)
             {
                 return (Control)Activator.CreateInstance(type)!;
             }
-            else
-            {
-                return new TextBlock { Text = "Not Found: " + name };
-            }
+            
+            return new TextBlock { Text = name };
         }
 
-        public bool Match(object data)
+        public bool Match(object? data)
         {
             return data is ViewModelBase;
         }

From e6e961bcb711a32a7109fab5c221e3ba0b6cf909 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 8 Mar 2022 23:32:48 +0000
Subject: [PATCH 10/17] fix rename to desktop.

---
 .../xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj     | 1 -
 templates/csharp/xplat/AvaloniaTest.Desktop/Program.cs         | 3 +--
 templates/csharp/xplat/AvaloniaTest.sln                        | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
index 196d32b5..7c90d851 100644
--- a/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
@@ -7,7 +7,6 @@
 	<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 	<TrimMode>copyused</TrimMode>
 	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-	<RootNamespace>AvaloniaTest.NetCore</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
 	<!--This helps with theme dll-s trimming.
diff --git a/templates/csharp/xplat/AvaloniaTest.Desktop/Program.cs b/templates/csharp/xplat/AvaloniaTest.Desktop/Program.cs
index d85bcdda..9954f27c 100644
--- a/templates/csharp/xplat/AvaloniaTest.Desktop/Program.cs
+++ b/templates/csharp/xplat/AvaloniaTest.Desktop/Program.cs
@@ -1,8 +1,7 @@
 using System;
 using Avalonia;
-using Avalonia.ReactiveUI;
 
-namespace AvaloniaTest.NetCore
+namespace AvaloniaTest.Desktop
 {
     class Program
     {
diff --git a/templates/csharp/xplat/AvaloniaTest.sln b/templates/csharp/xplat/AvaloniaTest.sln
index 530b0938..f976bcc4 100644
--- a/templates/csharp/xplat/AvaloniaTest.sln
+++ b/templates/csharp/xplat/AvaloniaTest.sln
@@ -2,7 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest", "AvaloniaTest\AvaloniaTest.csproj", "{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.NetCore", "AvaloniaTest.NetCore\AvaloniaTest.NetCore.csproj", "{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.Desktop", "AvaloniaTest.Desktop\AvaloniaTest.Desktop.csproj", "{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaTest.Web", "AvaloniaTest.Web\AvaloniaTest.Web.csproj", "{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}"
 EndProject

From 24d6adc6caccb131bef93004269afc1fce76b64a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 8 Mar 2022 23:43:15 +0000
Subject: [PATCH 11/17] use mac-build agent.

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6ab088bf..4ad11d86 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,5 +1,5 @@
 pool:
-    vmImage: 'windows-2019'
+    vmImage: 'macos-latest'
 steps:
   - task: UseDotNet@2
     displayName: 'Use .NET 6.0.x SDK'

From 377fcec1d4282977f6564e84c5d2b0eb3f076474 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 9 Mar 2022 13:22:54 +0000
Subject: [PATCH 12/17] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index aaacd1d8..04f8be46 100644
--- a/readme.md
+++ b/readme.md
@@ -49,7 +49,7 @@ To create a new Cross-Platform application in its own subdirectory, run:
 dotnet new avalonia.xplat 
 ```
 **Note:**
-This type of template allows you to create a program that will work on Desktop and on Web via WASM (preview).
+This type of template allows you to create an application that will work on Desktop, Browser (preview) and Mobile (iOS & Android) (preview).
 
 # Creating a new Application
 

From c523841e6811a0530a5143ed46e21994b7651063 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 10 Mar 2022 19:42:54 +0000
Subject: [PATCH 13/17] use latest build and Directory.Build.props to configure
 avalonia version.

---
 .../AvaloniaTest.Android/AvaloniaTest.Android.csproj  |  1 -
 .../AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj  |  1 -
 .../xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj    |  1 -
 .../xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj    |  1 -
 .../csharp/xplat/AvaloniaTest/AvaloniaTest.csproj     |  1 -
 templates/csharp/xplat/Directory.Build.props          |  5 +++++
 templates/csharp/xplat/nuget.config                   | 11 +++++++++++
 7 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 templates/csharp/xplat/Directory.Build.props
 create mode 100644 templates/csharp/xplat/nuget.config

diff --git a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
index 75864ac1..5b908d86 100644
--- a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
@@ -9,7 +9,6 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
-    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
     <!--<RunAOTCompilation>true</RunAOTCompilation>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>-->
   </PropertyGroup>
diff --git a/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
index 7c90d851..6e6308eb 100644
--- a/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
@@ -3,7 +3,6 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
 	<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 	<TrimMode>copyused</TrimMode>
 	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
diff --git a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
index dd3d32e1..255735e9 100644
--- a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
@@ -4,7 +4,6 @@
     <Nullable>enable</Nullable>
     <!--Temporal hack that fixes compilation in VS-->
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
   </PropertyGroup>
 
   <!-- In debug, make builds faster by reducing optimizations -->
diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
index 2378570f..0de38723 100644
--- a/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0-ios</TargetFramework>
-    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
     <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
     <ProvisioningType>manual</ProvisioningType>
     <Nullable>enable</Nullable>
diff --git a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
index 7633e422..6b439f0e 100644
--- a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
+++ b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
@@ -3,7 +3,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <AvaloniaVersion>0.10.999-cibuild0019088-beta</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>    
     <AvaloniaResource Include="Assets\**" />
diff --git a/templates/csharp/xplat/Directory.Build.props b/templates/csharp/xplat/Directory.Build.props
new file mode 100644
index 00000000..bcf2da33
--- /dev/null
+++ b/templates/csharp/xplat/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <AvaloniaVersion>0.10.999-cibuild0019213-beta</AvaloniaVersion>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/templates/csharp/xplat/nuget.config b/templates/csharp/xplat/nuget.config
new file mode 100644
index 00000000..ad73f0a5
--- /dev/null
+++ b/templates/csharp/xplat/nuget.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+  To use the Avalonia CI feed to get unstable packages, move this file to the root of your solution.
+-->
+
+<configuration>
+  <packageSources>
+    <add key="AvaloniaCI" value="https://pkgs.dev.azure.com/AvaloniaUI/AvaloniaUI/_packaging/avalonia-all/nuget/v3/index.json" />
+  </packageSources>
+</configuration>

From cd21731fc1193ea9f7e7b3e6f771b0179b61b151 Mon Sep 17 00:00:00 2001
From: Tako <tako0qq@gmail.com>
Date: Fri, 11 Mar 2022 18:38:23 +0200
Subject: [PATCH 14/17] minor fixes

---
 .../AvaloniaTest.Android.csproj                     |   3 ---
 .../{ => Resources/drawable}/Icon.png               | Bin
 2 files changed, 3 deletions(-)
 rename templates/csharp/xplat/AvaloniaTest.Android/{ => Resources/drawable}/Icon.png (100%)

diff --git a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
index 5b908d86..e636e195 100644
--- a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
@@ -12,9 +12,6 @@
     <!--<RunAOTCompilation>true</RunAOTCompilation>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>-->
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Assets\AboutAssets.txt" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Icon.png">
       <Link>Resources\drawable\Icon.png</Link>
diff --git a/templates/csharp/xplat/AvaloniaTest.Android/Icon.png b/templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable/Icon.png
similarity index 100%
rename from templates/csharp/xplat/AvaloniaTest.Android/Icon.png
rename to templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable/Icon.png

From dc842d1e56d6952b97ff57b7912a81ecd7cba7a9 Mon Sep 17 00:00:00 2001
From: Tako <tako0qq@gmail.com>
Date: Fri, 11 Mar 2022 18:50:16 +0200
Subject: [PATCH 15/17] Revert "minor fixes"

This reverts commit cd21731fc1193ea9f7e7b3e6f771b0179b61b151.
---
 .../AvaloniaTest.Android.csproj                     |   3 +++
 .../{Resources/drawable => }/Icon.png               | Bin
 2 files changed, 3 insertions(+)
 rename templates/csharp/xplat/AvaloniaTest.Android/{Resources/drawable => }/Icon.png (100%)

diff --git a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
index e636e195..5b908d86 100644
--- a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
@@ -12,6 +12,9 @@
     <!--<RunAOTCompilation>true</RunAOTCompilation>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>-->
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Assets\AboutAssets.txt" />
+  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Icon.png">
       <Link>Resources\drawable\Icon.png</Link>
diff --git a/templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable/Icon.png b/templates/csharp/xplat/AvaloniaTest.Android/Icon.png
similarity index 100%
rename from templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable/Icon.png
rename to templates/csharp/xplat/AvaloniaTest.Android/Icon.png

From 1019a3583f0c8a153a5ad497dcebd3e066e38169 Mon Sep 17 00:00:00 2001
From: Tako <tako0qq@gmail.com>
Date: Fri, 11 Mar 2022 18:50:32 +0200
Subject: [PATCH 16/17] cleanup

---
 .../xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
index 5b908d86..e636e195 100644
--- a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
@@ -12,9 +12,6 @@
     <!--<RunAOTCompilation>true</RunAOTCompilation>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>-->
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Assets\AboutAssets.txt" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Icon.png">
       <Link>Resources\drawable\Icon.png</Link>

From e5ffcb08080921fc619b92e84725c7e6a5ce6370 Mon Sep 17 00:00:00 2001
From: Tako <tako0qq@gmail.com>
Date: Fri, 11 Mar 2022 18:53:04 +0200
Subject: [PATCH 17/17] bump versions

---
 templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj | 8 ++++----
 templates/csharp/app/AvaloniaAppTemplate.csproj      | 6 +++---
 templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj | 8 ++++----
 templates/fsharp/app/AvaloniaAppTemplate.fsproj      | 6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj b/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj
index 1671bcca..4c3de01f 100644
--- a/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj
+++ b/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj
@@ -20,11 +20,11 @@
 	<TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
+    <PackageReference Include="Avalonia" Version="0.10.13" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.12" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.12" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.13" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" />
 	<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
   </ItemGroup>
 </Project>
diff --git a/templates/csharp/app/AvaloniaAppTemplate.csproj b/templates/csharp/app/AvaloniaAppTemplate.csproj
index 0ed3c5ef..5b314cf2 100644
--- a/templates/csharp/app/AvaloniaAppTemplate.csproj
+++ b/templates/csharp/app/AvaloniaAppTemplate.csproj
@@ -18,10 +18,10 @@
     <TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
+    <PackageReference Include="Avalonia" Version="0.10.13" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.12" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.13" />
 	<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
    </ItemGroup>
 </Project>
diff --git a/templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj b/templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj
index ddf3cadb..96b7c00c 100644
--- a/templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj
+++ b/templates/fsharp/app-mvvm/AvaloniaAppTemplate.fsproj
@@ -27,10 +27,10 @@
 	<TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
+    <PackageReference Include="Avalonia" Version="0.10.13" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.12" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.12" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.13" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" />
   </ItemGroup>
 </Project>
diff --git a/templates/fsharp/app/AvaloniaAppTemplate.fsproj b/templates/fsharp/app/AvaloniaAppTemplate.fsproj
index a8ff5640..851fc755 100644
--- a/templates/fsharp/app/AvaloniaAppTemplate.fsproj
+++ b/templates/fsharp/app/AvaloniaAppTemplate.fsproj
@@ -22,9 +22,9 @@
 	<TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
+    <PackageReference Include="Avalonia" Version="0.10.13" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.12" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.13" />
    </ItemGroup>
 </Project>