[release/10.0] Source code updates from dotnet/dotnet (#2730)

.vsts-ci-official.yml

@@ -1,188 +1,38 @@
 variables:
-  - name: _TeamName
-    value: DotNetCore
-  - name: _DotNetArtifactsCategory
-    value: .NETCore
-  - name: Codeql.Enabled
-    value: true
-  # CodeQL3000 needs this plumbed along as a variable to enable TSA.
-  - name: Codeql.TSAEnabled
-    value: true
-  - name: Codeql.TSAOptionsPath
-    value: '$(Build.SourcesDirectory)/.config/tsaoptions.json'
-
-# CI and PR triggers
+  - name: _PublishUsingPipelines
+    value: false
+  - template: /eng/common/templates-official/variables/pool-providers.yml@self
 trigger:
   batch: true
   branches:
     include:
-    - main
-    - release/*
-
-pr:
-  autoCancel: false
-  branches:
-    include:
-    - '*'
-
+      - main
+      - release/*
+pr: none
 resources:
   repositories:
   - repository: 1ESPipelineTemplates
     type: git
     name: 1ESPipelineTemplates/1ESPipelineTemplates
     ref: refs/tags/release
-
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
-    pool:
-      name: NetCore1ESPool-Svc-Internal
-      image: 1es-windows-2022
-      os: windows
-    customBuildTags:
-    - ES365AIMigrationTooling
     sdl:
-      policheck:
-        enabled: true
-      tsa:
-        enabled: true
+      createAdoIssuesForJustificationsForDisablement: false
+      sourceAnalysisPool:
+        name: $(DncEngInternalBuildPool)
+        image: 1es-windows-2022
+        os: windows
     stages:
     - stage: build
-      displayName: Build and Test
+      displayName: Build
       jobs:
       - template: /eng/common/templates-official/jobs/jobs.yml@self
         parameters:
-          enableMicrobuild: true
           enablePublishBuildArtifacts: true
-          enablePublishUsingPipelines: true
-          enablePublishTestResults: true
-          enablePublishBuildAssets: true
+          enablePublishBuildAssets: false
+          enablePublishTestResults: false
+          publishAssetsImmediately: true
+          isAssetlessBuild: true
           enableTelemetry: true
-          enableSourceBuild: true
-          helixRepo: dotnet/command-line-api
-          timeoutInMinutes: 180 # increase timeout since BAR publishing might wait a long time
-          jobs:
-          - job: Windows
-            pool:
-              name: NetCore1ESPool-Internal
-              demands: ImageOverride -equals windows.vs2022.amd64
-            variables:
-            - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
-              # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
-              - group: DotNet-Symbol-Server-Pats
-              - group: Publish-Build-Assets
-              - name: _OfficialBuildArgs
-                value: /p:DotNetSignType=$(_SignType)
-                      /p:TeamName=$(_TeamName)
-                      /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
-                      /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
-                      /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
-                      /p:PublishToSymbolServer=true
-                      /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-                      /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-              - name: _PublishUsingPipelines
-                value: true
-            # else
-            - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-              - name: _OfficialBuildArgs
-                value: ''
-            strategy:
-              matrix:
-                ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-                  Debug:
-                    _BuildConfig: Debug
-                    _SignType: test
-                    _BuildArgs:
-
-                Release:
-                  _BuildConfig: Release
-                  # PRs are not signed.
-                  ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-                    _SignType: test
-                  ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
-                    _SignType: real
-                    _BuildArgs: $(_OfficialBuildArgs)
-            templateContext:
-              sdl:
-                binskim:
-                  analyzeTargetGlob: +:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\xunit*.dll;-:f|artifacts\bin\**\verify*.dll;
-              outputs:
-              - output: pipelineArtifact
-                displayName: Upload package artifacts
-                condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
-                targetPath: artifacts/packages/
-                artifactName: artifacts
-              - output: pipelineArtifact
-                displayName: Publish Artifact Symbols
-                condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
-                targetPath: '$(Build.SourcesDirectory)\artifacts\SymStore\$(_BuildConfig)'
-                artifactName: 'NativeSymbols'
-            # WORKAROUND: BinSkim requires the folder exist prior to scanning.
-            preSteps:
-            - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force
-              displayName: Create artifacts/bin directory
-            steps:
-            - checkout: self
-              clean: true
-            - script: eng\common\cibuild.cmd
-                -configuration $(_BuildConfig)
-                -prepareMachine
-                $(_BuildArgs)
-              displayName: Build and Publish
-
-          - job: Ubuntu
-            displayName: Ubuntu
-            pool:
-              name: NetCore1ESPool-Svc-Internal
-              demands: ImageOverride -equals 1es-ubuntu-2004
-              os: linux
-            strategy:
-              matrix:
-                ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-                  Debug:
-                    _BuildConfig: Debug
-                    _SignType: none
-                Release:
-                  _BuildConfig: Release
-                  _SignType: none
-            steps:
-            - checkout: self
-              clean: true
-            - bash: |
-                wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-                sudo apt-add-repository "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-9 main"
-                sudo apt-get update
-            - bash: |
-                sudo apt-get install cmake clang-9 libicu66 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev
-            - script: eng/common/cibuild.sh
-                --configuration $(_BuildConfig)
-                --prepareMachine
-              displayName: Build
-
-          - job: MacOS
-            displayName: MacOS
-            pool:
-              name: Azure Pipelines
-              image: macOS-latest
-              os: macOS
-            strategy:
-              matrix:
-                ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-                  Debug:
-                    _BuildConfig: Debug
-                    _SignType: none
-                    _DotNetPublishToBlobFeed: false
-                Release:
-                  _BuildConfig: Release
-                  _SignType: none
-                  _DotNetPublishToBlobFeed: false
-            steps:
-            - checkout: self
-              clean: true
-            - script: eng/common/cibuild.sh
-                --configuration $(_BuildConfig)
-                --prepareMachine
-              displayName: Build
-
-    - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
-      - template: /eng/common/templates-official/post-build/post-build.yml@self

.vsts-ci.yml

@@ -1,17 +1,10 @@
-variables:
-  - name: _TeamName
-    value: DotNetCore
-  - name: _DotNetArtifactsCategory
-    value: .NETCore
-  - name: Codeql.Enabled
-    value: true
-
 # CI and PR triggers
 trigger:
   batch: true
   branches:
     include:
     - main
+    - release/*
 
 pr:
   autoCancel: false
@@ -39,16 +32,12 @@ stages:
         pool:
           name: NetCore-Public
           demands: ImageOverride -equals windows.vs2022.amd64.open
-        variables:
-        - name: _OfficialBuildArgs
-          value: ''
         strategy:
           matrix:
             ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
               Debug:
                 _BuildConfig: Debug
                 _SignType: test
-                _BuildArgs:
 
             Release:
               _BuildConfig: Release
@@ -59,7 +48,6 @@ stages:
         - script: eng\common\cibuild.cmd
             -configuration $(_BuildConfig)
             -prepareMachine
-            $(_BuildArgs)
           displayName: Build and Publish
         - task: PublishBuildArtifacts@1
           displayName: Upload package artifacts
@@ -93,12 +81,7 @@ stages:
         steps:
         - checkout: self
           clean: true
-        - bash: |
-            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-            sudo apt-add-repository "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-9 main"
-            sudo apt-get update
-        - bash: |
-            sudo apt-get install cmake clang-9 libicu66 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev
+        - bash: sudo apt-get install cmake clang-9 libicu66 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev
         - script: eng/common/cibuild.sh
             --configuration $(_BuildConfig)
             --prepareMachine

eng/Version.Details.props

@@ -5,12 +5,12 @@ This file should be imported by eng/Versions.props
 -->
 <Project>
   <PropertyGroup>
-    <!-- dotnet/arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25407.2</MicrosoftDotNetArcadeSdkPackageVersion>
+    <!-- dotnet/dotnet dependencies -->
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetArcadeSdkPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>
-    <!-- dotnet/arcade dependencies -->
+    <!-- dotnet/dotnet dependencies -->
     <MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
   </PropertyGroup>
 </Project>

eng/Version.Details.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="e17b0d08def649f30aed9c09cf4a2c5741a3c76c" BarId="289695" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="93970af2dae989c795efb703be9a25ff95079f25" BarId="290774" />
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25407.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25563.104">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/CIBuild.cmd

@@ -1,2 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"