Bump to use internal .NET 7 GA build (#18508)

2022-11-09 14:51:24 -08:00 · 2022-11-09 14:51:24 -08:00 · 665bf21fcb
commit 665bf21fcb
parent 67135b47d7
25 changed files with 106 additions and 36 deletions
--- a/.vsts-ci/templates/verify-xunit.yml
+++ b/.vsts-ci/templates/verify-xunit.yml
@ -19,12 +19,12 @@ jobs:
        xunit/**/*
      downloadPath: '$(System.ArtifactsDirectory)'

-  - powershell: |
+  - pwsh: |
      dir "$(System.ArtifactsDirectory)\*" -Recurse
    displayName: 'Capture artifacts directory'
    continueOnError: true

-  - powershell: |
+  - pwsh: |
      Import-Module .\tools\ci.psm1
      $xUnitTestResultsFile = "$(System.ArtifactsDirectory)\xunit\xUnitTestResults.xml"

--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@ -1,13 +1,13 @@
 {
  "sdk": {
-    "channel": "7.0.1xx-rc2",
+    "channel": "7.0.1xx",
    "quality": "daily",
    "qualityFallback": "preview",
-    "packageVersionPattern": "7.0.0-rc.2",
+    "packageVersionPattern": "7.0.0",
    "sdkImageVersion": "7.0.100",
    "nextChannel": "7.0.1xx-rc2",
    "azureFeed": "",
-    "sdkImageOverride": ""
+    "sdkImageOverride": "7.0.100-rtm.22521.12"
  },
  "internalfeed": {
    "url": ""
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@ -2775,12 +2775,12 @@
      <Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
        <File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
      </Component>
-      <Component Id="cmp6DA0E2825D9646A6959358D042DBC4FE">
-        <File Id="fil55E2580F30F241F1AC58435689E7E1F7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.47203.dll" />
-      </Component>
      <Component Id="cmp96588875574749E295496861FFC1DB58">
        <File Id="filF931B05A25224A188D08E09A9FDC3A58" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
      </Component>
+      <Component Id="cmpBE1F08365DA04264BD3FB4A018024753">
+        <File Id="filFD13BF06C7FC4F61BB6322101BC2A846" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.51805.dll" />
+      </Component>
    </DirectoryRef>
  </Fragment>
  <Fragment>
@ -3667,9 +3667,9 @@
      <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
      <ComponentRef Id="cmp4CBF50D9098D4CB491FF5A3FD6BD0531" />
      <ComponentRef Id="cmpB57C7D1B8B4D41229C7AEA53A2E1FC7C" />
-      <ComponentRef Id="cmp6DA0E2825D9646A6959358D042DBC4FE" />
      <ComponentRef Id="cmpD1CDA13235324E4EA90A9CFB3EABB34C" />
      <ComponentRef Id="cmp96588875574749E295496861FFC1DB58" />
+      <ComponentRef Id="cmpBE1F08365DA04264BD3FB4A018024753" />
    </ComponentGroup>
  </Fragment>
 </Wix>
--- a/build.psm1
+++ b/build.psm1
@ -19,7 +19,8 @@ $script:Options = $null
 $dotnetMetadata = Get-Content $PSScriptRoot/DotnetRuntimeMetadata.json | ConvertFrom-Json
 $dotnetCLIChannel = $dotnetMetadata.Sdk.Channel
 $dotnetCLIQuality = $dotnetMetadata.Sdk.Quality
-$dotnetAzureFeed = $dotnetMetadata.Sdk.azureFeed
+$dotnetAzureFeed = $env:__DONET_RUNTIME_FEED ?? $dotnetMetadata.Sdk.azureFeed
+$dotnetAzureFeedSecret = $env:__DONET_RUNTIME_FEED_KEY
 $dotnetSDKVersionOveride = $dotnetMetadata.Sdk.sdkImageOverride
 $dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version

@ -1969,7 +1970,8 @@ function Install-Dotnet {

            $psArgs += @('-SkipNonVersionedFiles')

-            $psArgs -join ' ' | Write-Verbose -Verbose
+            # Removing the verbose message to not expose the secret
+            # $psArgs -join ' ' | Write-Verbose -Verbose

            Start-NativeExecution {
                & $fullPSPath @psArgs
@ -2189,7 +2191,7 @@ function Start-PSBootstrap {

            if ($dotnetAzureFeed) {
                $null = $DotnetArguments.Add("AzureFeed", $dotnetAzureFeed)
-                $null = $DotnetArguments.Add("FeedCredential", $null)
+                $null = $DotnetArguments.Add("FeedCredential", $dotnetAzureFeedSecret)
            }

            Install-Dotnet @DotnetArguments
--- a/global.json
+++ b/global.json
@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "7.0.100-rc.2.22477.23"
+    "version": "7.0.100"
  }
 }
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@ -47,7 +47,7 @@

  <ItemGroup>
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@ -8,6 +8,7 @@

  <ItemGroup>
    <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
+    <PackageReference Include="Markdig.Signed" Version="0.30.4" />
    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
  </ItemGroup>

@ -31,10 +32,10 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-2.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="NJsonSchema" Version="10.7.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-4.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageReference Include="NJsonSchema" Version="10.8.0" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@ -8,7 +8,7 @@

  <ItemGroup>
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@ -15,12 +15,17 @@
  </ItemGroup>

  <ItemGroup>
+    <!-- This section is to force the version of non-direct dependencies -->
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="System.Web.Services.Description" Version="4.10.0" />
    <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.4" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
    <!-- the following package(s) are from https://github.com/dotnet/wcf -->
    <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0" />
    <PackageReference Include="System.ServiceModel.Http" Version="4.10.0" />
@ -29,7 +34,7 @@
    <PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
    <PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
    <!-- the source could not be found for the following package(s) -->
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@ -10,7 +10,7 @@
    <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
    <ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
  </ItemGroup>

  <PropertyGroup>
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@ -34,16 +34,17 @@
    <!-- the Application Insights package -->
    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
    <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0" />
    <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Management" Version="7.0.0" />
    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
    <!-- the following package(s) are from the powershell org -->
    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.3.0" />
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@ -13,7 +13,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
  </ItemGroup>

 </Project>
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@ -7,8 +7,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.2.22476.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
@ -16,6 +16,7 @@ jobs:
        value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
      - name: branchCounter
        value: $[counter(variables['branchCounterKey'], 1)]
+      - group: DotNetPrivateBuildAccess

    pool:
      name: PowerShell1ES
@ -38,6 +39,9 @@ jobs:
      workingDirectory: '$(Build.SourcesDirectory)'
      retryCountOnTaskFailure: 2
      displayName: 'Bootstrap'
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

    - pwsh: |
        Import-Module .\build.psm1 -force
--- a/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
@ -70,7 +70,7 @@ jobs:
    parameters:
      repoRoot: $(PowerShellRoot)

-  - powershell: |
+  - pwsh: |
      Set-Location $env:POWERSHELLROOT
      import-module "$env:POWERSHELLROOT/build.psm1"
      Sync-PSTags -AddRemoteIfMissing
--- a/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
@ -20,6 +20,7 @@ jobs:
    - name: NugetSecurityAnalysisWarningLevel
      value: none
    - group: ESRP
+    - group: DotNetPrivateBuildAccess

  steps:
  - ${{ if or(eq(variables.build,'deb'), eq(variables.build,'rpm')) }} :
@ -162,6 +163,9 @@ jobs:
    displayName: 'Bootstrap'
    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
    workingDirectory: $(PowerShellRoot)
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - powershell: |
      try {
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@ -20,6 +20,7 @@ jobs:
    - name: NugetSecurityAnalysisWarningLevel
      value: none
    - group: ESRP
+    - group: DotNetPrivateBuildAccess

  steps:
  - checkout: self
@ -60,6 +61,9 @@ jobs:
    displayName: 'Bootstrap'
    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
    workingDirectory: $(PowerShellRoot)
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - pwsh: |
      try {
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@ -17,6 +17,7 @@ jobs:
      value: false
    - name: NugetSecurityAnalysisWarningLevel
      value: none
+    - group: DotNetPrivateBuildAccess
  steps:
  - checkout: self
    clean: true
@ -116,6 +117,9 @@ jobs:
        throw
      }
    displayName: 'Bootstrap VM'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - pwsh: |
      # Add -SkipReleaseChecks as a mitigation to unblock release.
@ -127,6 +131,9 @@ jobs:
        throw
      }
    displayName: 'Package'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
    displayName: 'Component Detection'
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@ -15,6 +15,7 @@ jobs:
      value: false
    - name: NugetSecurityAnalysisWarningLevel
      value: none
+    - group: DotNetPrivateBuildAccess
  steps:
  #- task: <task type name>@<version>
  #  inputs:
@ -41,6 +42,9 @@ jobs:
  - pwsh: |
      tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
    displayName: 'Bootstrap VM'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
    parameters:
@ -53,6 +57,9 @@ jobs:
      $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
      $env:AzDevOpsFeedPAT2 = $null
    displayName: 'Build'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
    displayName: 'Component Detection'
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@ -32,6 +32,7 @@ jobs:
      value: '$(System.ArtifactsDirectory)/winFxdWinDesktop'
    - name: linuxFxdPath
      value: '$(System.ArtifactsDirectory)/linuxFxd'
+    - group: DotNetPrivateBuildAccess

  steps:
  - checkout: self
@ -56,6 +57,9 @@ jobs:
      # We just need .NET but we fixed this in an urgent situation.
      Start-PSBootStrap -Verbose
    displayName: Bootstrap
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - task: DownloadBuildArtifacts@0
    displayName: 'Download PowerShell build artifacts - finalResults'
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@ -12,6 +12,9 @@ jobs:
  pool:
    # test
    vmImage: ${{ parameters.imageName }}
+  variables:
+    - group: DotNetPrivateBuildAccess
+
  steps:
    - checkout: self
      clean: true
@ -57,6 +60,9 @@ jobs:
        Write-Verbose -Message "Installing .NET SDK completed." -Verbose

      displayName: Install .NET
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

    - pwsh: |
        $branch = $ENV:BUILD_SOURCEBRANCH
@ -78,6 +84,9 @@ jobs:
        Get-ChildItem -Path $toolPath

      displayName: Install global tool
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

    - pwsh: |
        $toolPath = "$(System.DefaultWorkingDirectory)/toolPath/${{ parameters.globalToolExeName }}"
@ -138,3 +147,6 @@ jobs:
            write-verbose -verbose "Got expected year: $dateYear"
        }
      displayName: Basic validation
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@ -11,6 +11,7 @@ jobs:
    vmImage: ${{ parameters.imageName }}
  variables:
  - group: AzDevOpsArtifacts
+  - group: DotNetPrivateBuildAccess
  steps:
    - checkout: self
      clean: true
@ -95,6 +96,9 @@ jobs:
        Write-Verbose -Message "Installing .NET SDK completed." -Verbose

      displayName: Install .NET
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

    - pwsh: |
        $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
@ -131,6 +135,9 @@ jobs:
        dotnet test /property:RELEASE_VERSION=$releaseVersion --test-adapter-path:. "--logger:xunit;LogFilePath=$(System.DefaultWorkingDirectory)/test-hosting.xml"

      displayName: Restore and execute tests
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

    - task: PublishTestResults@2
      displayName: 'Publish Test Results **\test-hosting.xml'
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@ -5,6 +5,7 @@ jobs:
      value: false
    - name: NugetSecurityAnalysisWarningLevel
      value: none
+    - group: DotNetPrivateBuildAccess
  displayName: Build test artifacts
  condition: succeeded()
  pool:
@ -22,6 +23,9 @@ jobs:
      Import-Module ./build.psm1
      Start-PSBootstrap
    displayName: Bootstrap
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - pwsh: |
      Import-Module ./build.psm1
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@ -30,6 +30,7 @@ jobs:
      value: ${{ parameters.Architecture }}
    - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
      value: 1
+    - group: DotNetPrivateBuildAccess

  steps:

@ -65,6 +66,9 @@ jobs:

      tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -location '$(PowerShellRoot)' -destination '$(Build.ArtifactStagingDirectory)/Symbols_$(Architecture)' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' -Symbols @params
    displayName: 'Build Windows Universal - $(Architecture)-$(BuildConfiguration) Symbols zip'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - pwsh: |
      $packageName = (Get-ChildItem '$(Build.ArtifactStagingDirectory)\Symbols_$(Architecture)').FullName
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@ -27,6 +27,7 @@ jobs:
    - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
      value: 1
    - group: ESRP
+    - group: DotNetPrivateBuildAccess

  steps:

@ -257,6 +258,9 @@ jobs:

      $(PowerShellRoot)/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -BuildZip $signedPkg -location '$(PowerShellRoot)' -destination '$(System.ArtifactsDirectory)\pkgSigned' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' @params
    displayName: 'Build Windows Universal - $(Architecture) Package'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

  - pwsh: |
      Get-ChildItem '$(System.ArtifactsDirectory)\pkgSigned' | ForEach-Object {