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

.vsts-ci.yml

@@ -9,6 +9,12 @@ trigger:
     - release/*
     - internal/release/*
 
+parameters:
+- name: runPrBuild
+  displayName: Run PR Build
+  type: boolean
+  default: false
+
 variables:
 - name: _PublishUsingPipelines
   value: false
@@ -35,6 +41,8 @@ variables:
 # Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning.
 - name: MicroBuildOutputFolderOverride
   value: $(Agent.TempDirectory)
+# Sets: dn-bot-dnceng-artifact-feeds-rw
+- group: AzureDevOps-Artifact-Feeds-Pats
 
 resources:
   repositories:
@@ -94,8 +102,8 @@ extends:
             targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration
             artifactName: buildConfiguration
 
-        # PR-only jobs
-      - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+      # PR-only jobs
+      - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest'), eq(parameters.runPrBuild, true)) }}:
         # Windows
         - template: eng/build.yml@self
           parameters:
@@ -184,7 +192,7 @@ extends:
             runTests: true
 
       # Official/PGO instrumentation Builds
-      - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+      - ${{ else }}:
         # Windows
         - template: eng/build.yml@self
           parameters:

eng/build.yml

@@ -179,19 +179,42 @@ jobs:
 
     - template: /eng/common/templates-official/variables/pool-providers.yml
 
-    steps:
-    - checkout: self
-      clean: true
-    - template: /eng/common/templates/steps/enable-internal-runtimes.yml
-    - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
-      - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}:
+    ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}:
+      presteps:
+      # Install pwsh for enable-internal-runtimes.yml when the container is ubuntu2204 (the image is missing pwsh).
+      - ${{ if and(eq(parameters.container, 'ubuntu2204'), eq(parameters.buildArchitecture, 'x64')) }}:
+        # Script from here: https://learn.microsoft.com/en-us/powershell/scripting/install/install-ubuntu?view=powershell-7.5#installation-via-package-repository-the-package-repository
+        - script: |
+            sudo apt-get update
+            sudo apt-get install -y wget apt-transport-https software-properties-common
+            source /etc/os-release
+            wget -q https://packages.microsoft.com/config/ubuntu/$VERSION_ID/packages-microsoft-prod.deb
+            sudo dpkg -i packages-microsoft-prod.deb
+            rm packages-microsoft-prod.deb
+            sudo apt-get update
+            sudo apt-get install -y powershell
+            pwsh --version
+          displayName: Install PowerShell on Ubuntu 22.04
+      - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
         - task: PowerShell@2
           displayName: Setup Private Feeds Credentials
           inputs:
             filePath: $(installerRoot)/eng/common/SetupNugetSources.ps1
             arguments: -ConfigFile $(installerRoot)/NuGet.config -Password $Env:Token
           env:
             Token: $(dn-bot-dnceng-artifact-feeds-rw)
+      - ${{ else }}:
+        - task: Bash@3
+          displayName: Setup Private Feeds Credentials
+          inputs:
+            filePath: $(installerRoot)/eng/common/SetupNugetSources.sh
+            arguments: $(installerRoot)/NuGet.config $Token
+          env:
+            Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
+    steps:
+    - template: /eng/common/templates/steps/enable-internal-runtimes.yml
+    - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
       - script: $(installerRoot)/build.cmd
                   $(_TestArg) $(_PackArg)
                   -publish -ci -sign
@@ -204,15 +227,6 @@ jobs:
         env:
           DOTNET_CLI_UI_LANGUAGE: ${{ parameters.dotnetCLIUILanguage }}
 
-    - ${{ if ne(parameters.agentOs, 'Windows_NT') }}:
-      - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}:
-        - task: Bash@3
-          displayName: Setup Private Feeds Credentials
-          inputs:
-            filePath: $(installerRoot)/eng/common/SetupNugetSources.sh
-            arguments: $(installerRoot)/NuGet.config $Token
-          env:
-            Token: $(dn-bot-dnceng-artifact-feeds-rw)
     - ${{ if eq(parameters.agentOs, 'Linux') }}:
       - script: $(installerRoot)/build.sh
                   $(_TestArg) $(_PackArg)

src/SourceBuild/content/eng/Versions.props

@@ -30,7 +30,7 @@
       These URLs can't be composed from their base URL and version as we read them from the
       prep.sh and pipeline scripts, outside of MSBuild.
     -->
-    <PrivateSourceBuiltArtifactsUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.121-servicing.25476.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
-    <PrivateSourceBuiltSdkUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.121-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
+    <PrivateSourceBuiltArtifactsUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.122-servicing.25528.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
+    <PrivateSourceBuiltSdkUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.122-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
   </PropertyGroup>
 </Project>

src/SourceBuild/content/global.json

@@ -1,12 +1,12 @@
 {
   "tools": {
-    "dotnet": "8.0.121"
+    "dotnet": "8.0.122"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
     "Microsoft.Build.Traversal": "2.0.2",
     "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25465.1",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1",
     "Yarn.MSBuild": "1.15.2"
   }
 }

src/VirtualMonoRepo/allowed-binaries.txt

@@ -32,10 +32,14 @@ src/aspnetcore/src/*.woff
 src/aspnetcore/src/*.woff2
 src/aspnetcore/src/Components/Web.JS/dist/Release/blazor.*.js # JavaScript files with a null bytes
 src/aspnetcore/src/ProjectTemplates/Web.ProjectTemplates/**/app.db
+src/aspnetcore/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc # UTF16-LE text file
 src/aspnetcore/src/submodules/spa-templates/**/app.db
 
 src/fsharp/**/signedtests/*
 src/fsharp/src/fsi/fsi.res # Icon
+src/fsharp/vsintegration/src/FSharp.LanguageService/VSPackage.resx # UTF16-LE text file
+
+src/installer/src/finalizer/native.rc # UTF16-LE text file
 
 src/msbuild/src/Tasks.UnitTests/*
 
@@ -51,7 +55,9 @@ src/runtime/src/mono/wasm/testassets/*
 src/runtime/src/native/external/brotli/common/dictionary.bin.br
 
 src/sdk/src/Assets/TestProjects/*
+src/sdk/src/GenAPI/genapi.slnf # UTF16-LE text file
 
+src/source-build-externals/src/application-insights/BASE/.PreReleaseVersion # UTF16-LE text file
 src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/build/strongNameBypass.reg # UTF16-LE text file
 src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/build/strongNameBypass2.reg # UTF16-LE text file
 src/source-build-externals/src/humanizer/src/Humanizer.Tests*