From 4db4e6a36f92ba5cef9232fef26db7aa7c675944 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 27 Jan 2024 10:17:49 -0600
Subject: [PATCH 01/15] chore: add vs code configurations

---
 .vscode/extensions.json |  5 +++++
 .vscode/launch.json     | 14 ++++++++++++++
 .vscode/settings.json   |  6 ++++++
 3 files changed, 25 insertions(+)
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/launch.json
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..b3879c2
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "ms-dotnettools.dotnet-maui"
+  ]
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..c5c01d7
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": ".NET MAUI",
+      "type": "maui",
+      "request": "launch",
+      "preLaunchTask": "maui: Build"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..de44f25
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "cSpell.words": [
+        "autowire",
+        "Mvvm"
+    ]
+}
\ No newline at end of file

From 20efb3e59d0c31e50caa6b2c98399467c4856363 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 27 Jan 2024 10:18:00 -0600
Subject: [PATCH 02/15] chore: fix spelling

---
 src/MauiMicroMvvm/Xaml/MauiMicro.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MauiMicroMvvm/Xaml/MauiMicro.cs b/src/MauiMicroMvvm/Xaml/MauiMicro.cs
index cabfa24..20e4559 100644
--- a/src/MauiMicroMvvm/Xaml/MauiMicro.cs
+++ b/src/MauiMicroMvvm/Xaml/MauiMicro.cs
@@ -46,10 +46,10 @@ private static void OnRouteChanged(BindableObject bindable, object oldValue, obj
             return;
 
         content.Route = route;
-        SetContentTempalte(content, route);
+        SetContentTemplate(content, route);
     }
 
-    private static void SetContentTempalte(ShellContent content, string route)
+    private static void SetContentTemplate(ShellContent content, string route)
     {
         content.ContentTemplate = new DataTemplate(() => CreateView(route));
     }

From eaed6f50d5f43e7f8bafed71f53db92c19601a00 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 27 Jan 2024 10:19:18 -0600
Subject: [PATCH 03/15] chore: add required package reference for .net8

---
 sample/MauiMicroSample/MauiMicroSample.csproj                  | 2 ++
 src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj                   | 1 +
 .../content/MauiMicroApp.1/MauiMicroApp.1.csproj               | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sample/MauiMicroSample/MauiMicroSample.csproj b/sample/MauiMicroSample/MauiMicroSample.csproj
index b91b1cf..e8ef41f 100644
--- a/sample/MauiMicroSample/MauiMicroSample.csproj
+++ b/sample/MauiMicroSample/MauiMicroSample.csproj
@@ -49,6 +49,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Refit" Version="7.0.0" />
   </ItemGroup>
diff --git a/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj b/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj
index beb009d..114d8f6 100644
--- a/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj
+++ b/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj
@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
     <PackageReference Include="ReactiveUI" Version="19.5.39" />
   </ItemGroup>
 
diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/MauiMicroApp.1.csproj b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/MauiMicroApp.1.csproj
index 7f56f1a..67e902a 100644
--- a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/MauiMicroApp.1.csproj
+++ b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/MauiMicroApp.1.csproj
@@ -17,7 +17,6 @@
 
     <!-- App Identifier -->
     <ApplicationId>$ApplicationId$</ApplicationId>
-    <ApplicationIdGuid>683037c3-6415-40f7-a541-bdc57964b0d2</ApplicationIdGuid>
 
     <!-- Versions -->
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -52,6 +51,8 @@
     <!--#else -->
     <PackageReference Include="AvantiPoint.MauiMicroMvvm" Version="$MauiMicroVersion$" />
     <!--#endif -->
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$MicrosoftLoggingVersion$" />
   </ItemGroup>
 

From fff8d5483e072cbd5e960c20d3063abbd2cd8577 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 27 Jan 2024 10:20:05 -0600
Subject: [PATCH 04/15] chore: add dialog demo

---
 sample/MauiMicroSample/AppShell.xaml          |  5 ++++
 sample/MauiMicroSample/MauiProgram.cs         |  1 +
 sample/MauiMicroSample/Pages/DialogDemo.xaml  | 16 +++++++++++++
 .../MauiMicroSample/Pages/DialogDemo.xaml.cs  |  9 ++++++++
 sample/MauiMicroSample/Pages/MainPage.xaml.cs | 11 ++++-----
 .../Resources/Images/dialog.svg               |  1 +
 .../ViewModels/DialogDemoViewModel.cs         | 23 +++++++++++++++++++
 7 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 sample/MauiMicroSample/Pages/DialogDemo.xaml
 create mode 100644 sample/MauiMicroSample/Pages/DialogDemo.xaml.cs
 create mode 100644 sample/MauiMicroSample/Resources/Images/dialog.svg
 create mode 100644 sample/MauiMicroSample/ViewModels/DialogDemoViewModel.cs

diff --git a/sample/MauiMicroSample/AppShell.xaml b/sample/MauiMicroSample/AppShell.xaml
index 35f9231..c76c71e 100644
--- a/sample/MauiMicroSample/AppShell.xaml
+++ b/sample/MauiMicroSample/AppShell.xaml
@@ -16,6 +16,11 @@
     </Tab>
   </FlyoutItem>
 
+  <FlyoutItem Title="Dialog Demo"
+              Icon="dialog.png">
+    <Tab micro:MauiMicro.Route="DialogDemo" />
+  </FlyoutItem>
+
   <FlyoutItem Title="Message Demo"
               Icon="messages.png">
     <Tab micro:MauiMicro.Route="MessageDemoPage" />
diff --git a/sample/MauiMicroSample/MauiProgram.cs b/sample/MauiMicroSample/MauiProgram.cs
index 41297cb..c3672ea 100644
--- a/sample/MauiMicroSample/MauiProgram.cs
+++ b/sample/MauiMicroSample/MauiProgram.cs
@@ -23,6 +23,7 @@ public static MauiApp CreateMauiApp()
             });
 
         builder.Services.MapView<MainPage, MainPageViewModel>()
+            .MapView<DialogDemo, DialogDemoViewModel>()
             .MapView<MessageDemoPage, MessageDemoPageViewModel>()
             .MapView<MessageDisplay, MessageDisplayViewModel>()
             .MapView<MauiInfluencersPage, MauiInfluencersViewModel>()
diff --git a/sample/MauiMicroSample/Pages/DialogDemo.xaml b/sample/MauiMicroSample/Pages/DialogDemo.xaml
new file mode 100644
index 0000000..cbfb325
--- /dev/null
+++ b/sample/MauiMicroSample/Pages/DialogDemo.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="MauiMicroSample.Pages.DialogDemo"
+             xmlns:micro="http://schemas.mauimicromvvm.com/2022/dotnet/maui"
+             xmlns:vm="clr-namespace:MauiMicroSample.ViewModels"
+             micro:MauiMicro.Autowire="True"
+             x:DataType="vm:DialogDemoViewModel"
+             Title="Dialog Demo">
+  <VerticalStackLayout Spacing="5"
+                       Padding="10">
+    <Label Text="Dialog Demo" Style="{DynamicResource Title}" />
+    <Button Text="Display Alert" Command="{Binding ShowAlertCommand}" />
+    <Button Text="Display ActionSheet" Command="{Binding ShowActionSheetCommand}" />
+  </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/sample/MauiMicroSample/Pages/DialogDemo.xaml.cs b/sample/MauiMicroSample/Pages/DialogDemo.xaml.cs
new file mode 100644
index 0000000..890b187
--- /dev/null
+++ b/sample/MauiMicroSample/Pages/DialogDemo.xaml.cs
@@ -0,0 +1,9 @@
+namespace MauiMicroSample.Pages;
+
+public partial class DialogDemo : ContentPage
+{
+	public DialogDemo()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/sample/MauiMicroSample/Pages/MainPage.xaml.cs b/sample/MauiMicroSample/Pages/MainPage.xaml.cs
index 6adef1b..e6fbf79 100644
--- a/sample/MauiMicroSample/Pages/MainPage.xaml.cs
+++ b/sample/MauiMicroSample/Pages/MainPage.xaml.cs
@@ -1,10 +1,9 @@
-namespace MauiMicroSample.Pages
+namespace MauiMicroSample.Pages;
+
+public partial class MainPage : ContentPage
 {
-    public partial class MainPage : ContentPage
+    public MainPage()
     {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/sample/MauiMicroSample/Resources/Images/dialog.svg b/sample/MauiMicroSample/Resources/Images/dialog.svg
new file mode 100644
index 0000000..e671a04
--- /dev/null
+++ b/sample/MauiMicroSample/Resources/Images/dialog.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 115.99 122.88"><title>dialog</title><path d="M17.4,0H76.75a17.45,17.45,0,0,1,17.4,17.4V55.68a17.45,17.45,0,0,1-17.4,17.4H47.16l-26,22.36a3.12,3.12,0,0,1-4.39-.35A3.06,3.06,0,0,1,16,92.86l1.36-19.78A17.45,17.45,0,0,1,0,55.68V17.4A17.45,17.45,0,0,1,17.4,0ZM66.62,31.14a6,6,0,1,1-6,6,6,6,0,0,1,6-6Zm-19.55,0a6,6,0,1,1-6,6,6,6,0,0,1,6-6Zm-19.54,0a6,6,0,1,1-6,6,6,6,0,0,1,6-6Zm74.81-3A16.87,16.87,0,0,1,116,44.67V83A16.87,16.87,0,0,1,99.18,99.77h-.61l1.41,20.4h0a2.57,2.57,0,0,1-.6,1.82,2.54,2.54,0,0,1-3.58.28L69.63,99.11H35.17l17-17.26h36a14.32,14.32,0,0,0,14.27-14.27V29.29c0-.38,0-.76,0-1.13ZM76.75,6.25H17.4A11.18,11.18,0,0,0,6.25,17.4V55.68A11.18,11.18,0,0,0,17.4,66.83h3.53a3.13,3.13,0,0,1,2.91,3.32L22.75,85.84l21.06-18.1a3.14,3.14,0,0,1,2.2-.91H76.75A11.2,11.2,0,0,0,87.9,55.68V17.4A11.2,11.2,0,0,0,76.75,6.25Z"/></svg>
\ No newline at end of file
diff --git a/sample/MauiMicroSample/ViewModels/DialogDemoViewModel.cs b/sample/MauiMicroSample/ViewModels/DialogDemoViewModel.cs
new file mode 100644
index 0000000..e6283a0
--- /dev/null
+++ b/sample/MauiMicroSample/ViewModels/DialogDemoViewModel.cs
@@ -0,0 +1,23 @@
+using System.Windows.Input;
+using MauiMicroMvvm;
+
+namespace MauiMicroSample.ViewModels;
+
+public class DialogDemoViewModel : MauiMicroViewModel
+{
+    public DialogDemoViewModel(ViewModelContext context) 
+        : base(context)
+    {
+        ShowActionSheetCommand = new Command(async () => {
+            await context.PageDialogs.DisplayActionSheet("Sample Action Sheet", "Cancel", "Destroy", "Button 1", "Button 2");
+        });
+
+        ShowAlertCommand = new Command(async () => {
+            await context.PageDialogs.DisplayAlert("Sample Alert", "This is a sample alert", "Accept", "Cancel");
+        });
+    }
+
+    public ICommand ShowAlertCommand { get; }
+
+    public ICommand ShowActionSheetCommand { get; }
+}
\ No newline at end of file

From fc15990a8314f823e51ce4e54164fcfdf52086c4 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 27 Jan 2024 10:32:50 -0600
Subject: [PATCH 05/15] ci: adding template validation

---
 .github/workflows/pr.yml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index b264f7b..08f9452 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -17,4 +17,29 @@ jobs:
     with:
       name: MauiMicroMvvm
       solution-path: build.slnf
-      install-workload: maui
\ No newline at end of file
+      install-workload: maui
+
+  validate:
+    needs: [build]
+    runs-on: macos-latest
+    steps:
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+      - name: Download Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: NuGet
+          path: Artifacts
+      - name: Install Templates
+        run: dotnet new install Artifacts/AvantiPoint.MauiMicroMvvm.Templates.*.nupkg
+      - name: Add Local Source
+        run: dotnet nuget add source ./Artifacts --name Artifacts
+      - name: Create Test Project
+        run: dotnet new maui-micro -o TestProject
+      - name: Restore Workloads
+        run: dotnet workload restore
+        working-directory: TestProject
+      - name: Build Project
+        run: dotnet build
+        working-directory: TestProject
\ No newline at end of file

From ae3f459c079c1cc7ebdb7a7abb187a2132d9247b Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 27 Jan 2024 10:45:10 -0600
Subject: [PATCH 06/15] fix: template should default to net8.0

---
 .../content/MauiMicroApp.1/.template.config/template.json       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.template.config/template.json b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.template.config/template.json
index 61fa362..8fcdc2a 100644
--- a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.template.config/template.json
+++ b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.template.config/template.json
@@ -30,7 +30,7 @@
       "datatype": "choice",
       "enableQuotelessLiterals": true,
       "replaces": "$dotnetversion$",
-      "defaultValue": "net7.0",
+      "defaultValue": "net8.0",
       "description": "Target Framework",
       "choices": [
         {

From ef6e28515fffd05d4caf5e3404191f8c2ab28320 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 27 Jan 2024 11:06:13 -0600
Subject: [PATCH 07/15] ci: specify full workspace path for local source

---
 .github/workflows/pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 08f9452..ac4fb70 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Install Templates
         run: dotnet new install Artifacts/AvantiPoint.MauiMicroMvvm.Templates.*.nupkg
       - name: Add Local Source
-        run: dotnet nuget add source ./Artifacts --name Artifacts
+        run: dotnet nuget add source ${{ github.workspace }}/Artifacts --name Artifacts
       - name: Create Test Project
         run: dotnet new maui-micro -o TestProject
       - name: Restore Workloads

From 953c416db6d42412575b00643b919a830065e0ee Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 9 Apr 2024 11:41:37 -0600
Subject: [PATCH 08/15] chore: use CPM

---
 Directory.Build.props                         | 13 ++-----------
 Directory.Packages.props                      | 14 ++++++++++++++
 sample/MauiMicroSample/MauiMicroSample.csproj | 10 ++++------
 src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj  |  5 ++---
 src/MauiMicroMvvm/MauiMicroMvvm.csproj        |  2 +-
 5 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 Directory.Packages.props

diff --git a/Directory.Build.props b/Directory.Build.props
index cdd896b..572dfe7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,6 +14,8 @@
     <RepositoryUrl>https://github.com/AvantiPoint/mauimicromvvm.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/AvantiPoint/mauimicromvvm</PackageProjectUrl>
     <NeutralLanguage>en</NeutralLanguage>
+    <Nullable>enable</Nullable>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -36,15 +38,4 @@
           PackagePath="" />
     <SourceRoot Include="$(MSBuildThisFileDirectory)" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..d882a2d
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,14 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" Condition="$(IsPackable) == 'true'"/>
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" Condition="$(IsPackable) != 'true'"/>
+    <PackageVersion Include="ReactiveUI" Version="19.5.39" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageVersion Include="Refit" Version="7.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/sample/MauiMicroSample/MauiMicroSample.csproj b/sample/MauiMicroSample/MauiMicroSample.csproj
index e8ef41f..242c253 100644
--- a/sample/MauiMicroSample/MauiMicroSample.csproj
+++ b/sample/MauiMicroSample/MauiMicroSample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(DotNetVersion)-android;$(DotNetVersion)-ios;$(DotNetVersion)-maccatalyst</TargetFrameworks>
@@ -16,7 +16,6 @@
 
     <!-- App Identifier -->
     <ApplicationId>com.avantipoint.mauimicro</ApplicationId>
-    <ApplicationIdGuid>CE320681-9974-4D30-B5AB-3FC8834733FD</ApplicationIdGuid>
 
     <!-- Versions -->
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -49,10 +48,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Refit" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Maui.Controls" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+    <PackageReference Include="Refit" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj b/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj
index 114d8f6..8a6c3ed 100644
--- a/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj
+++ b/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DotNetVersion)</TargetFramework>
@@ -12,8 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
-    <PackageReference Include="ReactiveUI" Version="19.5.39" />
+    <PackageReference Include="ReactiveUI" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/MauiMicroMvvm/MauiMicroMvvm.csproj b/src/MauiMicroMvvm/MauiMicroMvvm.csproj
index 76bc292..3cda0f4 100644
--- a/src/MauiMicroMvvm/MauiMicroMvvm.csproj
+++ b/src/MauiMicroMvvm/MauiMicroMvvm.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
+    <PackageReference Include="Microsoft.Maui.Controls" />
   </ItemGroup>
 
 </Project>

From 37841184defabc94e59ae95eb969d670b7902674 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 9 Apr 2024 11:41:50 -0600
Subject: [PATCH 09/15] chore: adding vscode support for the sample

---
 .../content/MauiMicroApp.1/.vscode/extensions.json |  5 +++++
 .../content/MauiMicroApp.1/.vscode/launch.json     | 14 ++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/extensions.json
 create mode 100644 src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/launch.json

diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/extensions.json b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/extensions.json
new file mode 100644
index 0000000..b3879c2
--- /dev/null
+++ b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "ms-dotnettools.dotnet-maui"
+  ]
+}
\ No newline at end of file
diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/launch.json b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/launch.json
new file mode 100644
index 0000000..c5c01d7
--- /dev/null
+++ b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": ".NET MAUI",
+      "type": "maui",
+      "request": "launch",
+      "preLaunchTask": "maui: Build"
+    }
+  ]
+}
\ No newline at end of file

From d2f3af4c2bb05a5c007ab50772af81294c58c9a5 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 9 Apr 2024 11:42:06 -0600
Subject: [PATCH 10/15] chore: add Dialog demo when pressing the button

---
 .../content/MauiMicroApp.1/ViewModels/MainViewModel.cs         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/ViewModels/MainViewModel.cs b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/ViewModels/MainViewModel.cs
index 5745d16..40d21c5 100644
--- a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/ViewModels/MainViewModel.cs
+++ b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/ViewModels/MainViewModel.cs
@@ -41,5 +41,8 @@ private void OnClickCommand()
             Message = $"Pressed {_count} times!";
 
         _screenReader.Announce(Message);
+
+        if (_count > 3)
+            PageDialogs.DisplayAlert("Stop it!", "You're pressing too much!", "OK");
     }
 }

From ee73accdd08ca3e57ad1b6907d821f26532e9d0c Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 9 Apr 2024 12:17:50 -0600
Subject: [PATCH 11/15] ci: use Workload install

---
 .github/workflows/pr.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index ac4fb70..851e20f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -37,8 +37,8 @@ jobs:
         run: dotnet nuget add source ${{ github.workspace }}/Artifacts --name Artifacts
       - name: Create Test Project
         run: dotnet new maui-micro -o TestProject
-      - name: Restore Workloads
-        run: dotnet workload restore
+      - name: Workload Install
+        run: dotnet workload install maui
         working-directory: TestProject
       - name: Build Project
         run: dotnet build

From d76884f961b916d12dded57bfae6cbcd06a958dd Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 9 Apr 2024 13:31:04 -0600
Subject: [PATCH 12/15] ci: set xcode version

---
 .github/workflows/pr.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 851e20f..9a19e10 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -23,6 +23,10 @@ jobs:
     needs: [build]
     runs-on: macos-latest
     steps:
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.2'
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 8.0.x

From 6781ef37de6c0c976eb48409c55c0dfc57063b11 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 9 Apr 2024 13:33:23 -0600
Subject: [PATCH 13/15] ci: bump to newer actions versions

---
 .github/workflows/pr.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9a19e10..ff2c3bb 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -27,11 +27,11 @@ jobs:
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: '15.2'
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: NuGet
           path: Artifacts

From a632bd70b92d591705bac2d0015ae0e5a3514402 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 9 Apr 2024 13:38:07 -0600
Subject: [PATCH 14/15] ci: use macos-14

---
 .github/workflows/pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index ff2c3bb..64f84c0 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -21,7 +21,7 @@ jobs:
 
   validate:
     needs: [build]
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1

From fbfa019bd00ca438f982d723c3edb2f86ea3a3a0 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 9 Apr 2024 14:04:41 -0600
Subject: [PATCH 15/15] ci: cannot download artifact from v3 upload

---
 .github/workflows/pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 64f84c0..f42905a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           dotnet-version: 8.0.x
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: NuGet
           path: Artifacts