diff --git a/NuGet.config b/NuGet.config index 906987d4d6a661..b398e11087b722 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,7 @@ - - + - - - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e55b1c08442b08..0e671b5b9fd4af 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25461.1 19.1.0-alpha.1.25461.1 - 5.0.0-2.25609.109 - 5.0.0-2.25609.109 - 5.0.0-2.25609.109 - 10.0.102 - 10.0.102 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 0.11.5-alpha.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 10.0.0-beta.25609.109 - 2.9.3-beta.25609.109 - 2.9.3-beta.25609.109 - 10.0.0-beta.25609.109 - 5.0.0-2.25609.109 - 10.0.2 - 10.0.102-servicing.25609.109 - 10.0.2 - 10.0.2 - 7.0.0-rc.11009 - 7.0.0-rc.11009 - 7.0.0-rc.11009 - 7.0.0-rc.11009 - 10.0.2 - 2.0.2 - 10.0.2 - 10.0.2 - 10.0.2 + 5.0.0-2.25622.101 + 5.0.0-2.25622.101 + 5.0.0-2.25622.101 + 10.0.103 + 10.0.103 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 0.11.5-alpha.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 10.0.0-beta.25622.101 + 2.9.3-beta.25622.101 + 2.9.3-beta.25622.101 + 10.0.0-beta.25622.101 + 5.0.0-2.25622.101 + 10.0.3 + 10.0.103-servicing.25622.101 + 10.0.3 + 10.0.3 + 7.0.2-rc.12301 + 7.0.2-rc.12301 + 7.0.2-rc.12301 + 7.0.2-rc.12301 + 10.0.3 + 2.0.3 + 10.0.3 + 10.0.3 + 10.0.3 10.0.0-beta.25418.1 10.0.0-beta.25418.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ad53c65cd8597..bfd14f57262ffc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 799df8d4c86ff50c83b7a57df9e3691eeab813ec - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 3910cd6230be3d4d283edd6a52bff27f549dd675 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 - + https://github.com/dotnet/dotnet - 32aba8526ca0c037d185329fe779e8a288e986fc + 3d691b2b683b3106c96294965b337acc9d8ca8f7 https://github.com/dotnet/node diff --git a/eng/Versions.props b/eng/Versions.props index 3de2be2d3f2bc0..1d515636a65fdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,10 @@ 10 0 - 1 + 3 $(MajorVersion).$(MinorVersion).$(PatchVersion) - $(MajorVersion).0.100 - 9.0.3 + 9.0.$([MSBuild]::Add($(PatchVersion),12)) 8.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet9)').Build),11)) 7.0.20 6.0.36 @@ -17,12 +16,23 @@ false release - <_applyWorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' - and '$(PreReleaseVersionLabel)' != 'rtm' - and '$(PreReleaseVersionLabel)' != 'servicing'">true - -$(PreReleaseVersionLabel) - -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) - $(SdkBandVersion)$(WorkloadVersionSuffix) + + + <_GlobalJsonContent>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)../global.json')) + <_GlobalJsonSdkVersion Condition="'$(_GlobalJsonContent)' != ''">$([System.Text.RegularExpressions.Regex]::Match($(_GlobalJsonContent), '"sdk"\s*:\s*\{[^\}]*"version"\s*:\s*"([^"]+)"', System.Text.RegularExpressions.RegexOptions.Singleline).Groups[1].Value) + + $(_DotnetSdkVersion) + $(_GlobalJsonSdkVersion) + $([System.String]::Copy('$(SdkVersionForWorkloadTesting)').Split('.')[0]) + $(SdkMajorVersion).0.100 + $([System.Text.RegularExpressions.Regex]::Match($(SdkVersionForWorkloadTesting), '-(?!rtm|servicing)(.+)\.[^.]+\.[^.]+$').Groups[1].Value) + $(SdkBandVersion) + $(SdkBandVersion)-$(SdkPreReleaseLabel) + $(MajorVersion).$(MinorVersion).0.0 @@ -153,18 +163,13 @@ 2.4.16 9.0.0-alpha.1.24167.3 - - - - $(SdkBandVersion) - $(MicrosoftDotNetApiCompatTaskPackageVersion) $(MicrosoftDotNetApiCompatTaskPackageVersion) 10.0.0 $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) 3.1.56 - + 1.1.87-gba258badda 1.0.0-v3.14.0.5722 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d9904e..c282d3ae403a09 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 ac5c69ffcac59a..eea88e653c911d 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 578705ee4dbdee..bef4affa4a4191 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -510,7 +510,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)) { @@ -556,7 +556,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit 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 }) } diff --git a/global.json b/global.json index 3c65442e5d23fd..83f630bc8fe651 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "10.0.100", + "version": "10.0.101", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100" + "dotnet": "10.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25609.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25609.109", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25609.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25622.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25622.101", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25622.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.2" + "Microsoft.NET.Sdk.IL": "10.0.3" } } diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index 604e7fc6f20b0a..7783ec9d0b4710 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -10,7 +10,7 @@ - 5.0.0-1.25259.6 + 5.0.0-1.25259.7 Custom