Skip to content

Commit 410a5bd

Browse files
JL03-YueJL03-Yue
authored
[release/6.0.1xx] Update dependencies from dotnet/arcade (#39497)
2 parents 84dee9f + 9ec921c commit 410a5bd

26 files changed

+1589
-28
lines changed

‎NuGet.config

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,25 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-3b519aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3b519aa7/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-aspnetcore -->
98
<!-- Begin: Package sources from dotnet-runtime -->
109
<add key="darc-int-dotnet-runtime-34a1091" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-34a1091-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914-2/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-34a1091-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914-1/nuget/v3/index.json" />
1112
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1213
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1314
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1415
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1516
<!-- End: Package sources from dotnet-runtime -->
1617
<!-- Begin: Package sources from dotnet-templating -->
1718
<add key="darc-int-dotnet-templating-5603759" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-56037591/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-templating-5603759-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-56037591-2/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-templating-5603759-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-56037591-1/nuget/v3/index.json" />
1821
<!-- End: Package sources from dotnet-templating -->
1922
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2023
<add key="darc-int-dotnet-windowsdesktop-c4a33f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22-2/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22-1/nuget/v3/index.json" />
2126
<!-- End: Package sources from dotnet-windowsdesktop -->
2227
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2328
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -34,17 +39,22 @@
3439
<disabledPackageSources>
3540
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3641
<!-- Begin: Package sources from dotnet-aspnetcore -->
37-
<add key="darc-int-dotnet-aspnetcore-3b519aa" value="true" />
3842
<!-- End: Package sources from dotnet-aspnetcore -->
3943
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4044
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4145
<!-- Begin: Package sources from dotnet-runtime -->
46+
<add key="darc-int-dotnet-runtime-34a1091-1" value="true" />
47+
<add key="darc-int-dotnet-runtime-34a1091-2" value="true" />
4248
<add key="darc-int-dotnet-runtime-34a1091" value="true" />
4349
<!-- End: Package sources from dotnet-runtime -->
4450
<!-- Begin: Package sources from dotnet-templating -->
51+
<add key="darc-int-dotnet-templating-5603759-1" value="true" />
52+
<add key="darc-int-dotnet-templating-5603759-2" value="true" />
4553
<add key="darc-int-dotnet-templating-5603759" value="true" />
4654
<!-- End: Package sources from dotnet-templating -->
4755
<!-- Begin: Package sources from dotnet-windowsdesktop -->
56+
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-1" value="true" />
57+
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-2" value="true" />
4858
<add key="darc-int-dotnet-windowsdesktop-c4a33f2" value="true" />
4959
<!-- End: Package sources from dotnet-windowsdesktop -->
5060
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -292,22 +292,22 @@
292292
</Dependency>
293293
</ProductDependencies>
294294
<ToolsetDependencies>
295-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
295+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24162.4">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
297+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
298298
<SourceBuild RepoName="arcade" ManagedOnly="true" />
299299
</Dependency>
300-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24113.1">
300+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24162.4">
301301
<Uri>https://github.com/dotnet/arcade</Uri>
302-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
302+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
303303
</Dependency>
304-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24113.1">
304+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24162.4">
305305
<Uri>https://github.com/dotnet/arcade</Uri>
306-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
306+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24113.1">
308+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24162.4">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
310+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
311311
</Dependency>
312312
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
313313
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
2828
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
2929
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24113.1</MicrosoftDotNetSignToolVersion>
30+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24162.4</MicrosoftDotNetSignToolVersion>
3131
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3232
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
3333
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -166,7 +166,7 @@
166166
<PropertyGroup>
167167
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
168168
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
169-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24113.1</MicrosoftDotNetXUnitExtensionsVersion>
169+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24162.4</MicrosoftDotNetXUnitExtensionsVersion>
170170
<MoqPackageVersion>4.8.2</MoqPackageVersion>
171171
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.21376.2</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
172172
</PropertyGroup>

‎eng/common/SetupNugetSources.ps1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0
3535
. $PSScriptRoot\tools.ps1
3636

3737
# Add source entry to PackageSources
38-
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
38+
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
3939
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
4040

4141
if ($packageSource -eq $null)
@@ -49,11 +49,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4949
Write-Host "Package source $SourceName already present."
5050
}
5151

52-
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
52+
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $pwd
5353
}
5454

5555
# Add a credential node for the specified source
56-
function AddCredential($creds, $source, $username, $password) {
56+
function AddCredential($creds, $source, $username, $pwd) {
5757
# Looks for credential configuration for the given SourceName. Create it if none is found.
5858
$sourceElement = $creds.SelectSingleNode($Source)
5959
if ($sourceElement -eq $null)
@@ -82,17 +82,17 @@ function AddCredential($creds, $source, $username, $password) {
8282
$passwordElement.SetAttribute("key", "ClearTextPassword")
8383
$sourceElement.AppendChild($passwordElement) | Out-Null
8484
}
85-
$passwordElement.SetAttribute("value", $Password)
85+
$passwordElement.SetAttribute("value", $pwd)
8686
}
8787

88-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
88+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
8989
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
9090

9191
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
9292

9393
ForEach ($PackageSource in $maestroPrivateSources) {
9494
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
95-
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
95+
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
9696
}
9797
}
9898

@@ -144,24 +144,24 @@ if ($disabledSources -ne $null) {
144144
$userName = "dn-bot"
145145

146146
# Insert credential nodes for Maestro's private feeds
147-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
147+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
148148

149149
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
150150
if ($dotnet31Source -ne $null) {
151-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
152-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
151+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
152+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
153153
}
154154

155155
$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']")
156156
if ($dotnet5Source -ne $null) {
157-
AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
158-
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
157+
AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158+
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
159159
}
160160

161161
$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
162162
if ($dotnet6Source -ne $null) {
163-
AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
164-
AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
163+
AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
164+
AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
165165
}
166166

167167
$doc.Save($filename)

0 commit comments

Comments
 (0)