Skip to content

Commit 8a2df0b

Browse files
clairernovotnyclairernovotny
authored
Merge pull request #1291 from dotnet/dotnet5
.NET 5 support for Rx.NET
2 parents 7fe854f + 4847742 commit 8a2df0b

File tree

35 files changed

+207
-167
lines changed

35 files changed

+207
-167
lines changed

‎Rx.NET/Integration/LinuxTests/LinuxTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp3.0;netcoreapp2.1</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net5.0</TargetFrameworks>
44
<NoWarn>$(NoWarn);CS0618</NoWarn>
55
<LangVersion>latest</LangVersion>
66
<AssemblyName>Tests.System.Reactive</AssemblyName>
@@ -10,10 +10,10 @@
1010
</PropertyGroup>
1111

1212
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'">
13-
<DefineConstants>$(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING</DefineConstants>
13+
<DefineConstants>$(DefineConstants);</DefineConstants>
1414
</PropertyGroup>
15-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
16-
<DefineConstants>$(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;LINUX</DefineConstants>
15+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' ">
16+
<DefineConstants>$(DefineConstants);LINUX</DefineConstants>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20181205-02" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
2828
<PackageReference Include="xunit" Version="2.4.1" />
2929
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
3030
<PackageReference Include="System.Reactive" Version="4.2.0-preview.63" />

‎Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.0</TargetFramework>
3+
<TargetFrameworks>netcoreapp3.1;net5.0;net5.0-windows10.0.19041</TargetFrameworks>
44
<NoWarn>$(NoWarn);CS0618</NoWarn>
55
<LangVersion>latest</LangVersion>
66
<AssemblyName>Tests.System.Reactive</AssemblyName>
@@ -12,8 +12,11 @@
1212
</PropertyGroup>
1313

1414

15-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
16-
<DefineConstants>$(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;HAS_WINFORMS;HAS_DISPATCHER;DESKTOPCLR</DefineConstants>
15+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
16+
<DefineConstants>$(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR</DefineConstants>
17+
</PropertyGroup>
18+
<PropertyGroup Condition="$(TargetFramework.StartsWith('net5.0-windows'))">
19+
<DefineConstants>$(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR;WINDOWS;CSWINRT</DefineConstants>
1720
</PropertyGroup>
1821

1922
<ItemGroup>
@@ -24,7 +27,7 @@
2427
</ItemGroup>
2528

2629
<ItemGroup>
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20190203-03" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
2831
<PackageReference Include="xunit" Version="2.4.1" />
2932
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
3033
<PackageReference Include="System.Reactive" Version="4.2.0-preview.63" />

‎Rx.NET/Integration/global.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"sdk": {
3-
"version": "3.0.100-preview"
4-
},
52
"msbuild-sdks": {
6-
"MSBuild.Sdk.Extras": "2.0.31"
3+
"MSBuild.Sdk.Extras": "2.1.2"
74
}
85
}

‎Rx.NET/Source/Directory.build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
2626
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
27-
<Deterministic>true</Deterministic>
2827
</PropertyGroup>
2928

3029
<ItemGroup>

‎Rx.NET/Source/Directory.build.targets‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,34 @@
11
<Project>
22

3-
<!-- Workaround. Remove once we're on 3.1.300+
4-
https://github.com/dotnet/sourcelink/issues/572 -->
5-
<PropertyGroup>
6-
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
10-
</ItemGroup>
11-
12-
133
<!-- This props all need to be set in targets as they depend on the values set earlier -->
144

155
<PropertyGroup>
166
<Product>$(AssemblyName) ($(TargetFramework))</Product>
177
</PropertyGroup>
18-
19-
<PropertyGroup>
20-
<DefineConstants>$(DefineConstants);HAS_WINRT</DefineConstants>
21-
</PropertyGroup>
228

239
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
24-
<DefineConstants>$(DefineConstants);HAS_WINFORMS;HAS_DISPATCHER;HAS_REMOTING;DESKTOPCLR</DefineConstants>
10+
<DefineConstants>$(DefineConstants);HAS_WINFORMS;HAS_WPF;HAS_WINRT;HAS_DISPATCHER;HAS_REMOTING;DESKTOPCLR</DefineConstants>
2511
</PropertyGroup>
2612
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
27-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
13+
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
2814
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
29-
<DefineConstants>$(DefineConstants);NO_CODE_COVERAGE_ATTRIBUTE;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;NO_TRACE;WINDOWS</DefineConstants>
15+
<DefineConstants>$(DefineConstants);HAS_WINRT;NO_CODE_COVERAGE_ATTRIBUTE;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;NO_TRACE;WINDOWS</DefineConstants>
3016
</PropertyGroup>
3117
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
32-
<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
33-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
18+
<DefineConstants>$(DefineConstants);HAS_WINRT;WINDOWS;HAS_OS_XAML;LEGACY_WINRT</DefineConstants>
19+
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
3420
</PropertyGroup>
3521
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'">
36-
<DefineConstants>$(DefineConstants)</DefineConstants>
22+
<DefineConstants>$(DefineConstants);HAS_WINRT</DefineConstants>
3723
</PropertyGroup>
38-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
39-
<DefineConstants>$(DefineConstants);HAS_WINFORMS;HAS_DISPATCHER;DESKTOPCLR</DefineConstants>
24+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
25+
<DefineConstants>$(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR</DefineConstants>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="$(TargetFramework.StartsWith('net5.0-windows'))">
28+
<DefineConstants>$(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR;WINDOWS;CSWINRT</DefineConstants>
4029
</PropertyGroup>
4130

42-
43-
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
31+
<ItemGroup Condition="'$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'">
4432
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
4533
</ItemGroup>
4634

@@ -52,5 +40,16 @@
5240
</AssemblyAttribute>
5341
</ItemGroup>
5442
</Target>
55-
56-
</Project>
43+
44+
45+
<!-- Remove once coverlet supports this built-in -->
46+
<Target Name="CoverletGetPathMap"
47+
DependsOnTargets="InitializeSourceRootMappedPaths"
48+
Returns="@(_LocalTopLevelSourceRoot)"
49+
Condition="'$(DeterministicSourcePaths)' == 'true'">
50+
<ItemGroup>
51+
<_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
52+
</ItemGroup>
53+
</Target>
54+
55+
</Project>

‎Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netstandard2.0;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net46;netstandard2.0;uap10.0.16299</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netstandard2.0;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net46;netstandard2.0;uap10.0.16299</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎Rx.NET/Source/facades/System.Reactive.Linq/System.Reactive.Linq.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netstandard2.0;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net46;netstandard2.0;uap10.0.16299</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netstandard2.0;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net46;netstandard2.0;uap10.0.16299</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎Rx.NET/Source/facades/System.Reactive.Providers/System.Reactive.Providers.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netstandard2.0;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net46;netstandard2.0;uap10.0.16299</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)