Merge branch 'main' of https://github.com/shethaadit/aspnetcore into shethaadit/FixBug54953

Author: Adit Sheth

.azure/pipelines/ci-public.yml

@@ -79,14 +79,6 @@ variables:
   value: true
 - template: /eng/common/templates/variables/pool-providers.yml
 
-resources:
-  containers:
-  - container: debpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
-
-  - container: rpmpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
-
 stages:
 - stage: build
   displayName: Build
@@ -313,43 +305,13 @@ stages:
             --ci
             --arch x64
             --pack
+            --build-installers
             --all
             --no-build-java
             -p:OnlyPackPlatformSpecificPackages=true
             $(_BuildArgs)
             $(_InternalRuntimeDownloadArgs)
         displayName: Run build.sh
-      - script: ./eng/build.sh
-            --ci
-            --nobl
-            --arch x64
-            --build-installers
-            --no-build-deps
-            --no-build-nodejs
-            -p:OnlyPackPlatformSpecificPackages=true
-            -p:BuildRuntimeArchive=false
-            -p:LinuxInstallerType=deb
-            $(_BuildArgs)
-            $(_InternalRuntimeDownloadArgs)
-        displayName: Build Debian installers
-        target: debpkg
-      - script: ./eng/build.sh
-            --ci
-            --nobl
-            --arch x64
-            --build-installers
-            --no-build-deps
-            --no-build-nodejs
-            --publish
-            -p:OnlyPackPlatformSpecificPackages=true
-            -p:BuildRuntimeArchive=false
-            -p:LinuxInstallerType=rpm
-            -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
-            $(_BuildArgs)
-            $(_PublishArgs)
-            $(_InternalRuntimeDownloadArgs)
-        displayName: Build RPM installers
-        target: rpmpkg
       artifacts:
       - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
@@ -404,29 +366,13 @@ stages:
             --ci
             --arch arm64
             --pack
+            --build-installers
             --all
             --no-build-java
             -p:OnlyPackPlatformSpecificPackages=true
             $(_BuildArgs)
             $(_InternalRuntimeDownloadArgs)
         displayName: Run build.sh
-      - script: ./eng/build.sh
-            --ci
-            --nobl
-            --arch arm64
-            --build-installers
-            --no-build-deps
-            --no-build-nodejs
-            --publish
-            -p:OnlyPackPlatformSpecificPackages=true
-            -p:BuildRuntimeArchive=false
-            -p:LinuxInstallerType=rpm
-            -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
-            $(_BuildArgs)
-            $(_PublishArgs)
-            $(_InternalRuntimeDownloadArgs)
-        displayName: Build RPM installers
-        target: rpmpkg
       artifacts:
       - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/

.azure/pipelines/ci.yml

@@ -27,12 +27,6 @@ parameters:
   default: false
   displayName: Skip tests?
   type: boolean
-# Choose whether to enable binlogs when running pipeline manually.
-# Binary logs are enabled by default in public builds and aren't designed to be disabled there.
-- name: produceBinlogs
-  default: false
-  displayName: Produce binlogs?
-  type: boolean
 
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
@@ -44,9 +38,13 @@ variables:
 - ${{ 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
+  - name: _ArcadePublishNonWindowsArg
+    value: ''
 - ${{ else }}:
   - name: PostBuildSign
     value: true
+  - name: _ArcadePublishNonWindowsArg
+    value: --publish
 - name: _UseHelixOpenQueues
   value: ${{ ne(variables['System.TeamProject'], 'internal') }}
 - ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
@@ -63,39 +61,23 @@ variables:
   # The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs.
   - name: _PublishArgs
     value: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
-  - ${{ if ne(parameters.produceBinlogs, 'true') }}:
-    # Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
-    - name: WindowsArm64LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: Windows64LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: Windows86LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsSignLogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsInstallersLogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsArm64InstallersLogArgs
-      value: -ExcludeCIBinaryLog
 - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
   - name: _BuildArgs
     value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
   - name: _PublishArgs
     value: ''
-- ${{ if or(in(variables['Build.Reason'], 'PullRequest'), eq(parameters.produceBinlogs, 'true')) }}:
-  # Write binary logs for all main Windows build steps except the x86 one in public and PR builds.
-  - name: WindowsArm64LogArgs
-    value: /bl:artifacts/log/Release/Build.arm64.binlog
-  - name: Windows64LogArgs
-    value: /bl:artifacts/log/Release/Build.x64.binlog
-  - name: Windows86LogArgs
-    value: -ExcludeCIBinaryLog
-  - name: WindowsSignLogArgs
-    value: /bl:artifacts/log/Release/Build.CodeSign.binlog
-  - name: WindowsInstallersLogArgs
-    value: /bl:artifacts/log/Release/Build.Installers.binlog
-  - name: WindowsArm64InstallersLogArgs
-    value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
+- name: WindowsArm64LogArgs
+  value: /bl:artifacts/log/Release/Build.arm64.binlog
+- name: Windows64LogArgs
+  value: /bl:artifacts/log/Release/Build.x64.binlog
+- name: Windows86LogArgs
+  value: -ExcludeCIBinaryLog
+- name: WindowsSignLogArgs
+  value: /bl:artifacts/log/Release/Build.CodeSign.binlog
+- name: WindowsInstallersLogArgs
+  value: /bl:artifacts/log/Release/Build.Installers.binlog
+- name: WindowsArm64InstallersLogArgs
+  value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _InternalRuntimeDownloadArgs
   value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
          -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
@@ -121,12 +103,6 @@ variables:
 - template: /eng/common/templates-official/variables/pool-providers.yml@self
 
 resources:
-  containers:
-  - container: debpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
-
-  - container: rpmpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
   repositories:
   # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
   - repository: 1esPipelines
@@ -321,7 +297,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml
             $(_BuildArgs)
@@ -351,7 +327,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
             $(_BuildArgs)
@@ -377,48 +353,18 @@ extends:
           jobDisplayName: "Build: Linux x64"
           agentOs: Linux
           useHostedUbuntu: false
-          steps:
-          - script: ./eng/build.sh
-                --ci
-                --arch x64
-                --pack
-                --all
-                --no-build-java
-                -p:OnlyPackPlatformSpecificPackages=true
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Run build.sh
-          - script: ./eng/build.sh
-                --ci
-                --nobl
-                --arch x64
-                --build-installers
-                --no-build-deps
-                --no-build-nodejs
-                -p:OnlyPackPlatformSpecificPackages=true
-                -p:BuildRuntimeArchive=false
-                -p:LinuxInstallerType=deb
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Build Debian installers
-            target: debpkg
-          - script: ./eng/build.sh
-                --ci
-                --nobl
-                --arch x64
-                --build-installers
-                --no-build-deps
-                --no-build-nodejs
-                --publish
-                -p:OnlyPackPlatformSpecificPackages=true
-                -p:BuildRuntimeArchive=false
-                -p:LinuxInstallerType=rpm
-                -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
-                $(_BuildArgs)
-                $(_PublishArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Build RPM installers
-            target: rpmpkg
+          buildArgs:
+            --arch x64
+            --pack
+            --all
+            --build-installers
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
           artifacts:
           - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
@@ -443,7 +389,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_arm.xml
             $(_BuildArgs)
@@ -468,34 +414,18 @@ extends:
           jobName: Linux_arm64_build
           jobDisplayName: "Build: Linux ARM64"
           agentOs: Linux
-          steps:
-          - script: ./eng/build.sh
-                --ci
-                --arch arm64
-                --pack
-                --all
-                --no-build-java
-                -p:OnlyPackPlatformSpecificPackages=true
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Run build.sh
-          - script: ./eng/build.sh
-                --ci
-                --nobl
-                --arch arm64
-                --build-installers
-                --no-build-deps
-                --no-build-nodejs
-                --publish
-                -p:OnlyPackPlatformSpecificPackages=true
-                -p:BuildRuntimeArchive=false
-                -p:LinuxInstallerType=rpm
-                -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
-                $(_BuildArgs)
-                $(_PublishArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Build RPM installers
-            target: rpmpkg
+          buildArgs:
+            --arch arm64
+            --pack
+            --all
+            --build-installers
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
           artifacts:
           - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
@@ -522,7 +452,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
             $(_BuildArgs)
@@ -556,7 +486,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
             $(_BuildArgs)
@@ -589,7 +519,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
             $(_BuildArgs)

.azure/pipelines/jobs/codesign-xplat.yml

@@ -19,12 +19,20 @@ jobs:
       inputs:
         artifactName: ${{ parameters.inputName }}_Packages
         downloadPath: $(Build.StagingDirectory)/downloaded_packages/
-        itemPattern: '**/*.nupkg'
+        itemPattern: |
+          **/*.nupkg
+          **/*.tar.gz
+          **/*.deb
+          **/*.rpm
     - task: CopyFiles@2
       displayName: Copy packages to ArtifactsShippingPackagesDir
       inputs:
         sourceFolder: $(Build.StagingDirectory)/downloaded_packages/
-        contents: '**/*.nupkg'
+        contents: |
+          **/*.nupkg
+          **/*.tar.gz
+          **/*.deb
+          **/*.rpm
         targetFolder: $(Build.SourcesDirectory)/artifacts/packages/$(BuildConfiguration)/shipping/
         flattenFolders: true
     - powershell: .\eng\common\build.ps1