Skip to content
Permalink
Browse files

feature: allow uno namespace for uap17.0.17763 (#2099)

  • Loading branch information...
glennawatson committed Jun 29, 2019
1 parent 6846fb1 commit 2089f59e3c779175113401ecf3852b80d3ec95be
Showing with 11 additions and 6 deletions.
  1. +11 −6 src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
@@ -1,6 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard20;MonoAndroid81;MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.17763</TargetFrameworks>
<PackageId>ReactiveUI.Uno</PackageId>
<Description>Uno Platform specific extensions for ReactiveUI</Description>
<DefineConstants>HAS_UNO</DefineConstants>
@@ -12,10 +13,19 @@
<DefineConstants>HAS_UNO;WASM</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
<PackageReference Include="Uno.UI" Version="1.*" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<PackageReference Include="Reactive.Wasm" Version="1.0.1-preview.8" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
<!-- UAP is just here for convenience with namespaces, don't need to duplicate up the scheduler/registrations -->
<Compile Remove=".\**\*.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\ReactiveUI\Platforms\uap\TransitioningContentControl.Empty.cs" LinkBase="ReactiveUI\Platforms\uap" />
<Compile Include="..\ReactiveUI\Platforms\uap\DependencyObjectObservableForProperty.cs" LinkBase="ReactiveUI\Platforms\uap" />
@@ -24,11 +34,6 @@
<None Include="..\ReactiveUI\Platforms\uap\ReactiveUI.rd.xml" PackagePath="lib\uap\ReactiveUI\Properties\ReactiveUI.rd.xml" Pack="true" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<PackageReference Include="Reactive.Wasm" Version="1.0.1-preview.8" />
<Compile Include=".\Platforms\netstandard\**\*.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>

0 comments on commit 2089f59

Please sign in to comment.
You can’t perform that action at this time.