Merge pull request #36798 from dotnet/release/8.0

[release/8.0-staging] Merge release/8.0 to release/8.0-staging

Author: cincuranet

NuGet.config

@@ -4,9 +4,11 @@
  <clear />
  <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
  <!-- Begin: Package sources from dotnet-runtime -->
- <add key="darc-int-dotnet-runtime-fce8ed9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90/nuget/v3/index.json" />
- <add key="darc-int-dotnet-runtime-fce8ed9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-2/nuget/v3/index.json" />
- <add key="darc-int-dotnet-runtime-fce8ed9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-1/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-runtime-574100b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-runtime-574100b-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-4/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-runtime-574100b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-3/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-runtime-574100b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-2/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-runtime-574100b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-1/nuget/v3/index.json" />
  <!-- End: Package sources from dotnet-runtime -->
  <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -21,9 +23,11 @@
  <clear />
  <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
  <!-- Begin: Package sources from dotnet-runtime -->
- <add key="darc-int-dotnet-runtime-fce8ed9-1" value="true" />
- <add key="darc-int-dotnet-runtime-fce8ed9-2" value="true" />
- <add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
+ <add key="darc-int-dotnet-runtime-574100b-1" value="true" />
+ <add key="darc-int-dotnet-runtime-574100b-2" value="true" />
+ <add key="darc-int-dotnet-runtime-574100b-3" value="true" />
+ <add key="darc-int-dotnet-runtime-574100b-4" value="true" />
+ <add key="darc-int-dotnet-runtime-574100b" value="true" />
  <!-- End: Package sources from dotnet-runtime -->
  <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  </disabledPackageSources>

azure-pipelines.yml

@@ -47,6 +47,7 @@ extends:
  parameters:
  featureFlags:
  autoBaseline: false
+ autoEnableRoslynWithNewRuleset: false
  sdl:
  sourceAnalysisPool:
  name: NetCore1ESPool-Svc-Internal

eng/Version.Details.xml

@@ -29,9 +29,9 @@
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
  <Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
  </Dependency>
- <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.19-servicing.25365.14">
+ <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.20-servicing.25419.14">
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
+ <Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
  </Dependency>
  <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.1">
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -45,32 +45,32 @@
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
  <Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.19">
+ <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.20">
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
+ <Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.19">
+ <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.20">
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
+ <Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
  </Dependency>
  <!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
- <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.19-servicing.25365.14">
+ <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.20-servicing.25419.14">
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
+ <Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25461.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
+ <Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25407.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25461.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
+ <Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25461.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
+ <Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup Label="Version settings">
- <VersionPrefix>8.0.20</VersionPrefix>
+ <VersionPrefix>8.0.21</VersionPrefix>
  <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
  <PreReleaseVersionIteration>
  </PreReleaseVersionIteration>
@@ -24,16 +24,16 @@
  <MicrosoftExtensionsConfigurationJsonVersion>8.0.1</MicrosoftExtensionsConfigurationJsonVersion>
  <MicrosoftExtensionsDependencyInjectionVersion>8.0.1</MicrosoftExtensionsDependencyInjectionVersion>
  <MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
- <MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.19-servicing.25365.14</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
+ <MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.20-servicing.25419.14</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
  <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
  <SystemTextJsonVersion>8.0.6</SystemTextJsonVersion>
  <SystemFormatsAsn1Version>8.0.2</SystemFormatsAsn1Version>
- <MicrosoftNETCoreAppRefVersion>8.0.19</MicrosoftNETCoreAppRefVersion>
- <MicrosoftNETCoreAppRuntimewinx64Version>8.0.19</MicrosoftNETCoreAppRuntimewinx64Version>
- <MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.19-servicing.25365.14</MicrosoftNETCoreBrowserDebugHostTransportVersion>
+ <MicrosoftNETCoreAppRefVersion>8.0.20</MicrosoftNETCoreAppRefVersion>
+ <MicrosoftNETCoreAppRuntimewinx64Version>8.0.20</MicrosoftNETCoreAppRuntimewinx64Version>
+ <MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.20-servicing.25419.14</MicrosoftNETCoreBrowserDebugHostTransportVersion>
  </PropertyGroup>
  <PropertyGroup Label="Dependencies from dotnet/arcade">
- <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksTemplatingVersion>
+ <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksTemplatingVersion>
  </PropertyGroup>
  <PropertyGroup Label="Other dependencies">
  <!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->

eng/common/SetupNugetSources.ps1

@@ -17,8 +17,8 @@
 # displayName: Setup Private Feeds Credentials
 # condition: eq(variables['Agent.OS'], 'Windows_NT')
 # inputs:
-# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
+# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
 # env:
 # Token: $(dn-bot-dnceng-artifact-feeds-rw)
 

eng/common/SetupNugetSources.sh

@@ -18,8 +18,8 @@
 # - task: Bash@3
 # displayName: Setup Private Feeds Credentials
 # inputs:
-# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-# arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
+# arguments: $(System.DefaultWorkingDirectory)/NuGet.config $Token
 # condition: ne(variables['Agent.OS'], 'Windows_NT')
 # env:
 # Token: $(dn-bot-dnceng-artifact-feeds-rw)

eng/common/templates-official/job/job.yml

@@ -38,7 +38,7 @@ parameters:
 # Sbom related params
  enableSbom: true
  PackageVersion: 7.0.0
- BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+ BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
  ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 
 jobs:
@@ -167,7 +167,7 @@ jobs:
  inputs:
  languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
  environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
- richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
+ richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
  uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
  continueOnError: true
 
@@ -226,7 +226,7 @@ jobs:
  - task: 1ES.PublishBuildArtifacts@1
  displayName: Publish Logs
  inputs:
- PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
+ PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)'
  PublishLocation: Container
  ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
  continueOnError: true
@@ -238,7 +238,7 @@ jobs:
  inputs:
  testResultsFormat: 'xUnit'
  testResultsFiles: '*.xml'
- searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+ searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
  testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
  mergeTestResults: ${{ parameters.mergeTestResults }}
  continueOnError: true
@@ -249,7 +249,7 @@ jobs:
  inputs:
  testResultsFormat: 'VSTest'
  testResultsFiles: '*.trx'
- searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+ searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
  testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
  mergeTestResults: ${{ parameters.mergeTestResults }}
  continueOnError: true
@@ -265,7 +265,7 @@ jobs:
  - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
  - task: 1ES.PublishPipelineArtifact@1
  inputs:
- targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
+ targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration'
  artifactName: 'BuildConfiguration'
  displayName: 'Publish build retry configuration'
  continueOnError: true

eng/common/templates-official/job/onelocbuild.yml

@@ -8,7 +8,7 @@ parameters:
  CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
  GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
 
- SourcesDirectory: $(Build.SourcesDirectory)
+ SourcesDirectory: $(System.DefaultWorkingDirectory)
  CreatePr: true
  AutoCompletePr: false
  ReusePr: true
@@ -63,7 +63,7 @@ jobs:
  - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
  - task: Powershell@2
  inputs:
- filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
+ filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
  arguments: $(_GenerateLocProjectArguments)
  displayName: Generate LocProject.json
  condition: ${{ parameters.condition }}
@@ -106,7 +106,7 @@ jobs:
  - task: 1ES.PublishBuildArtifacts@1
  displayName: Publish LocProject.json
  inputs:
- PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
+ PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/'
  PublishLocation: Container
  ArtifactName: Loc
  condition: ${{ parameters.condition }}

eng/common/templates-official/job/publish-build-assets.yml

@@ -30,6 +30,8 @@ parameters:
 
  signingValidationAdditionalParameters: ''
 
+ repositoryAlias: self
+
 jobs:
 - job: Asset_Registry_Publish
 
@@ -65,6 +67,9 @@ jobs:
  os: windows
  steps:
  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+ - checkout: ${{ parameters.repositoryAlias }}
+ fetchDepth: 3
+ clean: true
  - task: DownloadBuildArtifacts@0
  displayName: Download artifact
  inputs:
@@ -82,7 +87,7 @@ jobs:
  azureSubscription: "Darc: Maestro Production"
  scriptType: ps
  scriptLocation: scriptPath
- scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
+ scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
  arguments: >
  -task PublishBuildAssets -restore -msbuildEngine dotnet
  /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
@@ -115,7 +120,7 @@ jobs:
  inputs:
  targetType: inline
  script: |
- $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
+ $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
  if(Test-Path -Path $symbolExclusionfile)
  {
  Write-Host "SymbolExclusionFile exists"
@@ -130,7 +135,7 @@ jobs:
  displayName: Publish SymbolPublishingExclusionsFile Artifact
  condition: eq(variables['SymbolExclusionFile'], 'true') 
  inputs:
- PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
+ PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt'
  PublishLocation: Container
  ArtifactName: ReleaseConfigs
 
@@ -146,7 +151,7 @@ jobs:
  azureSubscription: "Darc: Maestro Production"
  scriptType: ps
  scriptLocation: scriptPath
- scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+ scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
  arguments: -BuildId $(BARBuildId)
  -PublishingInfraVersion 3
  -AzdoToken '$(System.AccessToken)'

eng/common/templates-official/job/source-build.yml

@@ -31,6 +31,9 @@ parameters:
  # container and pool.
  platform: {}
 
+ # Optional list of directories to ignore for component governance scans.
+ cgIgnoreDirectories: []
+
  # If set to true and running on a non-public project,
  # Internal blob storage locations will be enabled.
  # This is not enabled by default because many repositories do not need internal sources
@@ -73,3 +76,4 @@ jobs:
  - template: /eng/common/templates-official/steps/source-build.yml
  parameters:
  platform: ${{ parameters.platform }}
+ cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}