From 8c3c25de425685dc1e9d49a651e8715bb82dedff Mon Sep 17 00:00:00 2001
From: Glenn <5834289+glennawatson@users.noreply.github.com>
Date: Sun, 31 Oct 2021 16:50:23 +1100
Subject: [PATCH 1/6] fix: uno winui csproj incorrectly configured

---
 .../ReactiveUI.Uno.WinUI.csproj               | 49 +++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
index 935cde7caf..4726c58f45 100644
--- a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
+++ b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
@@ -1,19 +1,50 @@
 <Project>
   
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);HAS_WINUI</DefineConstants>
+     <PropertyGroup>
+    <TargetFrameworks>netstandard20;MonoAndroid11.0;Xamarin.iOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-macos</TargetFrameworks>
+    <PackageId>ReactiveUI.Uno.WinUI</PackageId>
+    <PackageDescription>Contains the ReactiveUI platform specific extensions for Uno WinUI</PackageDescription>
+    <DefineConstants>$(DefineConstants);HAS_UNO;HAS_WINUI</DefineConstants>
+    <NoWarn>$(NoWarn);SA1648;CA1816;CA1001;CS0108;CS0114;CS3021;CS1574;CA1303</NoWarn>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+    <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;net;unoplatform</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\ReactiveUI.Uno\ReactiveUI.Uno.csproj" />
-
-  <PropertyGroup>
-     <!-- Remove uap target --> 
-    <TargetFrameworks>netstandard20;MonoAndroid11.0;Xamarin.iOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-macos</TargetFrameworks>
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
+    <DefineConstants>$(DefineConstants);WASM</DefineConstants>
   </PropertyGroup>
-  
+
+  <ItemGroup>
+    <EmbeddedResource Remove="Resources\**" />
+    <None Remove="Resources\**" />
+    <Compile Remove="Resources\**" />
+  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Remove="Uno.UI" />
     <PackageReference Include="Uno.WinUI" Version="3.9.7" />
   </ItemGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
+    <PackageReference Include="Reactive.Wasm" Version="1.*" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
+    <!-- UAP is just here for convenience with namespaces, don't need to duplicate up the scheduler/registrations -->
+    <Compile Remove=".\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\ReactiveUI.Uwp\TransitioningContentControl.Empty.cs" LinkBase="ReactiveUI.Uwp" />
+    <Compile Include="..\ReactiveUI.Uwp\DependencyObjectObservableForProperty.cs" LinkBase="ReactiveUI.Uwp" />
+    <Compile Include="..\ReactiveUI.Uwp\common\**\*.cs" LinkBase="common" />
+    <Compile Include="..\ReactiveUI.Uno\**\*.cs" LinkBase="common" />
+
+  	<None Include="..\ReactiveUI.Uwp\ReactiveUI.rd.xml" PackagePath="lib\uap\ReactiveUI\Properties\ReactiveUI.rd.xml" Pack="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
+  </ItemGroup>
   
 </Project>

From 593a83d467c5641cbcc14b5bb618c5df4a18586e Mon Sep 17 00:00:00 2001
From: Glenn <5834289+glennawatson@users.noreply.github.com>
Date: Sun, 31 Oct 2021 16:51:44 +1100
Subject: [PATCH 2/6] Update ReactiveUI.Uno.WinUI.csproj

---
 src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
index 4726c58f45..ffe4c5989e 100644
--- a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
+++ b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
@@ -38,7 +38,7 @@
     <Compile Include="..\ReactiveUI.Uwp\TransitioningContentControl.Empty.cs" LinkBase="ReactiveUI.Uwp" />
     <Compile Include="..\ReactiveUI.Uwp\DependencyObjectObservableForProperty.cs" LinkBase="ReactiveUI.Uwp" />
     <Compile Include="..\ReactiveUI.Uwp\common\**\*.cs" LinkBase="common" />
-    <Compile Include="..\ReactiveUI.Uno\**\*.cs" LinkBase="common" />
+    <Compile Include="..\ReactiveUI.Uno\*.cs" LinkBase="common" />
 
   	<None Include="..\ReactiveUI.Uwp\ReactiveUI.rd.xml" PackagePath="lib\uap\ReactiveUI\Properties\ReactiveUI.rd.xml" Pack="true" />
   </ItemGroup>

From 6964edead1e13431189e3c2430e9d55eeeea626d Mon Sep 17 00:00:00 2001
From: Glenn <5834289+glennawatson@users.noreply.github.com>
Date: Sun, 31 Oct 2021 16:54:34 +1100
Subject: [PATCH 3/6] Fix

---
 src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
index ffe4c5989e..b2dad8fff4 100644
--- a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
+++ b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
@@ -1,6 +1,6 @@
 <Project>
   
-     <PropertyGroup>
+  <PropertyGroup>
     <TargetFrameworks>netstandard20;MonoAndroid11.0;Xamarin.iOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-macos</TargetFrameworks>
     <PackageId>ReactiveUI.Uno.WinUI</PackageId>
     <PackageDescription>Contains the ReactiveUI platform specific extensions for Uno WinUI</PackageDescription>
@@ -29,11 +29,6 @@
     <PackageReference Include="Reactive.Wasm" Version="1.*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
-    <!-- UAP is just here for convenience with namespaces, don't need to duplicate up the scheduler/registrations -->
-    <Compile Remove=".\**\*.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="..\ReactiveUI.Uwp\TransitioningContentControl.Empty.cs" LinkBase="ReactiveUI.Uwp" />
     <Compile Include="..\ReactiveUI.Uwp\DependencyObjectObservableForProperty.cs" LinkBase="ReactiveUI.Uwp" />

From 5540ad5904cf114b823da9b7444c24be207c0207 Mon Sep 17 00:00:00 2001
From: Glenn <5834289+glennawatson@users.noreply.github.com>
Date: Sun, 31 Oct 2021 16:55:07 +1100
Subject: [PATCH 4/6] Update ReactiveUI.Uno.WinUI.csproj

---
 src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
index b2dad8fff4..cd614941a0 100644
--- a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
+++ b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
@@ -8,7 +8,7 @@
     <NoWarn>$(NoWarn);SA1648;CA1816;CA1001;CS0108;CS0114;CS3021;CS1574;CA1303</NoWarn>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
-    <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;net;unoplatform</PackageTags>
+    <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;net;unoplatform;winui</PackageTags>
   </PropertyGroup>
 
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">

From 32a62ef91469dc2bc86fa6a570a03069e73b1e5e Mon Sep 17 00:00:00 2001
From: Glenn Watson <5834289+glennawatson@users.noreply.github.com>
Date: Sun, 31 Oct 2021 17:49:21 +1100
Subject: [PATCH 5/6] Add back msbuild sdk extras

---
 src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
index cd614941a0..69a49938b8 100644
--- a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
+++ b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
@@ -1,5 +1,4 @@
-<Project>
-  
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <TargetFrameworks>netstandard20;MonoAndroid11.0;Xamarin.iOS10;Xamarin.Mac20;net6.0-android;net6.0-ios;net6.0-macos</TargetFrameworks>
     <PackageId>ReactiveUI.Uno.WinUI</PackageId>
@@ -33,9 +32,9 @@
     <Compile Include="..\ReactiveUI.Uwp\TransitioningContentControl.Empty.cs" LinkBase="ReactiveUI.Uwp" />
     <Compile Include="..\ReactiveUI.Uwp\DependencyObjectObservableForProperty.cs" LinkBase="ReactiveUI.Uwp" />
     <Compile Include="..\ReactiveUI.Uwp\common\**\*.cs" LinkBase="common" />
-    <Compile Include="..\ReactiveUI.Uno\*.cs" LinkBase="common" />
+    <Compile Include="..\ReactiveUI.Uno\*.cs" LinkBase="ReactiveUI.Uno" />
 
-  	<None Include="..\ReactiveUI.Uwp\ReactiveUI.rd.xml" PackagePath="lib\uap\ReactiveUI\Properties\ReactiveUI.rd.xml" Pack="true" />
+    <None Include="..\ReactiveUI.Uwp\ReactiveUI.rd.xml" PackagePath="lib\uap\ReactiveUI\Properties\ReactiveUI.rd.xml" Pack="true" />
   </ItemGroup>
 
   <ItemGroup>

From 44cde1a7eea51e29ab972fbb1685252f3e4b3916 Mon Sep 17 00:00:00 2001
From: Glenn Watson <5834289+glennawatson@users.noreply.github.com>
Date: Sun, 31 Oct 2021 18:15:27 +1100
Subject: [PATCH 6/6] Further fixes

---
 src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj | 4 ++--
 src/ReactiveUI.Uno/ActivationForViewFetcher.cs       | 5 +++++
 src/ReactiveUI.Uno/CoreDispatcherScheduler.cs        | 5 +++++
 src/ReactiveUI.Uno/ReactiveUI.Uno.csproj             | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
index 69a49938b8..f3a21430f1 100644
--- a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
+++ b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="3.9.7" />
+    <PackageReference Include="Uno.WinUI" Version="3.10.11" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
@@ -40,5 +40,5 @@
   <ItemGroup>
     <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/ReactiveUI.Uno/ActivationForViewFetcher.cs b/src/ReactiveUI.Uno/ActivationForViewFetcher.cs
index 465aa81908..06c695d2fb 100644
--- a/src/ReactiveUI.Uno/ActivationForViewFetcher.cs
+++ b/src/ReactiveUI.Uno/ActivationForViewFetcher.cs
@@ -9,8 +9,13 @@
 using System.Reactive.Linq;
 using System.Reflection;
 
+#if HAS_UNO_WINUI
+using Microsoft.UI.Xaml;
+using Windows.Foundation;
+#else
 using Windows.Foundation;
 using Windows.UI.Xaml;
+#endif
 
 namespace ReactiveUI.Uno
 {
diff --git a/src/ReactiveUI.Uno/CoreDispatcherScheduler.cs b/src/ReactiveUI.Uno/CoreDispatcherScheduler.cs
index 9b20602fba..7ffbfa479f 100644
--- a/src/ReactiveUI.Uno/CoreDispatcherScheduler.cs
+++ b/src/ReactiveUI.Uno/CoreDispatcherScheduler.cs
@@ -9,8 +9,13 @@
 using System.Runtime.ExceptionServices;
 using System.Threading;
 
+#if HAS_UNO_WINUI
+using Microsoft.UI.Xaml;
+using Windows.UI.Core;
+#else
 using Windows.UI.Core;
 using Windows.UI.Xaml;
+#endif
 
 namespace System.Reactive.Concurrency
 {
diff --git a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
index e0f0f87204..4e932a5816 100644
--- a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
+++ b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
-    <PackageReference Include="Uno.UI" Version="3.9.7" />
+    <PackageReference Include="Uno.UI" Version="3.10.11" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">