Skip to content

Commit 2089f59

Browse files
authored
feature: allow uno namespace for uap17.0.17763 (#2099)
1 parent 6846fb1 commit 2089f59

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/ReactiveUI.Uno/ReactiveUI.Uno.csproj

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard20;MonoAndroid81;MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.17763</TargetFrameworks>
45
<PackageId>ReactiveUI.Uno</PackageId>
56
<Description>Uno Platform specific extensions for ReactiveUI</Description>
67
<DefineConstants>HAS_UNO</DefineConstants>
@@ -12,10 +13,19 @@
1213
<DefineConstants>HAS_UNO;WASM</DefineConstants>
1314
</PropertyGroup>
1415

15-
<ItemGroup>
16+
<ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
1617
<PackageReference Include="Uno.UI" Version="1.*" />
1718
</ItemGroup>
1819

20+
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
21+
<PackageReference Include="Reactive.Wasm" Version="1.0.1-preview.8" />
22+
</ItemGroup>
23+
24+
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
25+
<!-- UAP is just here for convenience with namespaces, don't need to duplicate up the scheduler/registrations -->
26+
<Compile Remove=".\**\*.cs" />
27+
</ItemGroup>
28+
1929
<ItemGroup>
2030
<Compile Include="..\ReactiveUI\Platforms\uap\TransitioningContentControl.Empty.cs" LinkBase="ReactiveUI\Platforms\uap" />
2131
<Compile Include="..\ReactiveUI\Platforms\uap\DependencyObjectObservableForProperty.cs" LinkBase="ReactiveUI\Platforms\uap" />
@@ -24,11 +34,6 @@
2434
<None Include="..\ReactiveUI\Platforms\uap\ReactiveUI.rd.xml" PackagePath="lib\uap\ReactiveUI\Properties\ReactiveUI.rd.xml" Pack="true" />
2535
</ItemGroup>
2636

27-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
28-
<PackageReference Include="Reactive.Wasm" Version="1.0.1-preview.8" />
29-
<Compile Include=".\Platforms\netstandard\**\*.cs" />
30-
</ItemGroup>
31-
3237
<ItemGroup>
3338
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
3439
</ItemGroup>

0 commit comments

Comments
 (0)