Skip to content

Commit 0029e35

Browse files
joshkempnerjoshkempner
authored
Add netstandard2.0 support to ReactiveDomain.UI and ReactiveDomain.UI.Testing projects (#115)
* Add netstandard2.0 support to ReactiveDomain.UI and ReactiveDomain.UI.Testing projects * Updated nuspec files to cover new target platform * Exclude xunit.runner.visualstudio if not net48
1 parent 3a063b7 commit 0029e35

File tree

7 files changed

+57
-25
lines changed

7 files changed

+57
-25
lines changed

‎src/ReactiveDomain.UI.Debug.nuspec‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,31 @@
99
<license type="expression">MIT</license>
1010
<description>Package includes all ReactiveDomain UI assembly</description>
1111
<copyright>Copyright © 2014-2022 PerkinElmer, Linedata Inc.</copyright>
12-
13-
<dependencies>
12+
<dependencies>
1413
<group targetFramework="net48">
1514
<dependency id="ReactiveDomain" version="0.9.0.0" exclude="Build,Analyzers" />
16-
<dependency id="ReactiveUI" version="8.7.2" exclude="Build,Analyzers" />
15+
<dependency id="ReactiveUI" version="9.22.1" exclude="Build,Analyzers" />
16+
</group>
17+
<group targetFramework="netstandard2.0">
18+
<dependency id="ReactiveDomain" version="0.9.0.0" exclude="Build,Analyzers" />
19+
<dependency id="ReactiveUI" version="9.22.1" exclude="Build,Analyzers" />
1720
</group>
1821
</dependencies>
19-
<references>
22+
<references>
2023
<group targetFramework="net48">
2124
<reference file="ReactiveDomain.UI.dll" />
2225
</group>
26+
<group targetFramework="netstandard2.0">
27+
<reference file="ReactiveDomain.UI.dll" />
28+
</group>
2329
</references>
2430
</metadata>
2531
<files>
2632
<file src="..\bld\Debug\net48\ReactiveDomain.UI.dll" target="lib\net48" />
27-
<file src="..\bld\Debug\net48\ReactiveDomain.UI.dll" target="ref\net48" />
2833
<file src="..\bld\Debug\net48\ReactiveDomain.UI.pdb" target="lib\net48" />
34+
<file src="..\bld\Debug\net48\ReactiveDomain.UI.dll" target="ref\net48" />
35+
<file src="..\bld\Debug\netstandard2.0\ReactiveDomain.UI.dll" target="lib\netstandard2.0" />
36+
<file src="..\bld\Debug\netstandard2.0\ReactiveDomain.UI.pdb" target="lib\netstandard2.0" />
37+
<file src="..\bld\Debug\netstandard2.0\ReactiveDomain.UI.dll" target="ref\netstandard2.0" />
2938
</files>
3039
</package>

‎src/ReactiveDomain.UI.Testing.Debug.nuspec‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
99
<license type="expression">MIT</license>
1010
<description>Package includes all ReactiveDomain UI assemblies for unit testing</description>
11-
<copyright>Copyright © 2014-2022 PerkinElmer, Linedata Inc.</copyright>
12-
11+
<copyright>Copyright © 2014-2022 PerkinElmer Inc., Linedata Inc.</copyright>
1312
<dependencies>
1413
<group targetFramework="net48">
15-
<dependency id="Microsoft.NET.Test.Sdk" version="16.2.0" exclude="Build,Analyzers" />
14+
<dependency id="ReactiveDomain.Testing" version="0.9.0.0" exclude="Build,Analyzers" />
15+
<dependency id="ReactiveDomain.UI" version="0.9.0.0" exclude="Build,Analyzers" />
16+
</group>
17+
<group targetFramework="netstandard2.0">
1618
<dependency id="ReactiveDomain.Testing" version="0.9.0.0" exclude="Build,Analyzers" />
1719
<dependency id="ReactiveDomain.UI" version="0.9.0.0" exclude="Build,Analyzers" />
1820
</group>
@@ -21,11 +23,17 @@
2123
<group targetFramework="net48">
2224
<reference file="ReactiveDomain.UI.Testing.dll" />
2325
</group>
26+
<group targetFramework="netstandard2.0">
27+
<reference file="ReactiveDomain.UI.Testing.dll" />
28+
</group>
2429
</references>
2530
</metadata>
2631
<files>
2732
<file src="..\bld\Debug\net48\ReactiveDomain.UI.Testing.dll" target="lib\net48" />
28-
<file src="..\bld\Debug\net48\ReactiveDomain.UI.Testing.dll" target="ref\net48" />
2933
<file src="..\bld\Debug\net48\ReactiveDomain.UI.Testing.pdb" target="lib\net48" />
34+
<file src="..\bld\Debug\net48\ReactiveDomain.UI.Testing.dll" target="ref\net48" />
35+
<file src="..\bld\Debug\netstandard2.0\ReactiveDomain.UI.Testing.dll" target="lib\netstandard2.0" />
36+
<file src="..\bld\Debug\netstandard2.0\ReactiveDomain.UI.Testing.pdb" target="lib\netstandard2.0" />
37+
<file src="..\bld\Debug\netstandard2.0\ReactiveDomain.UI.Testing.dll" target="ref\netstandard2.0" />
3038
</files>
3139
</package>

‎src/ReactiveDomain.UI.Testing.nuspec‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
<description>Package includes all ReactiveDomain UI assemblies for unit testing</description>
1111
<copyright>Copyright © 2014-2022 PerkinElmer Inc., Linedata Inc.</copyright>
1212
<dependencies>
13-
<group targetFramework=".NETFramework48">
14-
<dependency id="Microsoft.NET.Test.Sdk" version="16.2.0" exclude="Build,Analyzers" />
13+
<group targetFramework="net48">
14+
<dependency id="ReactiveDomain.Testing" version="0.9.0.0" exclude="Build,Analyzers" />
15+
<dependency id="ReactiveDomain.UI" version="0.9.0.0" exclude="Build,Analyzers" />
16+
</group>
17+
<group targetFramework="netstandard2.0">
1518
<dependency id="ReactiveDomain.Testing" version="0.9.0.0" exclude="Build,Analyzers" />
1619
<dependency id="ReactiveDomain.UI" version="0.9.0.0" exclude="Build,Analyzers" />
1720
</group>
@@ -20,14 +23,17 @@
2023
<group targetFramework=".NETFramework48">
2124
<reference file="ReactiveDomain.UI.Testing.dll" />
2225
</group>
26+
<group targetFramework="netstandard2.0">
27+
<reference file="ReactiveDomain.UI.Testing.dll" />
28+
</group>
2329
</references>
24-
<frameworkAssemblies>
25-
<frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.0" />
26-
</frameworkAssemblies>
2730
</metadata>
2831
<files>
2932
<file src="..\bld\Release\net48\ReactiveDomain.UI.Testing.dll" target="lib\net48" />
3033
<file src="..\bld\Release\net48\ReactiveDomain.UI.Testing.pdb" target="lib\net48" />
3134
<file src="..\bld\Release\net48\ReactiveDomain.UI.Testing.dll" target="ref\net48" />
35+
<file src="..\bld\Release\netstandard2.0\ReactiveDomain.UI.Testing.dll" target="lib\netstandard2.0" />
36+
<file src="..\bld\Release\netstandard2.0\ReactiveDomain.UI.Testing.pdb" target="lib\netstandard2.0" />
37+
<file src="..\bld\Release\netstandard2.0\ReactiveDomain.UI.Testing.dll" target="ref\netstandard2.0" />
3238
</files>
3339
</package>

‎src/ReactiveDomain.UI.Testing/ReactiveDomain.UI.Testing.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../ci.build.imports" />
33
<PropertyGroup>
4-
<TargetFrameworks>net48</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
55
<IsPackable>true</IsPackable>
66
</PropertyGroup>
77
<ItemGroup>
@@ -11,7 +11,7 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" Condition="'$(TargetFramework)'=='net48'">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

‎src/ReactiveDomain.UI.nuspec‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,30 @@
1010
<description>Package includes ReactiveDomain UI assembly</description>
1111
<copyright>Copyright © 2014-2022 PerkinElmer Inc., Linedata Inc.</copyright>
1212
<dependencies>
13-
<group targetFramework=".NETFramework48">
13+
<group targetFramework="net48">
1414
<dependency id="ReactiveDomain" version="0.9.0.0" exclude="Build,Analyzers" />
15-
<dependency id="reactiveui" version="9.22.1" exclude="Build,Analyzers" />
15+
<dependency id="ReactiveUI" version="9.22.1" exclude="Build,Analyzers" />
16+
</group>
17+
<group targetFramework="netstandard2.0">
18+
<dependency id="ReactiveDomain" version="0.9.0.0" exclude="Build,Analyzers" />
19+
<dependency id="ReactiveUI" version="9.22.1" exclude="Build,Analyzers" />
1620
</group>
1721
</dependencies>
1822
<references>
19-
<group targetFramework=".NETFramework48">
23+
<group targetFramework="net48">
24+
<reference file="ReactiveDomain.UI.dll" />
25+
</group>
26+
<group targetFramework="netstandard2.0">
2027
<reference file="ReactiveDomain.UI.dll" />
2128
</group>
2229
</references>
23-
<frameworkAssemblies>
24-
<frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.0" />
25-
</frameworkAssemblies>
2630
</metadata>
2731
<files>
2832
<file src="..\bld\Release\net48\ReactiveDomain.UI.dll" target="lib\net48" />
29-
<file src="..\bld\Release\net48\ReactiveDomain.UI.pdb" target="lib\net48" />
33+
<file src="..\bld\Debug\net48\ReactiveDomain.UI.pdb" target="lib\net48" />
3034
<file src="..\bld\Release\net48\ReactiveDomain.UI.dll" target="ref\net48" />
35+
<file src="..\bld\Release\netstandard2.0\ReactiveDomain.UI.dll" target="lib\netstandard2.0" />
36+
<file src="..\bld\Debug\netstandard2.0\ReactiveDomain.UI.pdb" target="lib\netstandard2.0" />
37+
<file src="..\bld\Release\netstandard2.0\ReactiveDomain.UI.dll" target="ref\netstandard2.0" />
3138
</files>
3239
</package>

‎src/ReactiveDomain.UI/ReactiveDomain.UI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../ci.build.imports" />
33
<PropertyGroup>
4-
<TargetFrameworks>net48</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
55
<IsPackable>true</IsPackable>
66
</PropertyGroup>
77

‎src/ReactiveDomain.UI/ViewObjects/Threading.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
#if NET48
2+
using System;
23
using System.Reactive.Concurrency;
34
using System.Threading.Tasks;
45

@@ -76,3 +77,4 @@ public static void RunOnUiThread(Action<object> action, object param = null, boo
7677
}
7778
}
7879
}
80+
#endif

0 commit comments

Comments
 (0)