[release/8.0.1xx] Fix internal VMR PR builds (#17208)

premun · web-flow · commit 001d8e4465c6 · 2023-08-17T17:27:03.000Z
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.23374.1",
+      "version": "1.1.0-beta.23416.3",
       "commands": [
         "darc"
       ]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -219,13 +219,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>d3b8861e20aaf0179034c6076d156e2442b26f9b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23374.1">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23416.3">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>47ed0ea4d789d359d3749707374d7a5edd84eb19</Sha>
+      <Sha>5d63a226d022fda90cae2c239e882ad253baa758</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23374.1">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23416.3">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>47ed0ea4d789d359d3749707374d7a5edd84eb19</Sha>
+      <Sha>5d63a226d022fda90cae2c239e882ad253baa758</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -43,7 +43,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.23374.1</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.23416.3</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -70,7 +70,7 @@ jobs:
   - template: /eng/common/templates/variables/pool-providers.yml
   - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
     - group: AzureDevOps-Artifact-Feeds-Pats
-  - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/'))) }}:
+  - ${{ if and(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal'), not(startswith(parameters.vmrBranch, 'internal/release/')), not(eq(variables['Build.Reason'], 'PullRequest'))) }}:
     - group: DotNetBot-GitHub
   - ${{ else }}:
     - name: BotAccount-dotnet-bot-repo-PAT
diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml
@@ -32,6 +32,7 @@ steps:
     ./eng/vmr-sync.sh
     --vmr ${{ parameters.vmrPath }}
     --tmp $(Agent.TempDirectory)
+    --azdev-pat '$(System.AccessToken)'
     --branch ${{ parameters.vmrBranch }}
     --repository "installer:${{ parameters.targetRef }}"
     --recursive
diff --git a/eng/pipelines/vmr-build-internal.yml b/eng/pipelines/vmr-build-internal.yml
@@ -30,7 +30,7 @@ resources:
   - repository: vmr
     type: git
     name: dotnet-dotnet
-    ref: $(VmrBranch)
+    ref: ${{ variables.VmrBranch }}
 
 stages:
 # You can temporarily disable the VMR Build stage by changing the default of disableVmrBuild
diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh
@@ -58,6 +58,9 @@
 ###       Optional. Template for the header of VMRs THIRD-PARTY-NOTICES file.
 ###       Defaults to src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
 ###
+###   --azdev-pat
+###       Optional. Azure DevOps PAT to use for cloning private repositories.
+###
 ###   -v, --vmr, --vmr-dir PATH
 ###       Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder
 
@@ -102,6 +105,7 @@ recursive=false
 verbosity=verbose
 readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md"
 tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt"
+azdev_pat=''
 
 # If installer is a repo, we're in an installer and not in the dotnet/dotnet repo
 if [[ -d "$installer_dir/.git" ]]; then
@@ -142,6 +146,10 @@ while [[ $# -gt 0 ]]; do
       tpn_template=$2
       shift
       ;;
+    --azdev-pat)
+      azdev_pat=$2
+      shift
+      ;;
     -d|--debug)
       verbosity=debug
       ;;
@@ -245,11 +253,16 @@ if [[ -n "$additional_remotes" ]]; then
   additional_remotes="--additional-remotes $additional_remotes"
 fi
 
+if [[ -n "$azdev_pat" ]]; then
+  azdev_pat="--azdev-pat $azdev_pat"
+fi
+
 # Synchronize the VMR
 
 "$dotnet" darc vmr update                    \
   --vmr "$vmr_dir"                           \
   --tmp "$tmp_dir"                           \
+  $azdev_pat                                 \
   --$verbosity                               \
   $recursive_arg                             \
   --readme-template "$readme_template"       \

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"microsoft.dotnet.darc": {`
`6`		`- "version": "1.1.0-beta.23374.1",`
	`6`	`+ "version": "1.1.0-beta.23416.3",`
`7`	`7`	`"commands": [`
`8`	`8`	`"darc"`
`9`	`9`	`]`