Skip to content

Commit 4794f78

Browse files
authored
Merge pull request #9624 from dotnet/darc-release/9.0.3xx-a53d8e44-f7fc-4628-a6c4-aec83e41f194
[release/9.0.3xx] Update dependencies from dotnet/arcade
2 parents 676a1ea + c7327a4 commit 4794f78

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25608.5">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25626.6">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>92e45d251889042fd956e18b28d489020298d864</Sha>
24+
<Sha>ab5773ac30dce73227fa1dff6bf1a21eea67cbd0</Sha>
2525
</Dependency>
2626
<!-- Intermediate is necessary for source build. -->
27-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25608.5">
27+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25626.6">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>92e45d251889042fd956e18b28d489020298d864</Sha>
29+
<Sha>ab5773ac30dce73227fa1dff6bf1a21eea67cbd0</Sha>
3030
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3131
</Dependency>
3232
<!-- Dependencies required for source build. We'll still update manually -->

eng/common/internal-feed-operations.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function SetupCredProvider {
2626
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'
2727

2828
Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
29-
Invoke-WebRequest $url -OutFile installcredprovider.ps1
29+
Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1
3030

3131
Write-Host 'Installing plugin...'
3232
.\installcredprovider.ps1 -Force

eng/common/post-build/nuget-verification.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if ($NuGetExePath) {
6565
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
6666
$ProgressPreference = 'SilentlyContinue'
6767
try {
68-
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
68+
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
6969
$ProgressPreference = 'Continue'
7070
} catch {
7171
$ProgressPreference = 'Continue'

eng/common/tools.ps1

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
266266

267267
Retry({
268268
Write-Host "GET $uri"
269-
Invoke-WebRequest $uri -OutFile $installScript
269+
Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
270270
})
271271
}
272272

@@ -499,7 +499,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
499499
Write-Host "Downloading $packageName $packageVersion"
500500
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
501501
Retry({
502-
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
502+
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath
503503
})
504504

505505
if (!(Test-Path $packagePath)) {
@@ -543,23 +543,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){
543543
Create-Directory $vsWhereDir
544544
Write-Host 'Downloading vswhere'
545545
Retry({
546-
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
546+
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
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+
}
557+
551558
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
552559

553560
if (!$excludePrereleaseVS) {
554561
$args += '-prerelease'
555562
}
556563

557-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
564+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
558565
$args += '-version'
559566
$args += $vsRequirements.version
560567
}
561568

562-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
569+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
563570
foreach ($component in $vsRequirements.components) {
564571
$args += '-requires'
565572
$args += $component

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "9.0.112"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5"
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6"
77
}
88
}

0 commit comments

Comments
 (0)