Skip to content

Commit 08bfd35

Browse files
JL03-YueJL03-Yue
authored
[release/6.0.4xx] Update dependencies from dotnet/arcade (#39498)
2 parents fce76e9 + 6a42f1e commit 08bfd35

26 files changed

+1588
-27
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-msbuild-Trusted -->
109
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1110
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1211
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1312
<!-- Begin: Package sources from dotnet-runtime -->
1413
<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" />
14+
<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" />
15+
<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" />
1516
<!-- End: Package sources from dotnet-runtime -->
1617
<!-- Begin: Package sources from dotnet-templating -->
1718
<add key="darc-int-dotnet-templating-d6969ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d6969bae/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-templating-d6969ba-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d6969bae-2/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-templating-d6969ba-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d6969bae-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" />
@@ -37,15 +42,20 @@
3742
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3843
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3944
<!-- Begin: Package sources from dotnet-templating -->
45+
<add key="darc-int-dotnet-templating-d6969ba-1" value="true" />
46+
<add key="darc-int-dotnet-templating-d6969ba-2" value="true" />
4047
<add key="darc-int-dotnet-templating-d6969ba" value="true" />
4148
<!-- End: Package sources from dotnet-templating -->
4249
<!-- Begin: Package sources from dotnet-aspnetcore -->
43-
<add key="darc-int-dotnet-aspnetcore-3b519aa" value="true" />
4450
<!-- End: Package sources from dotnet-aspnetcore -->
4551
<!-- Begin: Package sources from dotnet-runtime -->
52+
<add key="darc-int-dotnet-runtime-34a1091-1" value="true" />
53+
<add key="darc-int-dotnet-runtime-34a1091-2" value="true" />
4654
<add key="darc-int-dotnet-runtime-34a1091" value="true" />
4755
<!-- End: Package sources from dotnet-runtime -->
4856
<!-- Begin: Package sources from dotnet-windowsdesktop -->
57+
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-1" value="true" />
58+
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-2" value="true" />
4959
<add key="darc-int-dotnet-windowsdesktop-c4a33f2" value="true" />
5060
<!-- End: Package sources from dotnet-windowsdesktop -->
5161
<!--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
@@ -291,22 +291,22 @@
291291
</Dependency>
292292
</ProductDependencies>
293293
<ToolsetDependencies>
294-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
294+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24162.4">
295295
<Uri>https://github.com/dotnet/arcade</Uri>
296-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
296+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
297297
<SourceBuild RepoName="arcade" ManagedOnly="true" />
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24113.1">
299+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24162.4">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
301+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24113.1">
303+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24162.4">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
305+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24113.1">
307+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24162.4">
308308
<Uri>https://github.com/dotnet/arcade</Uri>
309-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
309+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
310310
</Dependency>
311311
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
312312
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3030
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
3131
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
32-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24113.1</MicrosoftDotNetSignToolVersion>
32+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24162.4</MicrosoftDotNetSignToolVersion>
3333
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3434
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3535
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
@@ -173,7 +173,7 @@
173173
<PropertyGroup>
174174
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
175175
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
176-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24113.1</MicrosoftDotNetXUnitExtensionsVersion>
176+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24162.4</MicrosoftDotNetXUnitExtensionsVersion>
177177
<MoqPackageVersion>4.8.2</MoqPackageVersion>
178178
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
179179
</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)