Skip to content

Commit da96e1a

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 38107: [internal/release/6.0] Merge from public
Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary
2 parents dd340b1 + 3570d8b commit da96e1a

25 files changed

+1576
-25
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>34a109148c7d8a2c8e6431e83e4bce5712dd8083</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24162.4">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
285+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24113.1">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24162.4">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
290+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24113.1">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24162.4">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
294+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24113.1">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24162.4">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
298+
<Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.29</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.29</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24162.4</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24162.4</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎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)