From 45f128410dad6c38af1dcc410155bf43c173ce02 Mon Sep 17 00:00:00 2001
From: Glenn Watson <5834289+glennawatson@users.noreply.github.com>
Date: Mon, 13 May 2019 19:27:48 +1000
Subject: [PATCH 1/2] fix: WhenActivated on WPF by reverting to
 MsBuild.Sdk.Extras 1.6.18

---
 src/ReactiveUI.Events/ReactiveUI.Events.csproj | 6 ++++++
 src/global.json                                | 2 +-
 version.json                                   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ReactiveUI.Events/ReactiveUI.Events.csproj b/src/ReactiveUI.Events/ReactiveUI.Events.csproj
index 836ec679c0..31596662f7 100644
--- a/src/ReactiveUI.Events/ReactiveUI.Events.csproj
+++ b/src/ReactiveUI.Events/ReactiveUI.Events.csproj
@@ -17,6 +17,12 @@
   </ItemGroup>
 
   <ItemGroup Condition="  $(TargetFramework.StartsWith('uap')) ">
+    <SDKReference Include="WindowsDesktop, Version=10.0.17763.0">
+      <Name>Windows Desktop Extensions for the UWP</Name>
+    </SDKReference>
+    <SDKReference Include="WindowsMobile, Version=10.0.17763.0"> 
+      <Name>Windows Mobile Extensions for the UWP</Name> 
+    </SDKReference> 
     <Compile Include="Events_UWP.cs" Condition="Exists('Events_UWP.cs')" />
   </ItemGroup>
 
diff --git a/src/global.json b/src/global.json
index ddab91af6c..1e4edb34a6 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
 {
     "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "2.0.24"
+        "MSBuild.Sdk.Extras": "1.6.68"
     }
 }
diff --git a/version.json b/version.json
index e03f7d0f40..75a1e504c3 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "9.14",
+  "version": "9.15",
   "publicReleaseRefSpec": [
     "^refs/heads/master$", // we release out of master
     "^refs/heads/develop$", // we release out of develop

From 9c7b976e22fc0ecacf818bb192a7959860b303fc Mon Sep 17 00:00:00 2001
From: Glenn Watson <5834289+glennawatson@users.noreply.github.com>
Date: Mon, 13 May 2019 19:53:16 +1000
Subject: [PATCH 2/2] fixed the api approval

---
 .../wpf/API/ApiApprovalTests.Wpf.net461.approved.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt b/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt
index 1fd8a824c2..61423593e4 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt
+++ b/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt
@@ -121,4 +121,16 @@ namespace ReactiveUI.Wpf
         public Registrations() { }
         public void Register(System.Action<System.Func<object>, System.Type> registerFunction) { }
     }
+}
+namespace XamlGeneratedNamespace
+{
+    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper
+    {
+        public GeneratedInternalTypeHelper() { }
+        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { }
+        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { }
+        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { }
+        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { }
+        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { }
+    }
 }
\ No newline at end of file