Skip to content

Commit d506d82

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20251212.5 (#19158)
On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25611.1 -> To Version 10.0.0-beta.25612.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 09ded38 commit d506d82

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props
2727
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.25529.7</MicrosoftCodeAnalysisFeaturesPackageVersion>
2828
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25529.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
2929
<!-- dotnet/arcade dependencies -->
30-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25611.1</MicrosoftDotNetArcadeSdkPackageVersion>
30+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25612.5</MicrosoftDotNetArcadeSdkPackageVersion>
3131
<!-- _git/dotnet-optimization dependencies -->
3232
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
3333
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationlinuxx64MIBCRuntimePackageVersion>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25611.1">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25612.5">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>9f286ddee40065ea225611cb43ab0415e48994c2</Sha>
81+
<Sha>55631983c8583162122687fddeac13424c1e40a8</Sha>
8282
</Dependency>
8383
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
8484
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/common/tools.ps1

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,19 +560,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){
560560
})
561561
}
562562

563-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
563+
if (!$vsRequirements) {
564+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
565+
$vsRequirements = $GlobalJson.tools.vs
566+
} else {
567+
$vsRequirements = $null
568+
}
569+
}
570+
564571
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
565572

566573
if (!$excludePrereleaseVS) {
567574
$args += '-prerelease'
568575
}
569576

570-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
577+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
571578
$args += '-version'
572579
$args += $vsRequirements.version
573580
}
574581

575-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
582+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
576583
foreach ($component in $vsRequirements.components) {
577584
$args += '-requires'
578585
$args += $component

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"perl": "5.38.2.2"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25611.1",
25+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25612.5",
2626
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2727
}
2828
}

0 commit comments

Comments
 (0)