Skip to content

Commit 5632b24

Browse files
[release/8.0.3xx] Update dependencies from dotnet/arcade (#51703)
[release/8.0.3xx] Update dependencies from dotnet/arcade
1 parent 8138166 commit 5632b24

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25555.2">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25562.3">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
496+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25555.2">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25562.3">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
501+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25555.2">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25562.3">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
505+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25555.2">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25562.3">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
509+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<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
@@ -35,7 +35,7 @@
3535
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3636
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3737
<SystemReflectionMetadataVersion>8.0.1</SystemReflectionMetadataVersion>
38-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25555.2</MicrosoftDotNetSignToolVersion>
38+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25562.3</MicrosoftDotNetSignToolVersion>
3939
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4040
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4141
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -212,7 +212,7 @@
212212
<PropertyGroup>
213213
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
214214
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
215-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25555.2</MicrosoftDotNetXUnitExtensionsVersion>
215+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25562.3</MicrosoftDotNetXUnitExtensionsVersion>
216216
<MoqPackageVersion>4.18.4</MoqPackageVersion>
217217
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
218218
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

eng/common/tools.ps1

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot,
296296
if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
297297
if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
298298
$runtimePath = $runtimePath + "\" + $version
299-
299+
300300
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
301301

302302
if (Test-Path $runtimePath) {
@@ -545,25 +545,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){
545545
})
546546
}
547547

548-
if (!$vsRequirements) {
549-
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
550-
$vsRequirements = $GlobalJson.tools.vs
551-
} else {
552-
$vsRequirements = $null
553-
}
554-
}
548+
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
555549
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
556550

557551
if (!$excludePrereleaseVS) {
558552
$args += '-prerelease'
559553
}
560554

561-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
555+
if (Get-Member -InputObject $vsRequirements -Name 'version') {
562556
$args += '-version'
563557
$args += $vsRequirements.version
564558
}
565559

566-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
560+
if (Get-Member -InputObject $vsRequirements -Name 'components') {
567561
foreach ($component in $vsRequirements.components) {
568562
$args += '-requires'
569563
$args += $component

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": "8.0.121",
3+
"dotnet": "8.0.122",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25555.2",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25555.2"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25562.3",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25562.3"
1919
}
2020
}

0 commit comments

Comments
 (0)