Update main release

Directory.Build.props

@@ -52,8 +52,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <NuGetAuditMode>all</NuGetAuditMode>
-    <NuGetAuditLevel>moderate</NuGetAuditLevel>
+    <NuGetAuditMode>direct</NuGetAuditMode>
+    <NuGetAuditLevel>low</NuGetAuditLevel>
     <RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
   </PropertyGroup>
 

eng/Versions.props

@@ -3,9 +3,9 @@
     <!-- The .NET product branding version -->
     <MajorVersion>10</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</PatchVersion>
     <SdkBandVersion>10.0.100</SdkBandVersion>
-    <PreReleaseVersionLabel>ci.net10</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>ci.main</PreReleaseVersionLabel>
     <PreReleaseVersionLabel Condition="'$(BUILD_SOURCEBRANCH)' == 'refs/heads/inflight/current'">ci.inflight</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>
     </PreReleaseVersionIteration>

eng/common/PSScriptAnalyzerSettings.psd1

@@ -8,4 +8,4 @@
                    'PSStandardDSCFunctionsInResource',
                    'PSUseIdenticalMandatoryParametersForDSC',
                    'PSUseIdenticalParametersForDSC')
-}
+}

eng/common/core-templates/job/publish-build-assets.yml

@@ -117,9 +117,16 @@ jobs:
             flattenFolders: true
           condition: ${{ parameters.condition }}
           continueOnError: ${{ parameters.continueOnError }}
-    
+
     - task: NuGetAuthenticate@1
 
+    # Populate internal runtime variables.
+    - template: /eng/common/templates/steps/enable-internal-sources.yml
+      parameters:
+        legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
+
+    - template: /eng/common/templates/steps/enable-internal-runtimes.yml
+
     - task: AzureCLI@2
       displayName: Publish Build Assets
       inputs:
@@ -128,10 +135,14 @@ jobs:
         scriptLocation: scriptPath
         scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
         arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
+          -runtimeSourceFeed https://ci.dot.net/internal 
+          -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
           /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
           /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
           /p:MaestroApiEndpoint=https://maestro.dot.net
           /p:OfficialBuildId=$(OfficialBuildId)
+
+
       condition: ${{ parameters.condition }}
       continueOnError: ${{ parameters.continueOnError }}
 
@@ -195,6 +206,8 @@ jobs:
             -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
             -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
             -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
+            -runtimeSourceFeed https://ci.dot.net/internal
+            -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
 
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
       - template: /eng/common/core-templates/steps/publish-logs.yml

eng/common/core-templates/job/source-index-stage1.yml

@@ -41,4 +41,4 @@ jobs:
 
   - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
     parameters:
-      binLogPath: ${{ parameters.binLogPath }}
+      binLogPath: ${{ parameters.binLogPath }}

eng/common/core-templates/post-build/post-build.yml

@@ -307,6 +307,13 @@ stages:
 
         - task: NuGetAuthenticate@1
 
+        # Populate internal runtime variables.
+        - template: /eng/common/templates/steps/enable-internal-sources.yml
+          parameters:
+            legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
+
+        - template: /eng/common/templates/steps/enable-internal-runtimes.yml
+
         - task: AzureCLI@2
           displayName: Publish Using Darc
           inputs:
@@ -323,3 +330,5 @@ stages:
               -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
               -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
               -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
+              -runtimeSourceFeed https://ci.dot.net/internal
+              -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)

eng/common/core-templates/steps/enable-internal-runtimes.yml

@@ -29,4 +29,4 @@ steps:
       storageAccount: dotnetbuilds
       container: internal
       permissions: rl
-      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}

eng/common/core-templates/steps/get-federated-access-token.yml

@@ -39,4 +39,4 @@ steps:
         exit 1
       }
       Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
-      Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"
+      Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"

eng/common/core-templates/steps/publish-build-artifacts.yml

@@ -17,4 +17,4 @@ steps:
     parameters:
       is1ESPipeline: ${{ parameters.is1ESPipeline }}
       ${{ each parameter in parameters.args }}:
-        ${{ parameter.key }}: ${{ parameter.value }}
+        ${{ parameter.key }}: ${{ parameter.value }}

eng/common/core-templates/steps/publish-logs.yml

@@ -28,6 +28,8 @@ steps:
     arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' 
       -BinlogToolVersion ${{parameters.BinlogToolVersion}}
       -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
+      -runtimeSourceFeed https://ci.dot.net/internal 
+      -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
       '$(publishing-dnceng-devdiv-code-r-build-re)'
       '$(MaestroAccessToken)'
       '$(dn-bot-all-orgs-artifact-feeds-rw)'

eng/common/core-templates/steps/retain-build.yml

@@ -25,4 +25,4 @@ steps:
     displayName: Enable permanent build retention
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      BUILD_ID: $(Build.BuildId)
+      BUILD_ID: $(Build.BuildId)

eng/common/core-templates/variables/pool-providers.yml

@@ -5,4 +5,4 @@ variables:
   - ${{ if eq(parameters.is1ESPipeline, 'true') }}:
     - template: /eng/common/templates-official/variables/pool-providers.yml
   - ${{ else }}:
-    - template: /eng/common/templates/variables/pool-providers.yml
+    - template: /eng/common/templates/variables/pool-providers.yml

eng/common/darc-init.ps1

@@ -44,4 +44,4 @@ catch {
   Write-Host $_.ScriptStackTrace
   Write-PipelineTelemetryError -Category 'Darc' -Message $_
   ExitWithExitCode 1
-}
+}

eng/common/dotnet-install.cmd

@@ -1,2 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*"
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*"

eng/common/init-tools-native.cmd

@@ -1,3 +1,3 @@
 @echo off
 powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*"
-exit /b %ErrorLevel%
+exit /b %ErrorLevel%

eng/common/loc/P22DotNetHtmlLocalization.lss

@@ -26,4 +26,4 @@
       </optionSet>
     </optionSet>
   </optionSet>
-</LS_SETTINGS_FILE>
+</LS_SETTINGS_FILE>

eng/common/msbuild.ps1

@@ -25,4 +25,4 @@ catch {
   ExitWithExitCode 1
 }
 
-ExitWithExitCode 0
+ExitWithExitCode 0

eng/common/post-build/publish-using-darc.ps1

@@ -7,7 +7,9 @@ param(
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
   [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
   [Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
-  [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
+  [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing,
+  [Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
+  [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey
 )
 
 try {

eng/common/post-build/redact-logs.ps1

@@ -7,7 +7,9 @@ param(
   # File with strings to redact - separated by newlines.
   #  For comments start the line with '# ' - such lines are ignored 
   [Parameter(Mandatory=$false)][string] $TokensFilePath,
-  [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
+  [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact,
+  [Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
+  [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey
 )
 
 try {

eng/common/sdk-task.ps1

@@ -9,6 +9,8 @@ Param(
   [switch][Alias('nobl')]$excludeCIBinaryLog,
   [switch]$noWarnAsError,
   [switch] $help,
+  [string] $runtimeSourceFeed = '',
+  [string] $runtimeSourceFeedKey = '',
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 

eng/common/sdl/NuGet.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <solution>
     <add key="disableSourceControlIntegration" value="true" />

eng/common/sdl/sdl.ps1

@@ -35,4 +35,4 @@ function Install-Gdn {
     }
 
     return $gdnCliPath.FullName
-}
+}

eng/common/templates-official/jobs/source-build.yml

@@ -4,4 +4,4 @@ jobs:
     is1ESPipeline: true
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates-official/post-build/common-variables.yml

@@ -5,4 +5,4 @@ variables:
     is1ESPipeline: true
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates-official/post-build/setup-maestro-vars.yml

@@ -5,4 +5,4 @@ steps:
     is1ESPipeline: true
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates-official/steps/enable-internal-sources.yml

@@ -4,4 +4,4 @@ steps:
     is1ESPipeline: true
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates-official/steps/get-federated-access-token.yml

@@ -4,4 +4,4 @@ steps:
     is1ESPipeline: true
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates-official/variables/pool-providers.yml

@@ -42,4 +42,4 @@ variables:
           False,
           'NetCore1ESPool-Internal'
         )
-      ]
+      ]

eng/common/templates-official/variables/sdl-variables.yml

@@ -4,4 +4,4 @@ variables:
 - name: DefaultGuardianVersion
   value: 0.109.0
 - name: GuardianPackagesConfigFile
-  value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
+  value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config

eng/common/templates/jobs/source-build.yml

@@ -4,4 +4,4 @@ jobs:
     is1ESPipeline: false
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates/post-build/common-variables.yml

@@ -5,4 +5,4 @@ variables:
     is1ESPipeline: false
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates/post-build/post-build.yml

@@ -5,4 +5,4 @@ stages:
     is1ESPipeline: false
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates/post-build/setup-maestro-vars.yml

@@ -5,4 +5,4 @@ steps:
     is1ESPipeline: false
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates/steps/enable-internal-sources.yml

@@ -4,4 +4,4 @@ steps:
     is1ESPipeline: false
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates/steps/get-federated-access-token.yml

@@ -4,4 +4,4 @@ steps:
     is1ESPipeline: false
 
     ${{ each parameter in parameters }}:
-      ${{ parameter.key }}: ${{ parameter.value }}
+      ${{ parameter.key }}: ${{ parameter.value }}

eng/common/templates/steps/publish-pipeline-artifacts.yml

@@ -31,4 +31,4 @@ steps:
     ${{ if parameters.args.parallelCount }}:
       parallelCount: ${{ parameters.args.parallelCount }}
     ${{ if parameters.args.properties }}:
-      properties: ${{ parameters.args.properties }}
+      properties: ${{ parameters.args.properties }}

eng/pipelines/arcade/variables.yml

@@ -50,8 +50,8 @@ variables:
   - name: _PublishArgs
     value: >-
       /p:DotNetPublishUsingPipelines=true
-  # - name: _OfficialBuildIdArgs
-  #   value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
+  - name: _OfficialBuildIdArgs
+    value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) /p:_SkipUpdateBuildNumber=true -runtimeSourceFeed https://ci.dot.net/internal -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
   # needed for signing
   - name: _SignType
     value: real

eng/pipelines/common/localization.yml

@@ -11,7 +11,7 @@ stages:
     jobs:
       - job : generate_lci
         displayName: 'Process outgoing strings'
-        pool:  $(HostedWinVS2019)
+        pool:  $(1ESPTPool)
 
         variables:
           - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat

eng/pipelines/common/provision.yml

@@ -34,10 +34,28 @@ parameters:
   skipInternalFeeds: true
 
 steps:
+
 ##################################################
-#               Provisioning macOS               #
+#               Provisioning Feeds               #
 ##################################################
 
+- ${{ if ne(parameters.skipInternalFeeds, 'true') }}:
+  - template: ../../common/templates-official/steps/enable-internal-sources.yml
+    parameters:
+      legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
+
+  - template: ../../common/templates-official/steps/enable-internal-runtimes.yml
+    parameters:
+      federatedServiceConnection: ${{ parameters.federatedServiceConnection }}
+      outputVariableName: ${{ parameters.outputVariableName }}
+      expiryInHours: ${{ parameters.expiryInHours }}
+      base64Encode: ${{ parameters.base64Encode }}
+
+
+##################################################
+#               Provisioning macOS               #
+##################################################
+
 #check if the _tool directory exists and remove it
 - pwsh: |
     $dotnetToolsPath = "$(Agent.ToolsDirectory)/dotnet"
@@ -275,18 +293,4 @@ steps:
     displayName: 'Provision Android SDK - Create AVDs'
     condition: succeeded()
     env:
-      AndroidSdkProvisionApiLevel: ${{ parameters.androidEmulatorApiLevel }}
-
-##################################################
-#               Provisioning Feeds               #
-##################################################
-
-- ${{ if and(eq(variables['System.TeamProject'], 'devdiv'), ne(parameters.skipInternalFeeds, 'true')) }}:
-  - template: ../../common/templates-official/steps/enable-internal-sources.yml
-
-  - template: ../../common/templates-official/steps/enable-internal-runtimes.yml
-    parameters:
-      federatedServiceConnection: ${{ parameters.federatedServiceConnection }}
-      outputVariableName: ${{ parameters.outputVariableName }}
-      expiryInHours: ${{ parameters.expiryInHours }}
-      base64Encode: ${{ parameters.base64Encode }}
+      AndroidSdkProvisionApiLevel: ${{ parameters.androidEmulatorApiLevel }}

eng/pipelines/common/variables.yml

@@ -51,6 +51,10 @@ variables:
   value: false
 - name: _InternalBuildArgs
   value: ''
+- name: cfsNugetWarnLevel
+  value: warn
+- name: nugetMultiFeedWarnLevel
+  value: none
 
 # Variable groups required for all builds
 - ${{ if and(ne(variables['Build.DefinitionName'], 'maui-pr'), ne(variables['Build.DefinitionName'], 'dotnet-maui'),  ne(variables['Build.DefinitionName'], 'maui-pr-devicetests')) }}: