[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'

.github/workflows/inter-branch-merge-flow.yml

@@ -0,0 +1,13 @@
+name: Inter-branch merge workflow
+on:
+  push:
+    branches:
+      - release/**
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Merge:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main

.vsts-ci-richnav.yml

@@ -26,7 +26,7 @@ stages:
         richCodeNavigationEnvironment: 'production'
         pool:
             name: $(DncEngPublicBuildPool)
-            demands: ImageOverride -equals windows.vs2019.amd64.open   
+            demands: ImageOverride -equals windows.vs2019.amd64.open
         timeoutInMinutes: 180
         strategy:
           matrix:
@@ -45,6 +45,7 @@ stages:
           - _SignArgs: ''
           - _InternalRuntimeDownloadArgs: ''
         steps:
+        - template: /eng/common/templates/steps/enable-internal-runtimes.yml
         - powershell: eng\common\build.ps1
                     -restore
                     -ci
@@ -65,23 +66,23 @@ stages:
             TestFullMSBuild: 'true'
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
-        - task: CopyFiles@2	
-          displayName: Gather Logs	
-          inputs:	
-            SourceFolder: '$(Build.SourcesDirectory)/artifacts'	
-            Contents: |	
-              log/$(_BuildConfig)/**/*	
-              TestResults/$(_BuildConfig)/**/*	
-              SymStore/$(_BuildConfig)/**/* 
-            TargetFolder: '$(Build.ArtifactStagingDirectory)'	
-          continueOnError: true	
+        - task: CopyFiles@2
+          displayName: Gather Logs
+          inputs:
+            SourceFolder: '$(Build.SourcesDirectory)/artifacts'
+            Contents: |
+              log/$(_BuildConfig)/**/*
+              TestResults/$(_BuildConfig)/**/*
+              SymStore/$(_BuildConfig)/**/*
+            TargetFolder: '$(Build.ArtifactStagingDirectory)'
+          continueOnError: true
           condition: always()
 
-        - task: PublishBuildArtifacts@1	
-          displayName: Publish Logs to VSTS	
-          inputs:	
-            PathtoPublish: '$(Build.ArtifactStagingDirectory)'	
-            ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'	
-            publishLocation: Container	
-          continueOnError: true	
+        - task: PublishBuildArtifacts@1
+          displayName: Publish Logs to VSTS
+          inputs:
+            PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+            ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
+            publishLocation: Container
+          continueOnError: true
           condition: always()

.vsts-ci.yml

@@ -36,10 +36,9 @@ variables:
       value: /p:OfficialBuilder=Microsoft
     - name: Codeql.Enabled
       value: true
-    - group: DotNetBuilds storage account read tokens
     - name: _InternalRuntimeDownloadArgs
-      value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal 
-        /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) 
+      value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
+        /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - group: DotNet-CLI-SDLValidation-Params
   - template: /eng/common/templates-official/variables/pool-providers.yml
@@ -115,6 +114,7 @@ extends:
               value: ''
       - template: /eng/common/templates-official/job/source-build.yml@self
         parameters:
+          enableInternalSources: true
           platform:
             name: 'Managed'
             container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'

.vsts-pr.yml

@@ -18,14 +18,8 @@ pr:
 variables:
   - name: teamName
     value: Roslyn-Project-System
-  - name: _DotNetPublishToBlobFeed
-    value: false
   - name: _CIBuild
     value: -restore -build -sign -pack -ci
-  - name: _DotNetArtifactsCategory
-    value: .NETCore
-  - name: _DotNetValidationArtifactsCategory
-    value: .NETCore
   - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
     - name: PostBuildSign
       value: false
@@ -44,10 +38,9 @@ variables:
       value: /p:OfficialBuilder=Microsoft
     - name: Codeql.Enabled
       value: true
-    - group: DotNetBuilds storage account read tokens
     - name: _InternalRuntimeDownloadArgs
-      value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal 
-        /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) 
+      value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
+        /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - group: DotNet-CLI-SDLValidation-Params
   - template: /eng/common/templates/variables/pool-providers.yml
@@ -64,9 +57,9 @@ stages:
         name: $(DncEngInternalBuildPool)
         demands: ImageOverride -equals windows.vs2019.amd64
     steps:
-      - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
-        artifact: BuildConfiguration
-        displayName: Publish Build Config
+    - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
+      artifact: BuildConfiguration
+      displayName: Publish Build Config
   - template: /eng/build-pr.yml
     parameters:
       agentOs: Windows_NT
@@ -94,6 +87,7 @@ stages:
               _Test: ''
   - template: /eng/common/templates/job/source-build.yml
     parameters:
+      enableInternalSources: true
       platform:
         name: 'Managed'
         container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'

NuGet.config

@@ -23,7 +23,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-1adaf14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1adaf141/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-350f329" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-350f3294/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->

eng/Version.Details.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.303">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.304">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1bddd10408f6e7cabcce51d89d2c40919914423d</Sha>
+      <Sha>350f32942e8db0ab82b6ecc1c5710de386298e55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.303-servicing.24303.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.304-servicing.24352.15">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1bddd10408f6e7cabcce51d89d2c40919914423d</Sha>
+      <Sha>350f32942e8db0ab82b6ecc1c5710de386298e55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.303-servicing.24303.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.304-servicing.24352.15">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1bddd10408f6e7cabcce51d89d2c40919914423d</Sha>
+      <Sha>350f32942e8db0ab82b6ecc1c5710de386298e55</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.5">
@@ -82,34 +82,34 @@
       <Sha>d237e172b324021b97effa244af44d63d1a8bb7e</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24303.7">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24324.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>bef690dda43733707d7dccea9868fe51f34eb8a0</Sha>
+      <Sha>04fb39164c99c519832109f21b22630bc9246fce</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24303.7">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24324.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>bef690dda43733707d7dccea9868fe51f34eb8a0</Sha>
+      <Sha>04fb39164c99c519832109f21b22630bc9246fce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.24303.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.24324.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>bef690dda43733707d7dccea9868fe51f34eb8a0</Sha>
+      <Sha>04fb39164c99c519832109f21b22630bc9246fce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0-3.24303.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0-3.24324.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>bef690dda43733707d7dccea9868fe51f34eb8a0</Sha>
+      <Sha>04fb39164c99c519832109f21b22630bc9246fce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0-3.24303.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0-3.24324.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>bef690dda43733707d7dccea9868fe51f34eb8a0</Sha>
+      <Sha>04fb39164c99c519832109f21b22630bc9246fce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0-3.24303.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0-3.24324.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>bef690dda43733707d7dccea9868fe51f34eb8a0</Sha>
+      <Sha>04fb39164c99c519832109f21b22630bc9246fce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0-3.24303.7">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0-3.24324.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>bef690dda43733707d7dccea9868fe51f34eb8a0</Sha>
+      <Sha>04fb39164c99c519832109f21b22630bc9246fce</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.5-servicing.24224.4">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -187,18 +187,18 @@
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24272-11">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24317-02">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>83d73f783bf54c336d1eab04a53d554f8a6c0b19</Sha>
+      <Sha>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
       <SourceBuild RepoName="vstest" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.TestPlatform.CLI" Version="17.10.0-release-24272-11">
+    <Dependency Name="Microsoft.TestPlatform.CLI" Version="17.10.0-release-24317-02">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>83d73f783bf54c336d1eab04a53d554f8a6c0b19</Sha>
+      <Sha>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TestPlatform.Build" Version="17.10.0-release-24272-11">
+    <Dependency Name="Microsoft.TestPlatform.Build" Version="17.10.0-release-24317-02">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>83d73f783bf54c336d1eab04a53d554f8a6c0b19</Sha>
+      <Sha>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -285,18 +285,18 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24273.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24326.2">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>69799ac98a8df65cb6bacfe66293d4cbca54a15e</Sha>
+      <Sha>6f2caf542643b6c72369e41172572015d8f48311</Sha>
       <SourceBuild RepoName="razor" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24273.1">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24326.2">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>69799ac98a8df65cb6bacfe66293d4cbca54a15e</Sha>
+      <Sha>6f2caf542643b6c72369e41172572015d8f48311</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24273.1">
+    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24326.2">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>69799ac98a8df65cb6bacfe66293d4cbca54a15e</Sha>
+      <Sha>6f2caf542643b6c72369e41172572015d8f48311</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -483,22 +483,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24270.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24352.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
+      <Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24270.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24352.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
+      <Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24270.4">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24352.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
+      <Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24270.4">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24352.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
+      <Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>