Skip to content

Commit 5a03f50

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/dotnet build 294593
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25611.103 -> 11.0.0-beta.25613.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 11.0.0-alpha.1.25611.103 -> 11.0.0-alpha.1.25613.101)
1 parent 9717209 commit 5a03f50

File tree

6 files changed

+84
-77
lines changed

6 files changed

+84
-77
lines changed

‎eng/Version.Details.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props
88
<!-- dotnet/dotnet dependencies -->
99
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25613.101</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25613.101</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25613.101</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25613.101</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-alpha.1.25613.101</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25613.101</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-alpha.1.25613.101</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>11.0.0-alpha.1.25613.101</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>11.0.0-alpha.1.25611.103</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-alpha.1.25611.103</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>11.0.0-alpha.1.25611.103</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>11.0.0-alpha.1.25611.103</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>11.0.0-alpha.1.25611.103</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>11.0.0-alpha.1.25611.103</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>11.0.0-alpha.1.25611.103</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-alpha.1.25611.103</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-alpha.1.25611.103</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>11.0.0-alpha.1.25611.103</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-alpha.1.25611.103</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-alpha.1.25611.103</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>11.0.0-alpha.1.25611.103</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>11.0.0-alpha.1.25611.103</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>11.0.0-alpha.1.25613.101</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-alpha.1.25613.101</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>11.0.0-alpha.1.25613.101</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>11.0.0-alpha.1.25613.101</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>11.0.0-alpha.1.25613.101</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>11.0.0-alpha.1.25613.101</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>11.0.0-alpha.1.25613.101</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-alpha.1.25613.101</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-alpha.1.25613.101</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>11.0.0-alpha.1.25613.101</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-alpha.1.25613.101</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-alpha.1.25613.101</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>11.0.0-alpha.1.25613.101</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>11.0.0-alpha.1.25613.101</SystemWindowsExtensionsPackageVersion>
3535
<!-- _git/dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25609.7</MicrosoftDotNetWpfDncEngPackageVersion>
3737
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="a137035987f8faebec182016349982241a2eebd1" BarId="294309" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="dc803dea8a5917a87a812a05bae596c299368a43" BarId="294593" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-alpha.1.25611.103">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-alpha.1.25613.101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
7+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-alpha.1.25611.103">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-alpha.1.25613.101">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
11+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-alpha.1.25611.103">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-alpha.1.25613.101">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
15+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="11.0.0-alpha.1.25611.103">
17+
<Dependency Name="System.Windows.Extensions" Version="11.0.0-alpha.1.25613.101">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
19+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-alpha.1.25611.103">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-alpha.1.25613.101">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
23+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25609.7">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>7b194d1da9c86db654df89ab762a07ac714a95ba</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="11.0.0-alpha.1.25611.103">
29+
<Dependency Name="System.Resources.Extensions" Version="11.0.0-alpha.1.25613.101">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
31+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-alpha.1.25611.103">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-alpha.1.25613.101">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
35+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25611.103">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25613.101">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
39+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="11.0.0-alpha.1.25611.103">
41+
<Dependency Name="System.CodeDom" Version="11.0.0-alpha.1.25613.101">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
43+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-alpha.1.25611.103">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-alpha.1.25613.101">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
47+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-alpha.1.25611.103">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-alpha.1.25613.101">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
51+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="11.0.0-alpha.1.25611.103">
53+
<Dependency Name="System.DirectoryServices" Version="11.0.0-alpha.1.25613.101">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
55+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-alpha.1.25611.103">
57+
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-alpha.1.25613.101">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
59+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="11.0.0-alpha.1.25611.103">
61+
<Dependency Name="System.IO.Packaging" Version="11.0.0-alpha.1.25613.101">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
63+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-alpha.1.25611.103">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-alpha.1.25613.101">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
67+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="11.0.0-alpha.1.25611.103">
69+
<Dependency Name="System.Security.Permissions" Version="11.0.0-alpha.1.25613.101">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
71+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="11.0.0-alpha.1.25611.103">
73+
<Dependency Name="System.Drawing.Common" Version="11.0.0-alpha.1.25613.101">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
75+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,21 +84,21 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25611.103">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25613.101">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
89+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25611.103">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25613.101">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
93+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25611.103">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25613.101">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
97+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25611.103">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25613.101">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
101+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
102102
</Dependency>
103103
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
104104
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
@@ -109,9 +109,9 @@
109109
<Uri>https://github.com/dotnet/dotnet</Uri>
110110
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
111111
</Dependency>
112-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-alpha.1.25611.103">
112+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-alpha.1.25613.101">
113113
<Uri>https://github.com/dotnet/dotnet</Uri>
114-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
114+
<Sha>dc803dea8a5917a87a812a05bae596c299368a43</Sha>
115115
</Dependency>
116116
</ToolsetDependencies>
117117
</Dependencies>

‎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
@@ -273,7 +273,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
273273

274274
Retry({
275275
Write-Host "GET $uri"
276-
Invoke-WebRequest $uri -OutFile $installScript
276+
Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
277277
})
278278
}
279279

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

512512
if (!(Test-Path $packagePath)) {
@@ -552,23 +552,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){
552552
Write-Host "Downloading vswhere $vswhereVersion"
553553
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
554554
Retry({
555-
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
555+
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
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
@@ -27,8 +27,8 @@
2727
"runner": "Microsoft.Testing.Platform"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25611.103",
31-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25611.103",
30+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25613.101",
31+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25613.101",
3232
"Microsoft.Build.NoTargets": "3.7.56"
3333
},
3434
"native-tools": {

0 commit comments

Comments
 (0)