Skip to content

Commit 9ecbfd4

Browse files
author
Mirroring
committed
Merge commit '7dd1559a0aacd866cb36c37e9e9346a34fb36a5b'
2 parents 6abb139 + 7dd1559 commit 9ecbfd4

File tree

41 files changed

+807
-561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+807
-561
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "9.0.0-prerelease.25570.2",
18+
"version": "9.0.0-prerelease.25615.2",
1919
"commands": [
2020
"xharness"
2121
]

‎docs/workflow/building/coreclr/linux-instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The following images are used for more extended scenarios, including for communi
8181
| Azure Linux (x64) | Ubuntu 24.04 | RISC-V | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-riscv64` | `/crossrootfs/riscv64` |
8282
| Azure Linux (x64) | Ubuntu 18.04 | S390x | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-s390x` | `/crossrootfs/s390x` |
8383
| Azure Linux (x64) | Ubuntu 16.04 (Wasm) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64` | `/crossrootfs/x64` |
84-
| Debian (x64) | Debian 12 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64` | `/crossrootfs/armv6` |
84+
| Debian (x64) | Debian 13 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-gcc14-amd64` | `/crossrootfs/armv6` |
8585
| Ubuntu (x64) | Ubuntu 22.04 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg` | |
8686
| Ubuntu (x64) | Tizen 9.0 | Arm32 (armel) | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-armel-tizen` | `/crossrootfs/armel` |
8787
| Ubuntu (x64) | Ubuntu 20.04 | Arm32 (v6) | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10` | `/crossrootfs/armv6` |

‎eng/Version.Details.xml‎

Lines changed: 88 additions & 88 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
</ItemGroup>
3737
<PropertyGroup>
3838
<!-- dotnet/roslyn-analyzers dependencies -->
39-
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.25173.3</MicrosoftCodeAnalysisAnalyzersVersion>
40-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25173.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
39+
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.26057.1</MicrosoftCodeAnalysisAnalyzersVersion>
40+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.26057.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
4141
<!-- dotnet/roslyn dependencies -->
4242
<!--
4343
These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
@@ -85,22 +85,22 @@
8585
<!-- SDK dependencies (also used in wasm build tests -->
8686
<MicrosoftDotNetApiCompatTaskVersion>9.0.109</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25555.4</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25555.4</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25555.4</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25555.4</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25555.4</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25555.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25555.4</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25555.4</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25555.4</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25626.6</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25626.6</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25626.6</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25626.6</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25626.6</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25626.6</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25626.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25626.6</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25626.6</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25626.6</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25626.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25626.6</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25626.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25626.6</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25626.6</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25626.6</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->
@@ -147,20 +147,20 @@
147147
<SystemTextEncodingsWebToolsetVersion>8.0.0</SystemTextEncodingsWebToolsetVersion>
148148
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
149149
<!-- Runtime-Assets dependencies -->
150-
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25565.2</SystemRuntimeNumericsTestDataVersion>
151-
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25565.2</SystemComponentModelTypeConverterTestDataVersion>
152-
<SystemDataCommonTestDataVersion>9.0.0-beta.25565.2</SystemDataCommonTestDataVersion>
153-
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25565.2</SystemDrawingCommonTestDataVersion>
154-
<SystemFormatsTarTestDataVersion>9.0.0-beta.25565.2</SystemFormatsTarTestDataVersion>
155-
<SystemIOCompressionTestDataVersion>9.0.0-beta.25565.2</SystemIOCompressionTestDataVersion>
156-
<SystemIOPackagingTestDataVersion>9.0.0-beta.25565.2</SystemIOPackagingTestDataVersion>
157-
<SystemNetTestDataVersion>9.0.0-beta.25565.2</SystemNetTestDataVersion>
158-
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25565.2</SystemPrivateRuntimeUnicodeDataVersion>
159-
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25565.2</SystemRuntimeTimeZoneDataVersion>
160-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25565.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
161-
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25565.2</SystemTextRegularExpressionsTestDataVersion>
162-
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25565.2</SystemWindowsExtensionsTestDataVersion>
163-
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25565.2</MicrosoftDotNetCilStripSourcesVersion>
150+
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25625.4</SystemRuntimeNumericsTestDataVersion>
151+
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25625.4</SystemComponentModelTypeConverterTestDataVersion>
152+
<SystemDataCommonTestDataVersion>9.0.0-beta.25625.4</SystemDataCommonTestDataVersion>
153+
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25625.4</SystemDrawingCommonTestDataVersion>
154+
<SystemFormatsTarTestDataVersion>9.0.0-beta.25625.4</SystemFormatsTarTestDataVersion>
155+
<SystemIOCompressionTestDataVersion>9.0.0-beta.25625.4</SystemIOCompressionTestDataVersion>
156+
<SystemIOPackagingTestDataVersion>9.0.0-beta.25625.4</SystemIOPackagingTestDataVersion>
157+
<SystemNetTestDataVersion>9.0.0-beta.25625.4</SystemNetTestDataVersion>
158+
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25625.4</SystemPrivateRuntimeUnicodeDataVersion>
159+
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25625.4</SystemRuntimeTimeZoneDataVersion>
160+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25625.4</SystemSecurityCryptographyX509CertificatesTestDataVersion>
161+
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25625.4</SystemTextRegularExpressionsTestDataVersion>
162+
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25625.4</SystemWindowsExtensionsTestDataVersion>
163+
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25625.4</MicrosoftDotNetCilStripSourcesVersion>
164164
<!-- dotnet-optimization dependencies -->
165165
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx64MIBCRuntimeVersion>
166166
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -191,11 +191,11 @@
191191
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
192192
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
193193
<!-- xharness -->
194-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25570.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
195-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25570.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
196-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25570.2</MicrosoftDotNetXHarnessCLIVersion>
194+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25615.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
195+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25615.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
196+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25615.2</MicrosoftDotNetXHarnessCLIVersion>
197197
<!-- hotreload-utils -->
198-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25574.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
198+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25625.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
199199
<NUnitVersion>3.12.0</NUnitVersion>
200200
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
201201
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
@@ -223,11 +223,11 @@
223223
<!-- Docs -->
224224
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
225225
<!-- Mono Cecil -->
226-
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25566.3</MicrosoftDotNetCecilVersion>
226+
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25628.2</MicrosoftDotNetCecilVersion>
227227
<!-- ILCompiler -->
228228
<MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24511.16</MicrosoftDotNetILCompilerVersion>
229229
<!-- ICU -->
230-
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25574.1</MicrosoftNETCoreRuntimeICUTransportVersion>
230+
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25627.1</MicrosoftNETCoreRuntimeICUTransportVersion>
231231
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>
232232
<!-- MsQuic -->
233233
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
@@ -270,7 +270,7 @@
270270
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
271271
<!-- sdk version, for testing workloads -->
272272
<!-- <SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting> -->
273-
<SdkVersionForWorkloadTesting>9.0.111</SdkVersionForWorkloadTesting>
273+
<SdkVersionForWorkloadTesting>9.0.112</SdkVersionForWorkloadTesting>
274274
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
275275
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
276276
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
demands: ImageOverride -equals build.ubuntu.2004.amd64
6666
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6767
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
68-
image: 1es-mariner-2
68+
image: 1es-azurelinux-3
6969
os: linux
7070
${{ else }}:
7171
pool:

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []
88
binlogPath: artifacts/log/Debug/Build.binlog
9-
condition: ''
9+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
1010
dependsOn: ''
1111
pool: ''
1212
is1ESPipeline: ''

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ steps:
4141
# in the default public locations.
4242
internalRuntimeDownloadArgs=
4343
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
44-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
44+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4545
fi
4646
4747
buildConfig=Release

‎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

0 commit comments

Comments
 (0)