Skip to content

Commit 4c628c7

Browse files
v-wuzhaiv-wuzhai
authored
[release/7.0.4xx] Update dependencies from dotnet/arcade (#39510)
2 parents edef25c + 86d35da commit 4c628c7

File tree

5 files changed

+38
-28
lines changed

5 files changed

+38
-28
lines changed

‎NuGet.config

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-d0ca5a8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d0ca5a8d-1/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-aspnetcore -->
98
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
109
<add key="darc-pub-DotNet-msbuild-Trusted-3ebbd7c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-3ebbd7c4/nuget/v3/index.json" />
@@ -13,12 +12,18 @@
1312
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1413
<!-- Begin: Package sources from dotnet-runtime -->
1514
<add key="darc-int-dotnet-runtime-dff486f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-runtime-dff486f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-3/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-runtime-dff486f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-2/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-runtime-dff486f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-1/nuget/v3/index.json" />
1618
<!-- End: Package sources from dotnet-runtime -->
1719
<!-- Begin: Package sources from dotnet-templating -->
1820
<add key="darc-pub-dotnet-templating-265abe2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-265abe27/nuget/v3/index.json" />
1921
<!-- End: Package sources from dotnet-templating -->
2022
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2123
<add key="darc-int-dotnet-windowsdesktop-8e24710" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8e247102/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-windowsdesktop-8e24710-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8e247102-3/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-8e24710-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8e247102-2/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-windowsdesktop-8e24710-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8e247102-1/nuget/v3/index.json" />
2227
<!-- End: Package sources from dotnet-windowsdesktop -->
2328
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2429
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -40,12 +45,17 @@
4045
<!-- Begin: Package sources from dotnet-templating -->
4146
<!-- End: Package sources from dotnet-templating -->
4247
<!-- Begin: Package sources from dotnet-aspnetcore -->
43-
<add key="darc-int-dotnet-aspnetcore-d0ca5a8-1" value="true" />
4448
<!-- End: Package sources from dotnet-aspnetcore -->
4549
<!-- Begin: Package sources from dotnet-runtime -->
50+
<add key="darc-int-dotnet-runtime-dff486f-1" value="true" />
51+
<add key="darc-int-dotnet-runtime-dff486f-2" value="true" />
52+
<add key="darc-int-dotnet-runtime-dff486f-3" value="true" />
4653
<add key="darc-int-dotnet-runtime-dff486f" value="true" />
4754
<!-- End: Package sources from dotnet-runtime -->
4855
<!-- Begin: Package sources from dotnet-windowsdesktop -->
56+
<add key="darc-int-dotnet-windowsdesktop-8e24710-1" value="true" />
57+
<add key="darc-int-dotnet-windowsdesktop-8e24710-2" value="true" />
58+
<add key="darc-int-dotnet-windowsdesktop-8e24710-3" value="true" />
4959
<add key="darc-int-dotnet-windowsdesktop-8e24710" value="true" />
5060
<!-- End: Package sources from dotnet-windowsdesktop -->
5161
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -283,22 +283,22 @@
283283
</Dependency>
284284
</ProductDependencies>
285285
<ToolsetDependencies>
286-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24160.1">
286+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24163.12">
287287
<Uri>https://github.com/dotnet/arcade</Uri>
288-
<Sha>aa22ad6cceb0fcb802ed542360827c191024649e</Sha>
288+
<Sha>bbc75d8a5897763eaf6945c263759930e02dd32b</Sha>
289289
<SourceBuild RepoName="arcade" ManagedOnly="true" />
290290
</Dependency>
291-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24160.1">
291+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24163.12">
292292
<Uri>https://github.com/dotnet/arcade</Uri>
293-
<Sha>aa22ad6cceb0fcb802ed542360827c191024649e</Sha>
293+
<Sha>bbc75d8a5897763eaf6945c263759930e02dd32b</Sha>
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24160.1">
295+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24163.12">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>aa22ad6cceb0fcb802ed542360827c191024649e</Sha>
297+
<Sha>bbc75d8a5897763eaf6945c263759930e02dd32b</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24160.1">
299+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24163.12">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>aa22ad6cceb0fcb802ed542360827c191024649e</Sha>
301+
<Sha>bbc75d8a5897763eaf6945c263759930e02dd32b</Sha>
302302
</Dependency>
303303
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
304304
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24160.1</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24163.12</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -190,7 +190,7 @@
190190
<PropertyGroup>
191191
<FluentAssertionsVersion>6.11.0</FluentAssertionsVersion>
192192
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
193-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24160.1</MicrosoftDotNetXUnitExtensionsVersion>
193+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24163.12</MicrosoftDotNetXUnitExtensionsVersion>
194194
<MoqPackageVersion>4.18.4</MoqPackageVersion>
195195
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
196196
</PropertyGroup>

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

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.116",
3+
"dotnet": "7.0.117",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1",
15-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24160.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24163.12",
15+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24163.12"
1616
}
1717
}

0 commit comments

Comments
 (0)