Skip to content

Commit cb21681

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade-services (#45301)
[main] Update dependencies from dotnet/arcade-services - Turn on build look up for internal sync - Use and
1 parent 274038a commit cb21681

File tree

5 files changed

+52
-34
lines changed

5 files changed

+52
-34
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.24577.1",
6+
"version": "1.1.0-beta.24603.4",
77
"commands": [
88
"darc"
99
]

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -623,13 +623,13 @@
623623
<Uri>https://github.com/dotnet/runtime</Uri>
624624
<Sha>b66200e5448be50673b0387ca4632d3bfa25887b</Sha>
625625
</Dependency>
626-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24577.1">
626+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24603.4">
627627
<Uri>https://github.com/dotnet/arcade-services</Uri>
628-
<Sha>127f7b095d9e345f7fb1477c79923b91c4cc9a69</Sha>
628+
<Sha>67e3a0d7ef4eb3054898e07e952442a4b09c8971</Sha>
629629
</Dependency>
630-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24577.1">
630+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24603.4">
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632-
<Sha>127f7b095d9e345f7fb1477c79923b91c4cc9a69</Sha>
632+
<Sha>67e3a0d7ef4eb3054898e07e952442a4b09c8971</Sha>
633633
</Dependency>
634634
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="10.0.0-preview.24602.1">
635635
<Uri>https://github.com/dotnet/scenario-tests</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</PropertyGroup>
9393
<PropertyGroup>
9494
<!-- Dependency from https://github.com/dotnet/arcade-services -->
95-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24577.1</MicrosoftDotNetDarcLibVersion>
95+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24603.4</MicrosoftDotNetDarcLibVersion>
9696
</PropertyGroup>
9797
<PropertyGroup>
9898
<!-- Dependency from https://github.com/dotnet/winforms -->

‎eng/pipelines/templates/steps/vmr-pull-updates.yml‎

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,30 @@ steps:
4242
displayName: Set git author to dotnet-maestro[bot]
4343
workingDirectory: ${{ parameters.vmrPath }}
4444

45-
- script: >
46-
./eng/vmr-sync.sh
47-
--vmr ${{ parameters.vmrPath }}
48-
--tmp $(Agent.TempDirectory)
49-
--azdev-pat '$(dn-bot-all-orgs-code-r)'
50-
--branch ${{ parameters.vmrBranch }}
51-
--repository "sdk:${{ parameters.targetRef }}"
52-
--recursive
53-
--remote "sdk:$(Agent.BuildDirectory)/sdk"
54-
--component-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md
55-
--tpn-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
56-
--ci
57-
--debug
58-
||
59-
(echo "##vso[task.logissue type=error]Failed to synchronize the VMR" && exit 1)
45+
- script: |
46+
enable_build_lookup=''
47+
if [ "$(Build.Reason)" != 'PullRequest' ] && [ "$(System.TeamProject)" == 'internal' ]; then
48+
enable_build_lookup='--enable-build-lookup'
49+
fi
50+
51+
./eng/vmr-sync.sh \
52+
--vmr ${{ parameters.vmrPath }} \
53+
--tmp $(Agent.TempDirectory) \
54+
--azdev-pat '$(dn-bot-all-orgs-code-r)' \
55+
--branch ${{ parameters.vmrBranch }} \
56+
--repository "sdk:${{ parameters.targetRef }}" \
57+
--recursive \
58+
--remote "sdk:$(Agent.BuildDirectory)/sdk" \
59+
--component-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md \
60+
--tpn-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt \
61+
$enable_build_lookup \
62+
--ci \
63+
--debug
64+
65+
if [ "$?" -ne 0 ]; then
66+
echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
67+
exit 1
68+
fi
6069
displayName: Synchronize dotnet/dotnet (Unix)
6170
condition: ne(variables['Agent.OS'], 'Windows_NT')
6271
workingDirectory: $(Agent.BuildDirectory)/sdk
@@ -65,20 +74,24 @@ steps:
6574
displayName: Disable astextplain in git diff (Windows)
6675
condition: eq(variables['Agent.OS'], 'Windows_NT')
6776

68-
- powershell: >
77+
- powershell: |
78+
$enableBuildLookup = ""
79+
if ('$(Build.Reason)' -ne 'PullRequest' -and '$(System.TeamProject)' -eq 'internal') {
80+
$enableBuildLookup = "--enable-build-lookup"
81+
}
82+
6983
./eng/vmr-sync.ps1 `
70-
-vmr ${{ parameters.vmrPath }} `
71-
-tmp $(Agent.TempDirectory) `
72-
-azdevPat '$(dn-bot-all-orgs-code-r)' `
73-
-branch ${{ parameters.vmrBranch }} `
74-
-repository "sdk:${{ parameters.targetRef }}" `
75-
-recursive `
76-
# passing remote fails for some reason, but it is the default anyway
77-
# -remote "sdk:$(Agent.BuildDirectory)/sdk"
78-
-componentTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md `
79-
-tpnTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt `
80-
-ci
81-
-debugOutput
84+
-vmr ${{ parameters.vmrPath }} `
85+
-tmp $(Agent.TempDirectory) `
86+
-azdevPat '$(dn-bot-all-orgs-code-r)' `
87+
-branch ${{ parameters.vmrBranch }} `
88+
-repository "sdk:${{ parameters.targetRef }}" `
89+
-recursive `
90+
-componentTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md `
91+
-tpnTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt `
92+
$enableBuildLookup `
93+
-ci `
94+
-debugOutput
8295
8396
if ($LASTEXITCODE -ne 0) {
8497
echo "##vso[task.logissue type=error]Failed to synchronize the VMR"

‎eng/vmr-sync.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ recursive=false
106106
verbosity=verbose
107107
component_template="$sdk_dir/src/VirtualMonoRepo/Component.template.md"
108108
tpn_template="$sdk_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt"
109+
enable_build_lookup=''
109110
azdev_pat=''
110111
ci=false
111112

@@ -148,6 +149,9 @@ while [[ $# -gt 0 ]]; do
148149
tpn_template=$2
149150
shift
150151
;;
152+
--enable-build-lookup)
153+
enable_build_lookup="--enable-build-lookup"
154+
;;
151155
--azdev-pat)
152156
azdev_pat=$2
153157
shift
@@ -282,6 +286,7 @@ fi
282286
--tpn-template "$tpn_template" \
283287
--discard-patches \
284288
--generate-credscansuppressions \
289+
$enable_build_lookup \
285290
"$repository"
286291

287292
if [[ $? == 0 ]]; then

0 commit comments

Comments
 (0)