From 537175220f65f0b65f41cdf4cfc888bd1c83dfb3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 15 Dec 2025 08:32:42 -0600 Subject: [PATCH 1/4] Update alpine and fedora versions used in SB CI (#52148) --- eng/pipelines/templates/variables/vmr-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 9cdf223ec69e..8ed31d01af55 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -15,11 +15,11 @@ variables: - name: almaLinuxContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build - name: alpineContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.23-amd64 - name: centOSStreamContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - name: fedoraContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-43-amd64 - name: ubuntuContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04 - name: ubuntuArmContainer @@ -48,11 +48,11 @@ variables: - name: almaLinuxName value: AlmaLinux8 - name: alpineName - value: Alpine321 + value: Alpine323 - name: centOSStreamName value: CentOSStream9 - name: fedoraName - value: Fedora41 + value: Fedora43 - name: ubuntuName value: Ubuntu2404 @@ -65,11 +65,11 @@ variables: - name: linuxMuslArm64Rid value: linux-musl-arm64 - name: alpineX64Rid - value: alpine.3.21-x64 + value: alpine.3.23-x64 - name: centOSStreamX64Rid value: centos.9-x64 - name: fedoraX64Rid - value: fedora.41-x64 + value: fedora.43-x64 - name: ubuntux64Rid value: ubuntu.24.04-x64 - name: ubuntuArm64Rid From 72e782541cab0694c5cc018e4bc784245e22e6a1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 6 Jan 2026 15:29:14 -0600 Subject: [PATCH 2/4] Enable error logging in source-build tests (#52251) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 129d96c24777..d6da48981621 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -100,7 +100,7 @@ public static (Process Process, string StdOut, string StdErr) ExecuteProcess( outputHelper.WriteLine(output); } - if (string.IsNullOrWhiteSpace(error)) + if (!string.IsNullOrWhiteSpace(error)) { outputHelper.WriteLine(error); } From 4c2926f0573c567090abcd833c88c6992be9ad90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 09:27:50 -0600 Subject: [PATCH 3/4] [release/9.0.1xx] Update dependencies from dotnet/source-build-externals (#52345) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c0c7792fb82..051401ba0fa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -445,9 +445,9 @@ - + https://github.com/dotnet/source-build-externals - 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 + 16c380d1ce5fa0b24e232251c31cb013bbf3365f From b3ca0271dbd80b98d5ffbcc98baa01c05d4a12e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 15:28:52 +0000 Subject: [PATCH 4/4] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 10 +- eng/Version.Details.xml | 248 ++++++++----------- eng/Versions.props | 103 ++++---- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 19 +- global.json | 4 +- 7 files changed, 182 insertions(+), 206 deletions(-) diff --git a/NuGet.config b/NuGet.config index e31e3b13ad69..33d0c75f8bf0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,15 +27,17 @@ + + - + - + @@ -61,11 +63,11 @@ + + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 051401ba0fa7..ff9aeea4001a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + b73682307aa0128c5edbec94c2e6a070d13ae6bb @@ -59,10 +59,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 - https://github.com/dotnet/emsdk b65413ac057eb0a54c51b76b1855bc377c2132c3 @@ -73,67 +69,67 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -143,91 +139,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 @@ -325,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 @@ -359,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + + https://github.com/dotnet/roslyn + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,9 +411,9 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 @@ -589,34 +555,34 @@ - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 diff --git a/eng/Versions.props b/eng/Versions.props index e30c271601a6..ec008f15e271 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 13 + 3 + 10 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,13 +76,12 @@ 1.1.0-beta.25317.4 - - 9.0.11-servicing.25519.1 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.11-servicing.25519.1 @@ -124,7 +123,10 @@ 9.0.11 + 4.5.1 + 4.5.5 8.0.5 + 4.5.4 9.0.11 9.0.11 @@ -137,29 +139,29 @@ - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.25173.3 - 3.11.0-beta1.25173.3 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26057.9 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,38 +182,38 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.12.53 - 17.12.53-preview-25570-13 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.113 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.310-servicing.26056.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 @@ -231,9 +233,9 @@ - 9.0.0-preview.25608.8 - 9.0.0-preview.25608.8 - 9.0.0-preview.25608.8 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 @@ -270,10 +272,10 @@ - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 @@ -317,7 +319,6 @@ 15.0.9617 18.0.9617 - 9.0.11-servicing.25516.4 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9b3ad8840fdb..a06513a59407 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -266,7 +266,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -499,7 +499,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -543,23 +543,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index 46380d959f85..1f746c2d5d20 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25608.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" }