Skip to content

Commit 0960799

Browse files
authored
Update branding to 9.0.309 (#51696)
2 parents 8a6b13c + 0fd141e commit 0960799

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>3</VersionSDKMinor>
9-
<VersionFeature>08</VersionFeature>
9+
<VersionFeature>09</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -35,7 +35,7 @@
3535
<VersionFeature50>17</VersionFeature50>
3636
<VersionFeature60>36</VersionFeature60>
3737
<VersionFeature70>20</VersionFeature70>
38-
<VersionFeature80>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature80>
38+
<VersionFeature80>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature80>
3939
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4040
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4141
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

eng/common/tools.ps1

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,19 +547,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){
547547
})
548548
}
549549

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

553559
if (!$excludePrereleaseVS) {
554560
$args += '-prerelease'
555561
}
556562

557-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
563+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
558564
$args += '-version'
559565
$args += $vsRequirements.version
560566
}
561567

562-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
568+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
563569
foreach ($component in $vsRequirements.components) {
564570
$args += '-requires'
565571
$args += $component

0 commit comments

Comments
 (0)