Skip to content

Commit 6ceca61

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 20251021.7 (#681)
On relative base path root Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.linux-x64 , Microsoft.NET.Runtime.Emscripten.3.1.56.Node.linux-x64 , Microsoft.NET.Runtime.Emscripten.3.1.56.Sdk.linux-x64 From Version 10.0.0-rc.2.25420.109 -> To Version 10.0.0 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25420.109 -> To Version 10.0.0-beta.25521.107 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 0b639fd commit 6ceca61

File tree

13 files changed

+190
-135
lines changed

13 files changed

+190
-135
lines changed

NuGet.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
</solution>
66
<packageSources>
77
<clear />
8+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
9+
<!-- Begin: Package sources from dotnet-dotnet -->
10+
<add key="darc-pub-dotnet-dotnet-44c449a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-44c449ac/nuget/v3/index.json" />
11+
<!-- End: Package sources from dotnet-dotnet -->
12+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
813
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
914
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1015
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25420.109">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25521.107">
77
<Uri>https://github.com/dotnet/dotnet</Uri>
8-
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
8+
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25420.109">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25521.107">
1111
<Uri>https://github.com/dotnet/dotnet</Uri>
12-
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
12+
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25420.109">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25521.107">
1515
<Uri>https://github.com/dotnet/dotnet</Uri>
16-
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
16+
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Node.linux-x64" Version="10.0.0-rc.2.25420.109">
18+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Node.linux-x64" Version="10.0.0">
1919
<Uri>https://github.com/dotnet/dotnet</Uri>
20-
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
20+
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Sdk.linux-x64" Version="10.0.0-rc.2.25420.109">
22+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Sdk.linux-x64" Version="10.0.0">
2323
<Uri>https://github.com/dotnet/dotnet</Uri>
24-
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
24+
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.linux-x64" Version="10.0.0-rc.2.25420.109">
26+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.linux-x64" Version="10.0.0">
2727
<Uri>https://github.com/dotnet/dotnet</Uri>
28-
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
28+
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
2929
</Dependency>
3030
</ToolsetDependencies>
3131
</Dependencies>

eng/Versions.props

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
<PropertyGroup>
44
<VersionPrefix>10.0.0</VersionPrefix>
55
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
6-
<PreReleaseVersionIteration></PreReleaseVersionIteration>
6+
<PreReleaseVersionIteration>
7+
</PreReleaseVersionIteration>
78
</PropertyGroup>
89
<PropertyGroup>
910
<!-- emsdk -->
10-
<MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version>10.0.0-rc.2.25420.109</MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version>
11-
<MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>10.0.0-rc.2.25420.109</MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>
12-
<MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>10.0.0-rc.2.25420.109</MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>
11+
<MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version>10.0.0</MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version>
12+
<MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>10.0.0</MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>
13+
<MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>10.0.0</MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>
1314
<!-- arcade -->
14-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25420.109</MicrosoftDotNetBuildTasksPackagingVersion>
15+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25521.107</MicrosoftDotNetBuildTasksPackagingVersion>
1516
</PropertyGroup>
1617
<PropertyGroup>
1718
<WasiSdkVersion>16</WasiSdkVersion>

eng/common/SetupNugetSources.ps1

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# See example call for this script below.
88
#
99
# - task: PowerShell@2
10-
# displayName: Setup Private Feeds Credentials
10+
# displayName: Setup internal Feeds Credentials
1111
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212
# inputs:
1313
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
@@ -34,19 +34,28 @@ Set-StrictMode -Version 2.0
3434

3535
. $PSScriptRoot\tools.ps1
3636

37+
# Adds or enables the package source with the given name
38+
function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
39+
if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) {
40+
AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password
41+
}
42+
}
43+
3744
# Add source entry to PackageSources
3845
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
3946
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
4047

4148
if ($packageSource -eq $null)
4249
{
50+
Write-Host "Adding package source $SourceName"
51+
4352
$packageSource = $doc.CreateElement("add")
4453
$packageSource.SetAttribute("key", $SourceName)
4554
$packageSource.SetAttribute("value", $SourceEndPoint)
4655
$sources.AppendChild($packageSource) | Out-Null
4756
}
4857
else {
49-
Write-Host "Package source $SourceName already present."
58+
Write-Host "Package source $SourceName already present and enabled."
5059
}
5160

5261
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
@@ -59,6 +68,8 @@ function AddCredential($creds, $source, $username, $pwd) {
5968
return;
6069
}
6170

71+
Write-Host "Inserting credential for feed: " $source
72+
6273
# Looks for credential configuration for the given SourceName. Create it if none is found.
6374
$sourceElement = $creds.SelectSingleNode($Source)
6475
if ($sourceElement -eq $null)
@@ -91,24 +102,27 @@ function AddCredential($creds, $source, $username, $pwd) {
91102
$passwordElement.SetAttribute("value", $pwd)
92103
}
93104

94-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
95-
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
96-
97-
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
98-
99-
ForEach ($PackageSource in $maestroPrivateSources) {
100-
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
101-
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
105+
# Enable all darc-int package sources.
106+
function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) {
107+
$maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
108+
ForEach ($DisabledPackageSource in $maestroInternalSources) {
109+
EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key
102110
}
103111
}
104112

105-
function EnablePrivatePackageSources($DisabledPackageSources) {
106-
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
107-
ForEach ($DisabledPackageSource in $maestroPrivateSources) {
108-
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
113+
# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise.
114+
function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) {
115+
$DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']")
116+
if ($DisabledPackageSource) {
117+
Write-Host "Enabling internal source '$($DisabledPackageSource.key)'."
118+
109119
# Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
110120
$DisabledPackageSources.RemoveChild($DisabledPackageSource)
121+
122+
AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password
123+
return $true
111124
}
125+
return $false
112126
}
113127

114128
if (!(Test-Path $ConfigFile -PathType Leaf)) {
@@ -121,15 +135,17 @@ $doc = New-Object System.Xml.XmlDocument
121135
$filename = (Get-Item $ConfigFile).FullName
122136
$doc.Load($filename)
123137

124-
# Get reference to <PackageSources> or create one if none exist already
138+
# Get reference to <PackageSources> - fail if none exist
125139
$sources = $doc.DocumentElement.SelectSingleNode("packageSources")
126140
if ($sources -eq $null) {
127-
$sources = $doc.CreateElement("packageSources")
128-
$doc.DocumentElement.AppendChild($sources) | Out-Null
141+
Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile"
142+
ExitWithExitCode 1
129143
}
130144

131145
$creds = $null
146+
$feedSuffix = "v3/index.json"
132147
if ($Password) {
148+
$feedSuffix = "v2"
133149
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
134150
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
135151
if ($creds -eq $null) {
@@ -138,33 +154,22 @@ if ($Password) {
138154
}
139155
}
140156

157+
$userName = "dn-bot"
158+
141159
# Check for disabledPackageSources; we'll enable any darc-int ones we find there
142160
$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources")
143161
if ($disabledSources -ne $null) {
144162
Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
145-
EnablePrivatePackageSources -DisabledPackageSources $disabledSources
146-
}
147-
148-
$userName = "dn-bot"
149-
150-
# Insert credential nodes for Maestro's private feeds
151-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
152-
153-
# 3.1 uses a different feed url format so it's handled differently here
154-
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
155-
if ($dotnet31Source -ne $null) {
156-
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
157-
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
163+
EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds
158164
}
159-
160-
$dotnetVersions = @('5','6','7','8','9')
165+
$dotnetVersions = @('5','6','7','8','9','10')
161166

162167
foreach ($dotnetVersion in $dotnetVersions) {
163168
$feedPrefix = "dotnet" + $dotnetVersion;
164169
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
165170
if ($dotnetSource -ne $null) {
166-
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
167-
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
171+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
172+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
168173
}
169174
}
170175

0 commit comments

Comments
 (0)