Skip to content

Commit d2982bd

Browse files
premunpremun
authored
[release/9.0.1xx] Bump darc (#49444)
1 parent 0684351 commit d2982bd

File tree

7 files changed

+6
-48
lines changed

7 files changed

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

‎NuGet.config

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,20 @@
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" />
2827
<!-- End: Package sources from dotnet-emsdk -->
2928
<!-- 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" />
3129
<!-- End: Package sources from dotnet-aspnetcore -->
3230
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3331
<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" />
3432
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3533
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3634
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3735
<!-- 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" />
3936
<!-- End: Package sources from dotnet-runtime -->
4037
<!-- 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" />
4338
<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" />
4439
<!-- End: Package sources from dotnet-templating -->
4540
<!-- 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" />
4741
<!-- End: Package sources from dotnet-windowsdesktop -->
4842
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4943
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -70,16 +64,12 @@
7064
<!-- Begin: Package sources from dotnet-templating -->
7165
<!-- End: Package sources from dotnet-templating -->
7266
<!-- Begin: Package sources from dotnet-aspnetcore -->
73-
<add key="darc-int-dotnet-aspnetcore-379bfc7" value="true" />
7467
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
75-
<add key="darc-int-DotNet-msbuild-Trusted-13c590f" value="true" />
7668
<!-- End: Package sources from DotNet-msbuild-Trusted -->
7769
<!-- End: Package sources from dotnet-aspnetcore -->
7870
<!-- Begin: Package sources from dotnet-runtime -->
79-
<add key="darc-int-dotnet-runtime-3875b54" value="true" />
8071
<!-- End: Package sources from dotnet-runtime -->
8172
<!-- Begin: Package sources from dotnet-windowsdesktop -->
82-
<add key="darc-int-dotnet-windowsdesktop-c7cc0b3" value="true" />
8373
<!-- End: Package sources from dotnet-windowsdesktop -->
8474
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8575
</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.24367.3">
626+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25312.2">
627627
<Uri>https://github.com/dotnet/arcade-services</Uri>
628-
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
628+
<Sha>ddbab8acf544cc1762d5552f6f7e4eaf20429e9b</Sha>
629629
</Dependency>
630-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24367.3">
630+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25312.2">
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632-
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
632+
<Sha>ddbab8acf544cc1762d5552f6f7e4eaf20429e9b</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.24367.3</MicrosoftDotNetDarcLibVersion>
76+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25312.2</MicrosoftDotNetDarcLibVersion>
7777
</PropertyGroup>
7878
<PropertyGroup>
7979
<!-- Dependency from https://github.com/dotnet/winforms -->

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ 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
6160
--tpn-template $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
6261
--debug
6362
||
@@ -78,9 +77,6 @@ steps:
7877
-branch ${{ parameters.vmrBranch }} `
7978
-repository "sdk:${{ parameters.targetRef }}" `
8079
-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 `
8480
-tpnTemplate $(Agent.BuildDirectory)/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt `
8581
-debugOutput
8682

‎eng/vmr-sync.ps1

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ 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-
4035
.PARAMETER recursive
4136
Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml)
4237
This is used when performing the full synchronization during sdk's CI and the final VMR sync.
@@ -70,7 +65,6 @@ param (
7065
[Parameter(Mandatory=$true, HelpMessage="Path to the temporary folder where repositories will be cloned")]
7166
[string][Alias('t', 'tmp')]$tmpDir,
7267
[string][Alias('b', 'branch')]$vmrBranch,
73-
[string]$componentTemplate = "src/VirtualMonoRepo/Component.template.md",
7468
[switch]$recursive,
7569
[string]$remote,
7670
[string][Alias('r')]$repository,
@@ -117,11 +111,6 @@ if (-not $tmpDir) {
117111
exit 1
118112
}
119113

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-
125114
if (-not (Test-Path -Path $tpnTemplate -PathType Leaf)) {
126115
Fail "File '$tpnTemplate' does not exist. Please specify a valid path to the THIRD-PARTY-NOTICES template"
127116
exit 1
@@ -184,7 +173,6 @@ $darcArgs = (
184173
"--vmr", $vmrDir,
185174
"--tmp", $tmpDir,
186175
"--$verbosity",
187-
"--component-template", $componentTemplate,
188176
"--tpn-template", $tpnTemplate,
189177
"--discard-patches",
190178
"--generate-credscansuppressions",

‎eng/vmr-sync.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
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-
###
4136
### --recursive
4237
### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml)
4338
### This is used when performing the full synchronization during sdk's CI and the final VMR sync.
@@ -104,7 +99,6 @@ repository=''
10499
additional_remotes=''
105100
recursive=false
106101
verbosity=verbose
107-
component_template="$sdk_dir/src/VirtualMonoRepo/Component.template.md"
108102
tpn_template="$sdk_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt"
109103
azdev_pat=''
110104

@@ -139,10 +133,6 @@ while [[ $# -gt 0 ]]; do
139133
additional_remotes="$additional_remotes $2"
140134
shift
141135
;;
142-
--component-template)
143-
component_template=$2
144-
shift
145-
;;
146136
--tpn-template)
147137
tpn_template=$2
148138
shift
@@ -180,11 +170,6 @@ if [[ -z "$tmp_dir" ]]; then
180170
exit 1
181171
fi
182172

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-
188173
if [[ ! -f "$tpn_template" ]]; then
189174
fail "File '$tpn_template' does not exist. Please specify a valid path to the THIRD-PARTY-NOTICES template"
190175
exit 1
@@ -268,7 +253,6 @@ fi
268253
--$verbosity \
269254
$recursive_arg \
270255
$additional_remotes \
271-
--component-template "$component_template" \
272256
--tpn-template "$tpn_template" \
273257
--discard-patches \
274258
--generate-credscansuppressions \

0 commit comments

Comments
 (0)