Skip to content

Commit 3cf59ab

Browse files
authored
fix: WhenActivated on WPF by reverting to MsBuild.Sdk.Extras 1.6.18 (#2027)
1 parent dfe8498 commit 3cf59ab

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

src/ReactiveUI.Events/ReactiveUI.Events.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
</ItemGroup>
1818

1919
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
20+
<SDKReference Include="WindowsDesktop, Version=10.0.17763.0">
21+
<Name>Windows Desktop Extensions for the UWP</Name>
22+
</SDKReference>
23+
<SDKReference Include="WindowsMobile, Version=10.0.17763.0">
24+
<Name>Windows Mobile Extensions for the UWP</Name>
25+
</SDKReference>
2026
<Compile Include="Events_UWP.cs" Condition="Exists('Events_UWP.cs')" />
2127
</ItemGroup>
2228

src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,16 @@ namespace ReactiveUI.Wpf
121121
public Registrations() { }
122122
public void Register(System.Action<System.Func<object>, System.Type> registerFunction) { }
123123
}
124+
}
125+
namespace XamlGeneratedNamespace
126+
{
127+
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper
128+
{
129+
public GeneratedInternalTypeHelper() { }
130+
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { }
131+
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { }
132+
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { }
133+
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { }
134+
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { }
135+
}
124136
}

src/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"msbuild-sdks": {
3-
"MSBuild.Sdk.Extras": "2.0.24"
3+
"MSBuild.Sdk.Extras": "1.6.68"
44
}
55
}

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "9.14",
2+
"version": "9.15",
33
"publicReleaseRefSpec": [
44
"^refs/heads/master$", // we release out of master
55
"^refs/heads/develop$", // we release out of develop

0 commit comments

Comments
 (0)