Skip to content

Commit 5b9983e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/8.0.2xx] Update dependencies from dotnet/arcade (#19106)
[release/8.0.2xx] Update dependencies from dotnet/arcade
1 parent c9ea808 commit 5b9983e

31 files changed

+1786
-33
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,17 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-aspnetcore -->
10-
<add key="darc-int-dotnet-aspnetcore-88ec3bc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-88ec3bc3/nuget/v3/index.json" />
1110
<!-- End: Package sources from dotnet-aspnetcore -->
1211
<!-- Begin: Package sources from dotnet-emsdk -->
13-
<add key="darc-pub-dotnet-emsdk-9a29abd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9a29abdd/nuget/v3/index.json" />
1412
<!-- End: Package sources from dotnet-emsdk -->
1513
<!-- Begin: Package sources from dotnet-windowsdesktop -->
16-
<add key="darc-int-dotnet-windowsdesktop-baf3c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-baf3c0df/nuget/v3/index.json" />
1714
<!-- End: Package sources from dotnet-windowsdesktop -->
1815
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
19-
<add key="darc-pub-DotNet-msbuild-Trusted-a4ecab3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a4ecab32/nuget/v3/index.json" />
16+
<add key="darc-pub-DotNet-msbuild-Trusted-a4ecab3-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a4ecab32-1/nuget/v3/index.json" />
2017
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2118
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-9f4b1f5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9f4b1f5d/nuget/v3/index.json" />
2319
<!-- End: Package sources from dotnet-runtime -->
2420
<!-- Begin: Package sources from dotnet-sdk -->
25-
<add key="darc-int-dotnet-sdk-eb70f97" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-eb70f97f/nuget/v3/index.json" />
2621
<!-- End: Package sources from dotnet-sdk -->
2722
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2823
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -42,15 +37,11 @@
4237
<disabledPackageSources>
4338
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4439
<!-- Begin: Package sources from dotnet-aspnetcore -->
45-
<add key="darc-int-dotnet-aspnetcore-88ec3bc" value="true" />
4640
<!-- End: Package sources from dotnet-aspnetcore -->
4741
<!-- Begin: Package sources from dotnet-runtime -->
48-
<add key="darc-int-dotnet-runtime-9f4b1f5" value="true" />
4942
<!-- Begin: Package sources from dotnet-sdk -->
50-
<add key="darc-int-dotnet-sdk-eb70f97" value="true" />
5143
<!-- End: Package sources from dotnet-sdk -->
5244
<!-- Begin: Package sources from dotnet-windowsdesktop -->
53-
<add key="darc-int-dotnet-windowsdesktop-baf3c0d" value="true" />
5445
<!-- End: Package sources from dotnet-windowsdesktop -->
5546
<!-- End: Package sources from dotnet-runtime -->
5647
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@
214214
</Dependency>
215215
</ProductDependencies>
216216
<ToolsetDependencies>
217-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24113.2">
217+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24165.4">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
219+
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
220220
<SourceBuild RepoName="arcade" ManagedOnly="true" />
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24113.2">
222+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24165.4">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
224+
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24113.2">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24165.4">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
228+
<Sha>f311667e0587f19c3fa9553a909975662107a351</Sha>
229229
</Dependency>
230230
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
231231
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</PropertyGroup>
4141
<PropertyGroup>
4242
<!-- Dependency from https://github.com/dotnet/arcade -->
43-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
43+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24165.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4444
</PropertyGroup>
4545
<PropertyGroup>
4646
<!-- Dependency from https://github.com/dotnet/arcade-services -->

‎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)
@@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4848
else {
4949
Write-Host "Package source $SourceName already present."
5050
}
51-
52-
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
51+
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
5352
}
5453

5554
# Add a credential node for the specified source
56-
function AddCredential($creds, $source, $username, $password) {
55+
function AddCredential($creds, $source, $username, $pwd) {
5756
# Looks for credential configuration for the given SourceName. Create it if none is found.
5857
$sourceElement = $creds.SelectSingleNode($Source)
5958
if ($sourceElement -eq $null)
@@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) {
8281
$passwordElement.SetAttribute("key", "ClearTextPassword")
8382
$sourceElement.AppendChild($passwordElement) | Out-Null
8483
}
85-
$passwordElement.SetAttribute("value", $Password)
84+
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,13 +144,13 @@ 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
# 3.1 uses a different feed url format so it's handled differently here
150150
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
151151
if ($dotnet31Source -ne $null) {
152-
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
153-
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
152+
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
153+
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
154154
}
155155

156156
$dotnetVersions = @('5','6','7','8')
@@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;
160160
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161161
if ($dotnetSource -ne $null) {
162-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
163-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
162+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
163+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
164164
}
165165
}
166166

167-
$doc.Save($filename)
167+
$doc.Save($filename)

0 commit comments

Comments
 (0)