Merge pull request #799 from dotnet/build

Build updates
dotnet · Aug 3, 2018 · 7e2323f · 7e2323f
2 parents e53a503 + f19afc1
commit 7e2323f
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 Ix.NET/Layout
+Ix.NET/Layout
 Rx.NET/Layout
 
 
@@ -15,6 +16,8 @@ local.properties
 .classpath
 .settings/
 .loadpath
+*.exe
+.store/
 
 *.binlog
 

diff --git a/.vsts.ix-ci.yml b/.vsts.ix-ci.yml
@@ -13,6 +13,7 @@ trigger:
 queue: Hosted VS2017
 variables: 
   BuildConfiguration: Release
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
 steps:
 - template: .vsts.ix-shared.yml

diff --git a/.vsts.ix-pr.yml b/.vsts.ix-pr.yml
@@ -3,6 +3,7 @@ trigger: none
 queue: Hosted VS2017
 variables: 
   BuildConfiguration: Release
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
 steps:
 - template: .vsts.ix-shared.yml
diff --git a/.vsts.ix-shared.yml b/.vsts.ix-shared.yml
@@ -2,17 +2,21 @@ parameters:
   signStep: []
 
 steps:
-- task: DotNetCoreInstaller@0
+- task: DotNetCoreCLI@2  
   inputs:
-    version: '2.1.400-preview-009171'
+    command: custom
+    custom: tool
+    arguments: install --tool-path . nbgv
+  displayName: Install NBGV tool
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
 
-- task: DotNetCoreCLI@2
-  inputs:
-    command: build
-    projects: Ix.NET/Source/build/setversion.csproj
-    arguments: -c $(BuildConfiguration)   
+- script: nbgv cloud -p Ix.NET\Source
   displayName: Set Version
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+
+- task: DotNetCoreInstaller@0
+  inputs:
+    version: '2.1.400-preview-009171'
 
 - task: DotNetCoreCLI@2
   inputs:
@@ -27,7 +31,7 @@ steps:
   inputs:
     command: test
     projects: Ix.NET/Source/**/*.Tests.csproj
-    arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/Ix.NET/Source/CodeCoverage.runsettings /p:DebugType=portable 
+    arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/Ix.NET/Source/CodeCoverage.runsettings /p:DebugType=Full 
   displayName: Run Tests
 
 - ${{ parameters.signStep }}

diff --git a/.vsts.rx-ci.yml b/.vsts.rx-ci.yml
@@ -15,6 +15,7 @@ queue: Hosted VS2017
 variables: 
   BuildConfiguration: Release
   BuildPlatform: Any CPU
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
 steps:
 - template: .vsts.rx-shared.yml

diff --git a/.vsts.rx-pr.yml b/.vsts.rx-pr.yml
@@ -4,6 +4,7 @@ queue: Hosted VS2017
 variables: 
   BuildConfiguration: Release
   BuildPlatform: Any CPU
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
 steps:
 - template: .vsts.rx-shared.yml
diff --git a/.vsts.rx-shared.yml b/.vsts.rx-shared.yml
@@ -2,29 +2,27 @@ parameters:
   signStep: []
 
 steps:
-- task: DotNetCoreInstaller@0
-  inputs:
-    version: '2.1.400-preview-009171'
-
-- task: NuGetToolInstaller@0
-  displayName: Use NuGet 4.7.0
+- task: DotNetCoreCLI@2  
   inputs:
-    versionSpec: 4.7.0
+    command: custom
+    custom: tool
+    arguments: install --tool-path . nbgv
+  displayName: Install NBGV tool
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
 
-- task: DotNetCoreCLI@2
-  inputs:
-    command: build
-    projects: Rx.NET/Source/build/setversion.csproj
-    arguments: -c $(BuildConfiguration)   
+- script: nbgv cloud -a -p Rx.NET\Source
   displayName: Set Version
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+
+- task: DotNetCoreInstaller@0
+  inputs:
+    version: '2.1.400-preview-009171'
 
-- task: VSBuild@1
+- task: MSBuild@1
   displayName: Build System.Reactive.sln
   inputs:
-    solution: Rx.NET/Source/System.Reactive.sln
-    vsVersion: 15.0
-    msbuildArgs: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts
+    solution: Rx.NET/Source/System.Reactive.sln    
+    msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts
     platform: $(BuildPlatform)
     configuration: $(BuildConfiguration)
     maximumCpuCount: true
@@ -36,12 +34,11 @@ steps:
     arguments: pack Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec -Version $(NBGV_NuGetPackageVersion) -MinClientVersion 2.12 -NoPackageAnalysis -outputdirectory $(Build.ArtifactStagingDirectory)\artifacts
   condition: eq(variables['system.pullrequest.isfork'], false)
 
-- task: VSBuild@1
+- task: MSBuild@1
   displayName: Build for Test (ppdb) workaround
   inputs:
-    solution: Rx.NET/Source/System.Reactive.sln
-    vsVersion: 15.0
-    msbuildArgs: /t:build /p:DebugType=portable
+    solution: Rx.NET/Source/System.Reactive.sln    
+    msbuildArguments: /t:build /p:DebugType=portable
     platform: $(BuildPlatform)
     configuration: $(BuildConfiguration)
     maximumCpuCount: true

diff --git a/Ix.NET/Source/build/setversion.csproj b/Ix.NET/Source/build/setversion.csproj
diff --git a/Ix.NET/Source/build/version.json b/Ix.NET/Source/build/version.json
diff --git a/Rx.NET/Source/build/setversion.csproj b/Rx.NET/Source/build/setversion.csproj
diff --git a/Rx.NET/Source/build/version.json b/Rx.NET/Source/build/version.json
diff --git a/Rx.NET/Source/global.json b/Rx.NET/Source/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "1.5.4"
+    "MSBuild.Sdk.Extras": "1.6.46"
   }
 }