Skip to content

Commit 2ebf67d

Browse files
authored
Fix issue when 10.0.19041 is selected at runtime (#3494)
1 parent e666feb commit 2ebf67d

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

src/Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
5353
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
5454
<PackageReference Include="coverlet.msbuild" Version="3.2.0" PrivateAssets="All" />
55-
<PackageReference Include="Verify.Xunit" Version="19.9.3" />
55+
<PackageReference Include="Verify.Xunit" Version="19.10.0" />
5656
</ItemGroup>
5757

5858
<ItemGroup Condition="'$(IsTestProject)' != 'true'">

src/ReactiveUI.Maui/ReactiveUI.Maui.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-windows10')) or $(TargetFramework.StartsWith('net7.0-windows10'))">
19-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
20-
</ItemGroup>
21-
<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">
19+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
2220
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
2321
</ItemGroup>
2422
<ItemGroup>

src/ReactiveUI.WinUI/ReactiveUI.WinUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
13+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
1414
</ItemGroup>
1515

1616
<!-- Workaround for https://github.com/microsoft/WindowsAppSDK/issues/1217

src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>net462;net472;net48;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0</TargetFrameworks>
3+
<!--
4+
Added 19041 target as a workaround for System.Reactive targeting net5.0-windows10.0.19041.0
5+
When 19041 is selected by the end user it causes the DispatcherScheduler in System.Reactive to be exposed and used.
6+
-->
7+
<TargetFrameworks>net462;net472;net48;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
48
<PackageDescription>Contains the ReactiveUI platform specific extensions for Windows Presentation Foundation (WPF)</PackageDescription>
59
<PackageId>ReactiveUI.WPF</PackageId>
610
<UseWpf>true</UseWpf>
711
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;wpf;net;net472</PackageTags>
12+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
813
</PropertyGroup>
914

1015
<ItemGroup>
@@ -16,9 +21,12 @@
1621
<None Include="..\ReactiveUI.Uwp\Rx\**\*.cs" LinkBase="Rx" />
1722
</ItemGroup>
1823

19-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows')) or $(TargetFramework) == 'net462' ">
20-
<Compile Include="..\ReactiveUI.Uwp\Rx\Concurrency\DispatcherScheduler.cs" LinkBase="Rx" />
24+
<ItemGroup Condition=" $(TargetFramework) == 'net462' or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows')) ">
2125
<Compile Include="..\ReactiveUI.Uwp\Rx\Internal\Constants.cs" LinkBase="Rx" />
2226
<Compile Include="..\ReactiveUI.Uwp\Rx\Linq\**\*.cs" LinkBase="Rx" Exclude="..\ReactiveUI.Uwp\Rx\Linq\ControlObservable.cs" />
2327
</ItemGroup>
28+
29+
<ItemGroup Condition=" $(TargetFramework) == 'net462' or $(TargetFramework) == 'net6.0-windows10.0.17763.0' or $(TargetFramework) == 'net7.0-windows10.0.17763.0' ">
30+
<Compile Include="..\ReactiveUI.Uwp\Rx\Concurrency\DispatcherScheduler.cs" LinkBase="Rx" />
31+
</ItemGroup>
2432
</Project>

src/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0",
3+
"version": "7.0",
44
"rollForward": "latestMinor",
55
"allowPrerelease": true
66
},

0 commit comments

Comments
 (0)