Merge pull request #12674 from mmitche/merge-from-2xx

[main] Merge from release/6.0.2xx

build.sh

@@ -55,5 +55,5 @@ if [ ! -z "$BUILD_IN_DOCKER" ]; then
 else
     # Run under sudo so we can set ulimit
     # See https://github.com/dotnet/core-eng/issues/14808
-    sudo $DIR/run-build.sh $args
+    sudo -E $DIR/run-build.sh $args
 fi

eng/source-build-tarball-build.yml

@@ -3,11 +3,8 @@ pr: none
 resources:
   pipelines:
   - pipeline: installer-build-resource
-    ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      source: installer
-    ${{ if ne(variables['System.TeamProject'], 'public') }}:
-      source: dotnet-installer-official-ci
-    trigger: true # Run pipeline when any run of installer CI completes
+    source: dotnet-installer-official-ci
+    trigger: true # Run pipeline when any run of dotnet-installer-official-ci completes
 
 stages:
 - stage: build

src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets

@@ -170,7 +170,7 @@
       Condition="$(IsRootRepo) != 'true'" />
 
     <Exec
-      Command="git submodule update --init --recursive"
+      Command="git submodule update --init --recursive --depth 1"
       WorkingDirectory="$(TarballRepoSourceDir)" />
 
     <!-- Remove the git objects folder to free up tarball space -->

src/redist/targets/GetRuntimeInformation.targets

@@ -29,6 +29,8 @@
                                    '$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
       <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
 
+      <PortableProductMonikerRid Condition=" '$(PortableProductMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</PortableProductMonikerRid>
+
       <ArtifactNameSdk>dotnet-sdk-internal$(PgoTerm)</ArtifactNameSdk>
       <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)</ArtifactNameCombinedHostHostFxrFrameworkSdk>