Skip to content

Commit

Permalink
Fix issue when 10.0.19041 is selected at runtime (#3494)
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisPulman committed Mar 4, 2023
1 parent e666feb commit 2ebf67d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/Directory.build.props
Expand Up @@ -52,7 +52,7 @@
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
<PackageReference Include="coverlet.msbuild" Version="3.2.0" PrivateAssets="All" />
<PackageReference Include="Verify.Xunit" Version="19.9.3" />
<PackageReference Include="Verify.Xunit" Version="19.10.0" />
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true'">
Expand Down
4 changes: 1 addition & 3 deletions src/ReactiveUI.Maui/ReactiveUI.Maui.csproj
Expand Up @@ -16,9 +16,7 @@
</PropertyGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-windows10')) or $(TargetFramework.StartsWith('net7.0-windows10'))">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.WinUI/ReactiveUI.WinUI.csproj
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
</ItemGroup>

<!-- Workaround for https://github.com/microsoft/WindowsAppSDK/issues/1217
Expand Down
14 changes: 11 additions & 3 deletions src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj
@@ -1,10 +1,15 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>net462;net472;net48;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0</TargetFrameworks>
<!--
Added 19041 target as a workaround for System.Reactive targeting net5.0-windows10.0.19041.0
When 19041 is selected by the end user it causes the DispatcherScheduler in System.Reactive to be exposed and used.
-->
<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>
<PackageDescription>Contains the ReactiveUI platform specific extensions for Windows Presentation Foundation (WPF)</PackageDescription>
<PackageId>ReactiveUI.WPF</PackageId>
<UseWpf>true</UseWpf>
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;wpf;net;net472</PackageTags>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>

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

<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows')) or $(TargetFramework) == 'net462' ">
<Compile Include="..\ReactiveUI.Uwp\Rx\Concurrency\DispatcherScheduler.cs" LinkBase="Rx" />
<ItemGroup Condition=" $(TargetFramework) == 'net462' or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows')) ">
<Compile Include="..\ReactiveUI.Uwp\Rx\Internal\Constants.cs" LinkBase="Rx" />
<Compile Include="..\ReactiveUI.Uwp\Rx\Linq\**\*.cs" LinkBase="Rx" Exclude="..\ReactiveUI.Uwp\Rx\Linq\ControlObservable.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework) == 'net462' or $(TargetFramework) == 'net6.0-windows10.0.17763.0' or $(TargetFramework) == 'net7.0-windows10.0.17763.0' ">
<Compile Include="..\ReactiveUI.Uwp\Rx\Concurrency\DispatcherScheduler.cs" LinkBase="Rx" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0",
"version": "7.0",
"rollForward": "latestMinor",
"allowPrerelease": true
},
Expand Down

0 comments on commit 2ebf67d

Please sign in to comment.