Skip to content

Commit a06f4b6

Browse files
[main] Update dependencies from dotnet/arcade (#81664)
[main] Update dependencies from dotnet/arcade
1 parent 6d430e5 commit a06f4b6

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

eng/Version.Details.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ This file should be imported by eng/Versions.props
4242
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
4343
<SystemWindowsExtensionsPackageVersion>9.0.0</SystemWindowsExtensionsPackageVersion>
4444
<!-- dotnet/arcade dependencies -->
45-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25610.3</MicrosoftDotNetArcadeSdkPackageVersion>
46-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25610.3</MicrosoftDotNetHelixSdkPackageVersion>
47-
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25610.3</MicrosoftDotNetXliffTasksPackageVersion>
45+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25612.6</MicrosoftDotNetArcadeSdkPackageVersion>
46+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25612.6</MicrosoftDotNetHelixSdkPackageVersion>
47+
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25612.6</MicrosoftDotNetXliffTasksPackageVersion>
4848
<!-- dotnet/symreader dependencies -->
4949
<MicrosoftDiaSymReaderPackageVersion>2.0.0</MicrosoftDiaSymReaderPackageVersion>
5050
<!-- dotnet/arcade-services dependencies -->

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@
115115
</Dependency>
116116
</ProductDependencies>
117117
<ToolsetDependencies>
118-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25610.3">
118+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25612.6">
119119
<Uri>https://github.com/dotnet/arcade</Uri>
120-
<Sha>27e190e2a8053738859c082e2f70df62e01ff524</Sha>
120+
<Sha>8adf115288fa51feaa30d063b946478054c7f7b4</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25610.3">
122+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25612.6">
123123
<Uri>https://github.com/dotnet/arcade</Uri>
124-
<Sha>27e190e2a8053738859c082e2f70df62e01ff524</Sha>
124+
<Sha>8adf115288fa51feaa30d063b946478054c7f7b4</Sha>
125125
</Dependency>
126126
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
127127
<Uri>https://github.com/dotnet/symreader</Uri>
@@ -131,9 +131,9 @@
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132132
<Sha>9143e6eedf61cd823a6f33e8312fe210740c5def</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25610.3">
134+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25612.6">
135135
<Uri>https://github.com/dotnet/arcade</Uri>
136-
<Sha>27e190e2a8053738859c082e2f70df62e01ff524</Sha>
136+
<Sha>8adf115288fa51feaa30d063b946478054c7f7b4</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25161.2">
139139
<Uri>https://github.com/dotnet/arcade-services</Uri>

eng/common/tools.ps1

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

559-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
559+
if (!$vsRequirements) {
560+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
561+
$vsRequirements = $GlobalJson.tools.vs
562+
} else {
563+
$vsRequirements = $null
564+
}
565+
}
566+
560567
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
561568

562569
if (!$excludePrereleaseVS) {
563570
$args += '-prerelease'
564571
}
565572

566-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
573+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
567574
$args += '-version'
568575
$args += $vsRequirements.version
569576
}
570577

571-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
578+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
572579
foreach ($component in $vsRequirements.components) {
573580
$args += '-requires'
574581
$args += $component

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"xcopy-msbuild": "18.0.0"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25610.3",
17-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25610.3",
16+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25612.6",
17+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25612.6",
1818
"Microsoft.Build.Traversal": "3.4.0"
1919
}
2020
}

0 commit comments

Comments
 (0)