[main] Update dependencies from dotnet/arcade-services (dotnet#45301)

[main] Update dependencies from dotnet/arcade-services - Turn on build look up for internal sync - Use and
surayya-MS · Dec 5, 2024 · cb21681 · cb21681
1 parent 274038a
commit cb21681
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 34 deletions.
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.24577.1",
+      "version": "1.1.0-beta.24603.4",
       "commands": [
         "darc"
       ]

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -623,13 +623,13 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>b66200e5448be50673b0387ca4632d3bfa25887b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24577.1">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24603.4">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>127f7b095d9e345f7fb1477c79923b91c4cc9a69</Sha>
+      <Sha>67e3a0d7ef4eb3054898e07e952442a4b09c8971</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24577.1">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24603.4">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>127f7b095d9e345f7fb1477c79923b91c4cc9a69</Sha>
+      <Sha>67e3a0d7ef4eb3054898e07e952442a4b09c8971</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="10.0.0-preview.24602.1">
       <Uri>https://github.com/dotnet/scenario-tests</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -92,7 +92,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.24577.1</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.24603.4</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml
@@ -42,21 +42,30 @@ steps:
   displayName: Set git author to dotnet-maestro[bot]
   workingDirectory: ${{ parameters.vmrPath }}
 
-- script: >
-    ./eng/vmr-sync.sh
-    --vmr ${{ parameters.vmrPath }}
-    --tmp $(Agent.TempDirectory)
-    --azdev-pat '$(dn-bot-all-orgs-code-r)'
-    --branch ${{ parameters.vmrBranch }}
-    --repository "sdk:${{ parameters.targetRef }}"
-    --recursive
-    --remote "sdk:$(Agent.BuildDirectory)/sdk"
-    --component-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md
-    --tpn-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
-    --ci
-    --debug
-    ||
-    (echo "##vso[task.logissue type=error]Failed to synchronize the VMR" && exit 1)
+- script: |
+    enable_build_lookup=''
+    if [ "$(Build.Reason)" != 'PullRequest' ] && [ "$(System.TeamProject)" == 'internal' ]; then
+      enable_build_lookup='--enable-build-lookup'
+    fi
+
+    ./eng/vmr-sync.sh                                                                                 \
+      --vmr ${{ parameters.vmrPath }}                                                                 \
+      --tmp $(Agent.TempDirectory)                                                                    \
+      --azdev-pat '$(dn-bot-all-orgs-code-r)'                                                         \
+      --branch ${{ parameters.vmrBranch }}                                                            \
+      --repository "sdk:${{ parameters.targetRef }}"                                                  \
+      --recursive                                                                                     \
+      --remote "sdk:$(Agent.BuildDirectory)/sdk"                                                      \
+      --component-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md      \
+      --tpn-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt \
+      $enable_build_lookup                                                                            \
+      --ci                                                                                            \
+      --debug
+
+    if [ "$?" -ne 0 ]; then
+      echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+      exit 1
+    fi
   displayName: Synchronize dotnet/dotnet (Unix)
   condition: ne(variables['Agent.OS'], 'Windows_NT')
   workingDirectory: $(Agent.BuildDirectory)/sdk
@@ -65,20 +74,24 @@ steps:
   displayName: Disable astextplain in git diff (Windows)
   condition: eq(variables['Agent.OS'], 'Windows_NT')
 
-- powershell: >
+- powershell: |
+    $enableBuildLookup = ""
+    if ('$(Build.Reason)' -ne 'PullRequest' -and '$(System.TeamProject)' -eq 'internal') {
+      $enableBuildLookup = "--enable-build-lookup"
+    }
+
     ./eng/vmr-sync.ps1 `
-    -vmr ${{ parameters.vmrPath }} `
-    -tmp $(Agent.TempDirectory) `
-    -azdevPat '$(dn-bot-all-orgs-code-r)' `
-    -branch ${{ parameters.vmrBranch }} `
-    -repository "sdk:${{ parameters.targetRef }}" `
-    -recursive `
-    # passing remote fails for some reason, but it is the default anyway
-    # -remote "sdk:$(Agent.BuildDirectory)/sdk"
-    -componentTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md `
-    -tpnTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt `
-    -ci
-    -debugOutput
+      -vmr ${{ parameters.vmrPath }} `
+      -tmp $(Agent.TempDirectory) `
+      -azdevPat '$(dn-bot-all-orgs-code-r)' `
+      -branch ${{ parameters.vmrBranch }} `
+      -repository "sdk:${{ parameters.targetRef }}" `
+      -recursive `
+      -componentTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md `
+      -tpnTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt `
+      $enableBuildLookup `
+      -ci `
+      -debugOutput
 
     if ($LASTEXITCODE -ne 0) {
       echo "##vso[task.logissue type=error]Failed to synchronize the VMR"

diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh
@@ -106,6 +106,7 @@ recursive=false
 verbosity=verbose
 component_template="$sdk_dir/src/VirtualMonoRepo/Component.template.md"
 tpn_template="$sdk_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt"
+enable_build_lookup=''
 azdev_pat=''
 ci=false
 
@@ -148,6 +149,9 @@ while [[ $# -gt 0 ]]; do
       tpn_template=$2
       shift
       ;;
+    --enable-build-lookup)
+      enable_build_lookup="--enable-build-lookup"
+      ;;
     --azdev-pat)
       azdev_pat=$2
       shift
@@ -282,6 +286,7 @@ fi
   --tpn-template "$tpn_template"             \
   --discard-patches                          \
   --generate-credscansuppressions            \
+  $enable_build_lookup                       \
   "$repository"
 
 if [[ $? == 0 ]]; then