Skip to content

Commit e1e4b63

Browse files
author
Oren Novotny
committed
Build with latest SDK
1 parent 7c69b51 commit e1e4b63

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

Rx.NET/Source/System.Reactive.sln

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26606.0
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28606.126
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive", "src\System.Reactive\System.Reactive.csproj", "{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}"
77
EndProject
@@ -15,9 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.System.Reactive.Uwp.D
1515
EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{870348D0-C0A0-4352-8A02-E00AB0CCB919}"
1717
ProjectSection(SolutionItems) = preProject
18-
..\..\.vsts.rx-ci.yml = ..\..\.vsts.rx-ci.yml
19-
..\..\.vsts.rx-pr.yml = ..\..\.vsts.rx-pr.yml
20-
..\..\.vsts.rx-shared.yml = ..\..\.vsts.rx-shared.yml
18+
..\..\azure-pipelines.rx.yml = ..\..\azure-pipelines.rx.yml
2119
Directory.build.props = Directory.build.props
2220
Directory.build.targets = Directory.build.targets
2321
global.json = global.json

azure-pipelines.rx.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ steps:
2929
displayName: Set Version
3030
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
3131

32+
- task: DotNetCoreInstaller@0
33+
inputs:
34+
version: '2.2.104'
35+
3236
- task: MSBuild@1
3337
displayName: Build System.Reactive.sln
3438
inputs:
@@ -45,15 +49,6 @@ steps:
4549
arguments: pack Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec -Version $(NBGV_NuGetPackageVersion) -MinClientVersion 2.12 -NoPackageAnalysis -outputdirectory $(Build.ArtifactStagingDirectory)\artifacts
4650
condition: eq(variables['system.pullrequest.isfork'], false)
4751

48-
- task: MSBuild@1
49-
displayName: Build for Test (ppdb) workaround
50-
inputs:
51-
solution: Rx.NET/Source/System.Reactive.sln
52-
msbuildArguments: /t:build /p:DebugType=portable
53-
platform: $(BuildPlatform)
54-
configuration: $(BuildConfiguration)
55-
maximumCpuCount: true
56-
5752
- task: DotNetCoreCLI@2
5853
inputs:
5954
command: test

0 commit comments

Comments
 (0)