Skip to content

Commit 93d1571

Browse files
committed
Merged PR 54834: Update to 10.0 ga
Update to 10.0 ga
1 parent 00ce21c commit 93d1571

34 files changed

+214
-174
lines changed

NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<packageSources>
1010
<clear />
1111
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
12+
<!-- Begin: Package sources from dotnet-dotnet -->
13+
<add key="darc-int-dotnet-dotnet-b0f34d5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-b0f34d51-1/nuget/v3/index.json" />
14+
<!-- End: Package sources from dotnet-dotnet -->
1215
<!-- Begin: Package sources from dotnet-aspnetcore -->
1316
<!-- End: Package sources from dotnet-aspnetcore -->
1417
<!-- Begin: Package sources from dotnet-runtime -->
@@ -28,6 +31,9 @@
2831
<disabledPackageSources>
2932
<clear />
3033
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
34+
<!-- Begin: Package sources from dotnet-dotnet -->
35+
<add key="darc-int-dotnet-dotnet-b0f34d5-1" value="true" />
36+
<!-- End: Package sources from dotnet-dotnet -->
3137
<!-- Begin: Package sources from dotnet-aspnetcore -->
3238
<!-- End: Package sources from dotnet-aspnetcore -->
3339
<!-- Begin: Package sources from dotnet-runtime -->

eng/Version.Details.xml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-rc.2.25502.107">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0">
44
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
5-
<Sha>89c8f6a112d37d2ea8b77821e56d170a1bccdc5a</Sha>
5+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.637302">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
@@ -12,55 +12,55 @@
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
1313
<Sha>eab990eafdd479265f78855d72e6afa3ee0813c7</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.2.25502.107">
15+
<Dependency Name="System.CommandLine" Version="2.0.0">
1616
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
17-
<Sha>89c8f6a112d37d2ea8b77821e56d170a1bccdc5a</Sha>
17+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100-rc.2.25502.107">
21+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100">
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
23-
<Sha>89c8f6a112d37d2ea8b77821e56d170a1bccdc5a</Sha>
23+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25479.4">
26-
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>e6f510cb87812d56ad781d93ff0513cdcccd0eb4</Sha>
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25523.111">
26+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
27+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25479.4">
30-
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>e6f510cb87812d56ad781d93ff0513cdcccd0eb4</Sha>
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25523.111">
30+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
31+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25479.4">
34-
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>e6f510cb87812d56ad781d93ff0513cdcccd0eb4</Sha>
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25523.111">
34+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
35+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25479.4">
38-
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>e6f510cb87812d56ad781d93ff0513cdcccd0eb4</Sha>
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25523.111">
38+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
39+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25479.4">
42-
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>e6f510cb87812d56ad781d93ff0513cdcccd0eb4</Sha>
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25523.111">
42+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
43+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.637302">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
4747
<Sha>eab990eafdd479265f78855d72e6afa3ee0813c7</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-rc.2.25502.107">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0">
5050
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
51-
<Sha>89c8f6a112d37d2ea8b77821e56d170a1bccdc5a</Sha>
51+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.2.25502.107">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rtm.25523.111">
5454
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
55-
<Sha>89c8f6a112d37d2ea8b77821e56d170a1bccdc5a</Sha>
55+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-rc.2.25502.107">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-rtm.25523.111">
5858
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
59-
<Sha>89c8f6a112d37d2ea8b77821e56d170a1bccdc5a</Sha>
59+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.2.25502.107">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-rtm.25523.111">
6262
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
63-
<Sha>89c8f6a112d37d2ea8b77821e56d170a1bccdc5a</Sha>
63+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@
5454
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.637302</MicrosoftDiagnosticsMonitoringEventPipeVersion>
5555
<MicrosoftFileFormatsVersion>1.0.637302</MicrosoftFileFormatsVersion>
5656
<!-- dotnet/dotnet references -->
57-
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-rc.2.25502.107</MicrosoftAspNetCoreAppRuntimewinx64Version>
58-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.100-rc.2.25502.107</MicrosoftCodeAnalysisNetAnalyzersVersion>
59-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25479.4</MicrosoftDotNetBuildTasksArchivesVersion>
60-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25479.4</MicrosoftDotNetCodeAnalysisVersion>
61-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25479.4</MicrosoftDotNetXUnitExtensionsVersion>
62-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-rc.2.25502.107</MicrosoftNETCoreAppRuntimewinx64Version>
63-
<SystemCommandLineVersion>2.0.0-rc.2.25502.107</SystemCommandLineVersion>
64-
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rc.2.25502.107</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
65-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-rc.2.25502.107</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
66-
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-rc.2.25502.107</VSRedistCommonNetCoreSharedFrameworkx64100Version>
57+
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0</MicrosoftAspNetCoreAppRuntimewinx64Version>
58+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.100</MicrosoftCodeAnalysisNetAnalyzersVersion>
59+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25523.111</MicrosoftDotNetBuildTasksArchivesVersion>
60+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25523.111</MicrosoftDotNetCodeAnalysisVersion>
61+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25523.111</MicrosoftDotNetXUnitExtensionsVersion>
62+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
63+
<SystemCommandLineVersion>2.0.0</SystemCommandLineVersion>
64+
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rtm.25523.111</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
65+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-rtm.25523.111</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
66+
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-rtm.25523.111</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6767
</PropertyGroup>
6868
<PropertyGroup Label="Runtime Versions">
6969
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

eng/common/PSScriptAnalyzerSettings.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
'PSStandardDSCFunctionsInResource',
99
'PSUseIdenticalMandatoryParametersForDSC',
1010
'PSUseIdenticalParametersForDSC')
11-
}
11+
}

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)