Skip to content

Commit f3ce0f0

Browse files
author
Oren Novotny
committed
Add WindowsDesktop integration tests
1 parent 8775aa2 commit f3ce0f0

File tree

2 files changed

+98
-1
lines changed

2 files changed

+98
-1
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
<PropertyGroup>
3+
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<NoWarn>$(NoWarn);CS0618</NoWarn>
5+
<LangVersion>latest</LangVersion>
6+
<AssemblyName>Tests.System.Reactive</AssemblyName>
7+
<RootNamespace>Tests.System.Reactive</RootNamespace>
8+
<SignAssembly>true</SignAssembly>
9+
<AssemblyOriginatorKeyFile>..\..\Source\ReactiveX.snk</AssemblyOriginatorKeyFile>
10+
<UseWPF>true</UseWPF>
11+
<UseWindowsForms>true</UseWindowsForms>
12+
</PropertyGroup>
13+
14+
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>
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<Content Include="..\..\Source\tests\Tests.System.Reactive\xunit.runner.json">
21+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22+
</Content>
23+
<Compile Include="..\..\Source\tests\Tests.System.Reactive\**\*.cs" Exclude="..\..\Source\tests\Tests.System.Reactive\obj\**" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20190203-03" />
28+
<PackageReference Include="xunit" Version="2.4.1" />
29+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
30+
<PackageReference Include="System.Reactive" Version="4.2.0-preview.63" />
31+
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0-preview.63" />
32+
<PackageReference Include="System.Reactive.Observable.Aliases" Version="4.2.0-preview.63" />
33+
</ItemGroup>
34+
</Project>

azure-pipelines.rx.yml

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
publishLocation: Container
103103
condition: always()
104104

105-
- job: Linux_Test
105+
- job: Integration_Linux_Tests
106106
dependsOn: Build
107107
pool:
108108
vmImage: ubuntu-16.04
@@ -179,3 +179,66 @@ jobs:
179179
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
180180
arguments: -c $(BuildConfiguration) -f netcoreapp2.1 /p:TargetFrameworks=netcoreapp2.1
181181
displayName: Run 2.1 Tests on Linux
182+
183+
- job: Integration_WindowsDesktop_Tests
184+
dependsOn: Build
185+
pool:
186+
vmImage: windows-2019
187+
188+
variables:
189+
BuildConfiguration: Release
190+
BuildPlatform: Any CPU
191+
192+
steps:
193+
- task: DotNetCoreInstaller@0
194+
inputs:
195+
version: '3.0.100-preview4-010374'
196+
197+
- task: DotNetCoreCLI@2
198+
inputs:
199+
command: custom
200+
custom: tool
201+
arguments: install --tool-path . nbgv
202+
displayName: Install NBGV tool
203+
204+
- script: ./nbgv cloud -a -p Rx.NET/Source
205+
displayName: Set Version
206+
207+
- task: DownloadBuildArtifacts@0
208+
displayName: 'Download Build Artifacts'
209+
inputs:
210+
artifactName: artifacts
211+
downloadPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
212+
213+
- powershell: mv $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages/artifacts/*.* $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
214+
215+
- task: DotNetCoreCLI@2
216+
displayName: Update Rx
217+
inputs:
218+
command: custom
219+
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
220+
custom: add
221+
arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
222+
223+
- task: DotNetCoreCLI@2
224+
displayName: Update Aliases
225+
inputs:
226+
command: custom
227+
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
228+
custom: add
229+
arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
230+
231+
- task: DotNetCoreCLI@2
232+
displayName: Update Testing
233+
inputs:
234+
command: custom
235+
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
236+
custom: add
237+
arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
238+
239+
- task: DotNetCoreCLI@2
240+
inputs:
241+
command: test
242+
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
243+
arguments: -c $(BuildConfiguration)
244+
displayName: Run 3.0 Tests on WindowDesktop

0 commit comments

Comments
 (0)