Merge master to release/3.0.1xx for preview5

.vsts-ci.yml

@@ -3,26 +3,30 @@ trigger:
 - release/*
 
 variables:
-  teamName: Roslyn-Project-System
-  ${{ if eq(variables['System.TeamProject'], 'public') }}:
-    PB_PublishBlobFeedKey:
-    PB_PublishBlobFeedUrl:
-    _DotNetPublishToBlobFeed: false
-  ${{ if ne(variables['System.TeamProject'], 'public') }}:
-    PB_PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
-    _DotNetPublishToBlobFeed: true
+  - name: teamName
+    value: Roslyn-Project-System
+  - name: PB_PublishBlobFeedUrl
+    value: ''
+  - name: _DotNetPublishToBlobFeed
+    value: false
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+    - name: PB_PublishBlobFeedUrl
+      value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
+    - name: _DotNetPublishToBlobFeed
+      value: true
 
-phases:
+jobs:
 - template: /eng/build.yml
   parameters:
     agentOs: Windows_NT
-    queue:
+    pool:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        name: dotnet-external-temp
+        name: NetCorePublic-Int-Pool
+        queue: buildpool.windows.10.amd64.vs2017.open
       ${{ if ne(variables['System.TeamProject'], 'public') }}:
-        name: dotnet-internal-temp
-      parallel: 2
-      timeoutInMinutes: 120
+        name: NetCoreInternal-Int-Pool
+        queue: buildpool.windows.10.amd64.vs2017
+    strategy:
       matrix:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           Build_Debug:
@@ -42,10 +46,10 @@ phases:
   - template: /eng/build.yml
     parameters:
       agentOs: Windows_NT_FullFramework
-      queue:
-        name: dotnet-external-temp
-        parallel: 2
-        timeoutInMinutes: 120
+      pool:
+        name: NetCorePublic-Int-Pool
+        queue: buildpool.windows.10.amd64.vs2017.open
+      strategy:
         matrix:
           Build_Debug:
             _BuildConfig: Debug
@@ -59,10 +63,10 @@ phases:
   - template: /eng/build.yml
     parameters:
       agentOs: Windows_NT_TestAsTools
-      queue:
-        name: dotnet-external-temp
-        parallel: 2
-        timeoutInMinutes: 120
+      pool:
+        name: NetCorePublic-Int-Pool
+        queue: buildpool.windows.10.amd64.vs2017.open
+      strategy:
         matrix:
           Build_Debug:
             _BuildConfig: Debug
@@ -72,10 +76,9 @@ phases:
   - template: /eng/build.yml
     parameters:
       agentOs: Ubuntu_14_04
-      queue: 
+      pool:
         name: Hosted Ubuntu 1604
-        parallel: 2
-        timeoutInMinutes: 120
+      strategy:
         matrix:
           Build_Debug:
             _BuildConfig: Debug
@@ -91,10 +94,9 @@ phases:
   - template: /eng/build.yml
     parameters:
       agentOs: Ubuntu_16_04
-      queue: 
+      pool:
         name: Hosted Ubuntu 1604
-        parallel: 2
-        timeoutInMinutes: 120
+      strategy:
         matrix:
           Build_Debug:
             _BuildConfig: Debug
@@ -110,10 +112,9 @@ phases:
   - template: /eng/build.yml
     parameters:
       agentOs: Darwin
-      queue: 
+      pool:
         name: DotNetCore-Mac
-        parallel: 2
-        timeoutInMinutes: 120
+      strategy:
         matrix:
           Build_Debug:
             _BuildConfig: Debug
@@ -127,10 +128,10 @@ phases:
   - template: /eng/build.yml
     parameters:
       agentOs: Windows_Performance
-      queue:
-        name: dotnet-external-temp
-        parallel: 2
-        timeoutInMinutes: 120
+      pool:
+        name: NetCorePublic-Int-Pool
+        queue: buildpool.windows.10.amd64.vs2017.open
+      strategy:
         matrix:
           Build_Release:
             _BuildConfig: Release
@@ -140,10 +141,9 @@ phases:
   - template: /eng/build.yml
     parameters:
       agentOs: Linux_Performance
-      queue:
+      pool:
         name: Hosted Ubuntu 1604
-        parallel: 2
-        timeoutInMinutes: 120
+      strategy:
         matrix:
           Build_Release:
             _BuildConfig: Release

eng/Version.Details.xml

@@ -3,13 +3,13 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19206.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19218.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9d8abf998866f10bc19d97e1916ff1c0ada3fd42</Sha>
+      <Sha>5e7ce5b394f3477bb0a485a4b761b7742e95be37</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19206.5">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19218.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9d8abf998866f10bc19d97e1916ff1c0ada3fd42</Sha>
+      <Sha>5e7ce5b394f3477bb0a485a4b761b7742e95be37</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -7,22 +7,24 @@
   <!-- Repo Version Information -->
   <PropertyGroup>
     <VersionPrefix>3.0.100</VersionPrefix>
-    <PreReleaseVersionLabel>preview4</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>preview5</PreReleaseVersionLabel>
   </PropertyGroup>
   <!-- Production Dependencies -->
   <PropertyGroup>
+    <MicrosoftBuildVersion>15.4.8</MicrosoftBuildVersion>
     <MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftExtensionsDependencyModelVersion>2.1.0-preview2-26306-03</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftNETHostModelVersion>3.0.0-preview5-27615-04</MicrosoftNETHostModelVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
     <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
-    <NuGetBuildTasksPackVersion>5.0.1-rtm.5946</NuGetBuildTasksPackVersion>
+    <NuGetBuildTasksPackVersion>5.1.0-rtm.5921</NuGetBuildTasksPackVersion>
     <NuGetPackagingVersion>$(NuGetBuildTasksPackVersion)</NuGetPackagingVersion>
     <NuGetProjectModelVersion>$(NuGetBuildTasksPackVersion)</NuGetProjectModelVersion>
     <PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>1.0.0-beta.19206.5</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>1.0.0-beta.19218.7</MicrosoftDotNetSignToolVersion>
   </PropertyGroup>
   <!-- Get .NET Framework reference assemblies from NuGet packages -->
   <PropertyGroup>

eng/build.yml

@@ -1,53 +1,55 @@
 parameters:
+  # Agent OS identifier and used as job name
   agentOs: ''
-  queue: {}
+
+  # Agent pool
+  pool: {}
+
+  # Additional variables
   variables: {}
 
-phases:
-- template: /eng/common/templates/phases/base.yml
+  # Build strategy - matrix
+  strategy: ''
+
+  # Job timeout
+  timeoutInMinutes: 120
+
+jobs:
+- template: /eng/common/templates/job/job.yml
   parameters:
     name: ${{ parameters.agentOs }}
-    enableTelemetry: true
     enableMicrobuild: true
-    queue: ${{ parameters.queue }}
+    enablePublishBuildArtifacts: true
+    enablePublishBuildAssets: true
+    enablePublishTestResults: true
+    enableTelemetry: true
+    helixRepo: dotnet/sdk
+    pool: ${{ parameters.pool }}
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+    ${{ if ne(parameters.strategy, '') }}:
+      strategy: ${{ parameters.strategy }}
     variables: 
-      ${{ insert }}: ${{ parameters.variables }}
-      _AgentOSName: ${{ parameters.agentOs }}
-      _HelixType: build/product
-      _HelixBuildConfig: $(_BuildConfig)
-      _TeamName: DotNetCore
-      _PerformanceArgs: /p:PerfIterations=4
-      ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        _HelixSource: pr/dotnet/sdk/$(Build.SourceBranch)
-        _OfficialBuildIdArgs: ''
-        _PublishArgs: ''
-        _SignArgs: ''
-      ${{ if ne(variables['System.TeamProject'], 'public') }}:
-        _HelixSource: official/dotnet/sdk/$(Build.SourceBranch)
-        _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
-        _PublishArgs: /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
-                  /p:DotNetPublishBlobFeedUrl=$(PB_PublishBlobFeedUrl)
-                  /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
-                  /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-                  /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-                  /p:PB_PublishType=$(_PublishType)
-        _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
+      - ${{ insert }}: ${{ parameters.variables }}
+      - _AgentOSName: ${{ parameters.agentOs }}
+      - _TeamName: DotNetCore
+      - _PerformanceArgs: /p:PerfIterations=4
+      - _OfficialBuildIdArgs: ''
+      - _PublishArgs: ''
+      - _SignArgs: ''
+      - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+        - group: DotNet-Symbol-Server-PATs
+        - group: DotNet-HelixApi-Access
+        - group: DotNet-Blob-Feed
+        - _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
+        - _PublishArgs: /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
+                    /p:DotNetPublishBlobFeedUrl=$(PB_PublishBlobFeedUrl)
+                    /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
+                    /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
+                    /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
+                    /p:PB_PublishType=$(_PublishType)
+        - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
 
     steps:
-    - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-      - task: AzureKeyVault@1
-        inputs:
-          azureSubscription: 'DotNet-Engineering-Services_KeyVault'
-          KeyVaultName: EngKeyVault
-          SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat'
-        condition: succeeded()
-      - task: AzureKeyVault@1
-        inputs:
-          azureSubscription: 'HelixProd_KeyVault'
-          KeyVaultName: HelixProdKV
-          SecretsFilter: 'HelixApiAccessToken'
-        condition: always()
-
     - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
       - script: eng\common\CIBuild.cmd
                   -configuration $(_BuildConfig)
@@ -116,33 +118,3 @@ phases:
           BuildConfig: $(_BuildConfig)
           BlobFeedUrl: $(PB_PublishBlobFeedUrl)
           PublishType: $(_PublishType)
-
-    - task: PublishTestResults@1
-      displayName: Publish Test Results
-      inputs:
-        testRunner: XUnit
-        testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
-        testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
-        platform: '$(BuildPlatform)'
-        configuration: '$(_BuildConfig)'
-      condition: not(succeeded())
-
-    - task: CopyFiles@2
-      displayName: Gather Logs
-      inputs:
-        SourceFolder: '$(Build.SourcesDirectory)'
-        Contents: |
-         artifacts/log/$(_BuildConfig)/**/*
-         artifacts/TestResults/$(_BuildConfig)/**/*
-        TargetFolder: '$(Build.ArtifactStagingDirectory)'
-      continueOnError: true
-      condition: not(succeeded())
-
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Logs to VSTS
-      inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-        ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
-        publishLocation: Container
-      continueOnError: true
-      condition: not(succeeded())