Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fd6b2b1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0.1xx] Source code updates from dotnet/templating (#2921)
[release/10.0.1xx] Source code updates from dotnet/templating
1 parent 06c50f1 commit fd6b2b1

File tree

10 files changed

+152
-128
lines changed

10 files changed

+152
-128
lines changed

‎src/source-manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@
115115
"commitSha": "26c6c313a35f020dc9fa8c7270a012bcd75fc81b"
116116
},
117117
{
118-
"barId": 286484,
118+
"barId": 287151,
119119
"path": "templating",
120120
"remoteUri": "https://github.com/dotnet/templating",
121-
"commitSha": "89fd90b5b2016cff0ee924dca2c8bf71b4935a39"
121+
"commitSha": "304a9820f03ab29b4d387043d35892cc22da6e63"
122122
},
123123
{
124124
"barId": 285355,

‎src/templating/NuGet.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-dotnet -->
7+
<add key="darc-pub-dotnet-dotnet-862de94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-862de94f/nuget/v3/index.json" />
8+
<!-- End: Package sources from dotnet-dotnet -->
69
<!-- Begin: Package sources from dotnet-runtime -->
710
<!-- End: Package sources from dotnet-runtime -->
811
<!-- Begin: Package sources from dotnet-templating -->

‎src/templating/eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25509.106</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.0-rtm.25509.106</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25514.103</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.0</SystemCommandLinePackageVersion>
1111
<!-- _git/dotnet-runtime dependencies -->
1212
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.3</MicrosoftBclAsyncInterfacesPackageVersion>
1313
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>

‎src/templating/eng/Version.Details.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="f448387a0e80f2fdeaec2d2f99ace7284fe37aac" BarId="286402" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="862de94f7792651640741a4651183e8bd5f64029" BarId="287070" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-rtm.25509.106">
5+
<Dependency Name="System.CommandLine" Version="2.0.0">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>f448387a0e80f2fdeaec2d2f99ace7284fe37aac</Sha>
7+
<Sha>862de94f7792651640741a4651183e8bd5f64029</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25509.106">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25514.103">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>f448387a0e80f2fdeaec2d2f99ace7284fe37aac</Sha>
13+
<Sha>862de94f7792651640741a4651183e8bd5f64029</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="9.0.3">

‎src/templating/eng/common/SetupNugetSources.ps1‎

Lines changed: 38 additions & 33 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-
160165
$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)