Merged PR 7578: Update dependencies

dotnet · Apr 23, 2020 · 99d7f32 · 99d7f32
1 parent 0494aba
commit 99d7f32
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 69 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -14,7 +14,7 @@ variables:
     value: .NETCore
   - name: _DotNetValidationArtifactsCategory
     value: .NETCore
-  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
     - name: PB_PublishBlobFeedUrl
       value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
     - name: _DotNetPublishToBlobFeed
@@ -35,37 +35,33 @@ stages:
           queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
         ${{ if ne(variables['System.TeamProject'], 'public') }}:
           name: NetCoreInternal-Pool
-          queue: BuildPool.Windows.10.Amd64.VS2017
+          queue: buildpool.windows.10.amd64.vs2017
       strategy:
         matrix:
-          ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+          ${{ if eq(variables['System.TeamProject'], 'public') }}:
             Build_Debug:
               _BuildConfig: Debug
               _PublishType: none
               _SignType: test
               _Test: -test
           Build_Release:
             _BuildConfig: Release
-            ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+            ${{ if eq(variables['System.TeamProject'], 'public') }}:
               _PublishType: none
               _SignType: test
               _Test: -test
-            ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+            ${{ if ne(variables['System.TeamProject'], 'public') }}:
               _PublishType: blob
               _SignType: real
               _Test: ''
 
-  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+  - ${{ if eq(variables['System.TeamProject'], 'public') }}:
     - template: /eng/build.yml
       parameters:
         agentOs: Windows_NT_FullFramework
         pool:
-          ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            name: NetCorePublic-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
-          ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCoreInternal-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2019.Pre
+          name: NetCorePublic-Pool
+          queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
         strategy:
           matrix:
             Build_Debug:
@@ -81,12 +77,8 @@ stages:
       parameters:
         agentOs: Windows_NT_TestAsTools
         pool:
-          ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            name: NetCorePublic-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
-          ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCoreInternal-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2019.Pre
+          name: NetCorePublic-Pool
+          queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
         strategy:
           matrix:
             Build_Debug:
@@ -98,12 +90,8 @@ stages:
       parameters:
         agentOs: Ubuntu_16_04
         pool:
-          ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            name: NetCorePublic-Pool
-            queue: BuildPool.Ubuntu.1604.Amd64.Open
-          ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCoreInternal-Pool
-            queue: BuildPool.Ubuntu.1604.Amd64
+          name: NetCorePublic-Pool
+          queue: BuildPool.Ubuntu.1604.Amd64.Open
         strategy:
           matrix:
             Build_Debug:
@@ -135,12 +123,8 @@ stages:
       parameters:
         agentOs: Windows_Perf_CI
         pool:
-          ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            name: NetCorePublic-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
-          ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCoreInternal-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2019.Pre
+          name: NetCorePublic-Pool
+          queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
         strategy:
           matrix:
             Build_Release:
@@ -152,12 +136,8 @@ stages:
       parameters:
         agentOs: Windows_Perf_CI_FullFramework
         pool:
-          ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            name: NetCorePublic-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2017.Open
-          ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCoreInternal-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2017
+          name: NetCorePublic-Pool
+          queue: buildpool.windows.10.amd64.vs2017.open
         strategy:
           matrix:
             Build_Release:
@@ -169,12 +149,8 @@ stages:
       parameters:
         agentOs: Linux_Perf_CI
         pool:
-          ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            name: NetCorePublic-Pool
-            queue: BuildPool.Ubuntu.1604.Amd64.Open
-          ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCoreInternal-Pool
-            queue: BuildPool.Ubuntu.1604.Amd64
+          name: NetCorePublic-Pool
+          queue: BuildPool.Ubuntu.1604.Amd64.Open
         strategy:
           matrix:
             Build_Release:

diff --git a/NuGet.config b/NuGet.config
@@ -3,8 +3,7 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <add key="darc-int-dotnet-core-setup-c4952fc" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-c4952fc9/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-a68e5e2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-a68e5e2c/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-core-setup-0c2e69c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0c2e69ca/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -15,9 +15,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="3.1.3" Pinned="true">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
+    <Dependency Name="Microsoft.NET.HostModel" Version="3.1.4">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
+      <Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
     </Dependency>
     <Dependency Name="NuGet.Build.Tasks" Version="5.4.0-rtm.6292">
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,7 +15,7 @@
     <MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftExtensionsDependencyModelVersion>2.1.0-preview2-26306-03</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftNETHostModelVersion>3.1.3</MicrosoftNETHostModelVersion>
+    <MicrosoftNETHostModelVersion>3.1.4</MicrosoftNETHostModelVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
     <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
     <NuGetBuildTasksPackageVersion>5.4.0-rtm.6292</NuGetBuildTasksPackageVersion>

diff --git a/eng/build.yml b/eng/build.yml
@@ -196,7 +196,6 @@ jobs:
             CorrelationPayloadDirectory: '$(Build.SourcesDirectory)\helix-package'
             HelixConfiguration: 'CoreMSBuild'
             continueOnError: true
-            condition: ne(variables['Test'], 'false')
         - task: PublishBuildArtifacts@1
           inputs:
             pathtoPublish: $(Build.SourcesDirectory)\artifacts\log
@@ -222,7 +221,7 @@ jobs:
             HelixSource: 'pr/dotnet/sdk/$(Build.SourceBranch)'
             HelixType: 'test/sdk_$(_BuildConfig)/'
             HelixAccessToken: $(HelixApiAccessToken)
-            HelixTargetQueues: 'Windows.10.Amd64.ClientRS1.Perf' #   a dedicated private Helix queue (perfsnakes)
+            HelixTargetQueues: 'Windows.10.Amd64.ClientRS1.Perf' # using a dedicated private Helix queue (perfsnakes)
             HelixPreCommands: 'set "PERF_COMMAND_UPLOAD_TOKEN=$(PerfCommandUploadToken)"'
 
             WorkItemTimeout: 2:00
@@ -231,7 +230,6 @@ jobs:
             CorrelationPayloadDirectory: '$(Build.SourcesDirectory)\helix-package'
             HelixConfiguration: 'FullMSBuild'
             continueOnError: true
-            condition: ne(variables['Test'], 'false')
         - task: PublishBuildArtifacts@1
           inputs:
             pathtoPublish: $(Build.SourcesDirectory)\artifacts\log
@@ -240,14 +238,13 @@ jobs:
     - ${{ if eq(parameters.agentOs, 'Linux_Perf_Helix') }}:
         - checkout: self
           clean: true
-        - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-          - task: Bash@3
-            displayName: Setup Private Feeds Credentials
-            inputs:
-              filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-              arguments: $(Build.SourcesDirectory)/NuGet.config $Token
-            env:
-              Token: $(dn-bot-dnceng-artifact-feeds-rw)
+        - task: Bash@3
+          displayName: Setup Private Feeds Credentials
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+            arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+          env:
+            Token: $(dn-bot-dnceng-artifact-feeds-rw)
         - template: /eng/common/templates/steps/send-to-helix.yml
           parameters:
             HelixSource: 'pr/dotnet/sdk/$(Build.SourceBranch)'
@@ -260,17 +257,15 @@ jobs:
             WorkItemDirectory: '$(Build.SourcesDirectory)'
             WorkItemCommand: './build/RunPerfTestsOnHelix.sh $(_BuildConfig) $(_PerfIterations) $(Build.SourceVersion) $(Build.SourceBranchName) rolling x64 Ubuntu_16.04 Ubuntu.1604.Amd64.Perf $(Build.BuildNumber)'
             continueOnError: true
-            condition: ne(variables['Test'], 'false')
 
     - ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools', 'Windows_Perf_CI', 'Linux_Perf_CI', 'Windows_Perf_Helix', 'Windows_Perf_CI_FullFramework', 'Windows_Perf_Helix_Fullframework', 'Linux_Perf_Helix') }}:
-      - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-          - task: Bash@3
-            displayName: Setup Private Feeds Credentials
-            inputs:
-              filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-              arguments: $(Build.SourcesDirectory)/NuGet.config $Token
-            env:
-              Token: $(dn-bot-dnceng-artifact-feeds-rw)
+      - task: Bash@3
+        displayName: Setup Private Feeds Credentials
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+          arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+        env:
+          Token: $(dn-bot-dnceng-artifact-feeds-rw)
       - script: eng/common/cibuild.sh 
                   --configuration $(_BuildConfig)
                   $(_PublishArgs)
@@ -311,4 +306,4 @@ jobs:
         ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' 
         publishLocation: Container  
       continueOnError: true 
-      condition: always()
+      condition: always()