Skip to content

Commit 7e40221

Browse files
premunpremun
authored
[release/9.0.1xx] Bump darc again (#49453)
1 parent d2982bd commit 7e40221

File tree

7 files changed

+48
-6
lines changed

7 files changed

+48
-6
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.25312.2",
6+
"version": "1.1.0-beta.25317.4",
77
"commands": [
88
"darc"
99
]

‎NuGet.config

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,26 @@
2424
<!-- Begin: Package sources from dotnet-aspire -->
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-emsdk -->
27+
<add key="darc-pub-dotnet-emsdk-e3d8e8e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e3d8e8ea/nuget/v3/index.json" />
2728
<!-- End: Package sources from dotnet-emsdk -->
2829
<!-- Begin: Package sources from dotnet-aspnetcore -->
30+
<add key="darc-int-dotnet-aspnetcore-379bfc7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-379bfc7b/nuget/v3/index.json" />
2931
<!-- End: Package sources from dotnet-aspnetcore -->
3032
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3133
<add key="darc-pub-DotNet-msbuild-Trusted-590305f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-590305fc/nuget/v3/index.json" />
3234
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3335
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3436
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3537
<!-- Begin: Package sources from dotnet-runtime -->
38+
<add key="darc-int-dotnet-runtime-3875b54" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3875b54e/nuget/v3/index.json" />
3639
<!-- End: Package sources from dotnet-runtime -->
3740
<!-- Begin: Package sources from dotnet-templating -->
41+
<add key="darc-pub-dotnet-templating-0c96b36" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0c96b36c/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-1a9d00e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1a9d00e8/nuget/v3/index.json" />
3843
<add key="darc-pub-dotnet-templating-088027f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-088027fb/nuget/v3/index.json" />
3944
<!-- End: Package sources from dotnet-templating -->
4045
<!-- Begin: Package sources from dotnet-windowsdesktop -->
46+
<add key="darc-int-dotnet-windowsdesktop-c7cc0b3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c7cc0b3d/nuget/v3/index.json" />
4147
<!-- End: Package sources from dotnet-windowsdesktop -->
4248
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4349
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -64,12 +70,16 @@
6470
<!-- Begin: Package sources from dotnet-templating -->
6571
<!-- End: Package sources from dotnet-templating -->
6672
<!-- Begin: Package sources from dotnet-aspnetcore -->
73+
<add key="darc-int-dotnet-aspnetcore-379bfc7" value="true" />
6774
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
75+
<add key="darc-int-DotNet-msbuild-Trusted-13c590f" value="true" />
6876
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6977
<!-- End: Package sources from dotnet-aspnetcore -->
7078
<!-- Begin: Package sources from dotnet-runtime -->
79+
<add key="darc-int-dotnet-runtime-3875b54" value="true" />
7180
<!-- End: Package sources from dotnet-runtime -->
7281
<!-- Begin: Package sources from dotnet-windowsdesktop -->
82+
<add key="darc-int-dotnet-windowsdesktop-c7cc0b3" value="true" />
7383
<!-- End: Package sources from dotnet-windowsdesktop -->
7484
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
7585
</disabledPackageSources>

‎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://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
624624
<Sha>3875b54e7b10b10606b105340199946d0b877754</Sha>
625625
</Dependency>
626-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25312.2">
626+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25317.4">
627627
<Uri>https://github.com/dotnet/arcade-services</Uri>
628-
<Sha>ddbab8acf544cc1762d5552f6f7e4eaf20429e9b</Sha>
628+
<Sha>e156e649f28395d9d0ee1e848225a689b59e0fd3</Sha>
629629
</Dependency>
630-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25312.2">
630+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25317.4">
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632-
<Sha>ddbab8acf544cc1762d5552f6f7e4eaf20429e9b</Sha>
632+
<Sha>e156e649f28395d9d0ee1e848225a689b59e0fd3</Sha>
633633
</Dependency>
634634
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25316.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
@@ -73,7 +73,7 @@
7373
</PropertyGroup>
7474
<PropertyGroup>
7575
<!-- Dependency from https://github.com/dotnet/arcade-services -->
76-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25312.2</MicrosoftDotNetDarcLibVersion>
76+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25317.4</MicrosoftDotNetDarcLibVersion>
7777
</PropertyGroup>
7878
<PropertyGroup>
7979
<!-- Dependency from https://github.com/dotnet/winforms -->

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ steps:
5757
--repository "sdk:${{ parameters.targetRef }}"
5858
--recursive
5959
--remote "sdk:$(Agent.BuildDirectory)/sdk"
60+
--component-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md
6061
--tpn-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
6162
--debug
6263
||
@@ -77,6 +78,9 @@ steps:
7778
-branch ${{ parameters.vmrBranch }} `
7879
-repository "sdk:${{ parameters.targetRef }}" `
7980
-recursive `
81+
# passing remote fails for some reason, but it is the default anyway
82+
# -remote "sdk:$(Agent.BuildDirectory)/sdk"
83+
-componentTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/Component.template.md `
8084
-tpnTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt `
8185
-debugOutput
8286

‎eng/vmr-sync.ps1

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ Required. Path to the temporary folder where repositories will be cloned
3232
.PARAMETER vmrBranch
3333
Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch
3434
35+
.PARAMETER component-template
36+
Optional. Template for VMRs Component.md used for regenerating the file to list the newest versions of
37+
components.
38+
Defaults to src/VirtualMonoRepo/Component.template.md
39+
3540
.PARAMETER recursive
3641
Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml)
3742
This is used when performing the full synchronization during sdk's CI and the final VMR sync.
@@ -65,6 +70,7 @@ param (
6570
[Parameter(Mandatory=$true, HelpMessage="Path to the temporary folder where repositories will be cloned")]
6671
[string][Alias('t', 'tmp')]$tmpDir,
6772
[string][Alias('b', 'branch')]$vmrBranch,
73+
[string]$componentTemplate = "src/VirtualMonoRepo/Component.template.md",
6874
[switch]$recursive,
6975
[string]$remote,
7076
[string][Alias('r')]$repository,
@@ -111,6 +117,11 @@ if (-not $tmpDir) {
111117
exit 1
112118
}
113119

120+
if (-not (Test-Path -Path $componentTemplate -PathType Leaf)) {
121+
Fail "File '$componentTemplate' does not exist. Please specify a valid path to the component template"
122+
exit 1
123+
}
124+
114125
if (-not (Test-Path -Path $tpnTemplate -PathType Leaf)) {
115126
Fail "File '$tpnTemplate' does not exist. Please specify a valid path to the THIRD-PARTY-NOTICES template"
116127
exit 1
@@ -173,6 +184,7 @@ $darcArgs = (
173184
"--vmr", $vmrDir,
174185
"--tmp", $tmpDir,
175186
"--$verbosity",
187+
"--component-template", $componentTemplate,
176188
"--tpn-template", $tpnTemplate,
177189
"--discard-patches",
178190
"--generate-credscansuppressions",

‎eng/vmr-sync.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
### --debug
3434
### Optional. Turns on the most verbose logging for the VMR tooling
3535
###
36+
### --component-template
37+
### Optional. Template for VMRs Component.md used for regenerating the file to list the newest versions of
38+
### components.
39+
### Defaults to src/VirtualMonoRepo/Component.template.md
40+
###
3641
### --recursive
3742
### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml)
3843
### This is used when performing the full synchronization during sdk's CI and the final VMR sync.
@@ -99,6 +104,7 @@ repository=''
99104
additional_remotes=''
100105
recursive=false
101106
verbosity=verbose
107+
component_template="$sdk_dir/src/VirtualMonoRepo/Component.template.md"
102108
tpn_template="$sdk_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt"
103109
azdev_pat=''
104110

@@ -133,6 +139,10 @@ while [[ $# -gt 0 ]]; do
133139
additional_remotes="$additional_remotes $2"
134140
shift
135141
;;
142+
--component-template)
143+
component_template=$2
144+
shift
145+
;;
136146
--tpn-template)
137147
tpn_template=$2
138148
shift
@@ -170,6 +180,11 @@ if [[ -z "$tmp_dir" ]]; then
170180
exit 1
171181
fi
172182

183+
if [[ ! -f "$component_template" ]]; then
184+
fail "File '$component_template' does not exist. Please specify a valid path to the Component.md template"
185+
exit 1
186+
fi
187+
173188
if [[ ! -f "$tpn_template" ]]; then
174189
fail "File '$tpn_template' does not exist. Please specify a valid path to the THIRD-PARTY-NOTICES template"
175190
exit 1
@@ -253,6 +268,7 @@ fi
253268
--$verbosity \
254269
$recursive_arg \
255270
$additional_remotes \
271+
--component-template "$component_template" \
256272
--tpn-template "$tpn_template" \
257273
--discard-patches \
258274
--generate-credscansuppressions \

0 commit comments

Comments
 (0)