diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d255bdbc9f2a..492aa254177b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/icu - 92124838d3f0efde3ac483a904691a611babb9a0 + b70521e39f983ec3da46cb4885da3a99e3477724 - + https://github.com/dotnet/msquic - a880e93af4e50d19110d228e698900c110e2b0e9 + 72811ab66f2611ac9f652cbb020dba033fc37401 https://github.com/dotnet/wcf @@ -85,9 +85,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759b - + https://github.com/dotnet/cecil - 2f4ef297939628143389ddeea569874ded0b1c1b + d412306c1514a26737574838900052d8758da5be @@ -95,9 +95,9 @@ 66dbaefff04250dc72849f0172e0c53bcfb3ab38 - + https://github.com/dotnet/source-build-reference-packages - 5a1492557c8717b428b69fd4b7ca8c91d5d18cd3 + f4903e46459e0348e3793055dd8b68b8b0264034 @@ -107,79 +107,79 @@ - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/xliff-tasks - 649a1e75101b701d753ee41efbe9038f9b23a0db + bb654cd4736e7e8cb99f1c355ce2b8f0a686ba74 - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 385129cbc980a515ddee2fa56f6b16f3183ed9bc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -350,9 +350,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 068998a5d91f55a619d1d072ab3094dacd5d6a4f - + https://github.com/dotnet/hotreload-utils - 696312fd2a60671797b12311a4cf387d3cd14dd0 + e02247b9b7ec1d9e407312342147d8587a8ca20e https://github.com/dotnet/runtime-assets @@ -371,13 +371,13 @@ https://github.com/dotnet/roslyn 1fd4ff9d594b227baa3fc0962e2251323311ec19 - + https://github.com/dotnet/roslyn-analyzers - 755a4f888d64fc7c0f2802adca731f301a53283d + 76d99c5f3e11f0600fae074270c0d89042c360f0 - + https://github.com/dotnet/roslyn-analyzers - 755a4f888d64fc7c0f2802adca731f301a53283d + 76d99c5f3e11f0600fae074270c0d89042c360f0 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 314fcfd8e52f1..7760bd9a6a968 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,8 +34,8 @@ - 3.11.0-beta1.23412.1 - 8.0.0-preview.23412.1 + 3.11.0-beta1.23421.3 + 8.0.0-preview.23421.3 8.0.100-preview.7.23329.3 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 2.5.1-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 2.5.1-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 + 8.0.0-beta.23419.1 6.0.0-preview.1.102 @@ -184,7 +184,7 @@ 8.0.0-prerelease.23407.2 8.0.0-prerelease.23407.2 8.0.0-prerelease.23407.2 - 8.0.0-alpha.0.23407.2 + 8.0.0-alpha.0.23421.1 2.4.2 1.0.0 2.4.5 @@ -213,14 +213,14 @@ 8.0.0-rc.1.23406.6 - 0.11.4-alpha.23407.2 + 0.11.4-alpha.23421.1 8.0.0-rc.1.23406.6 - 8.0.0-rc.1.23407.2 + 8.0.0-rc.2.23421.2 2.2.2 - 8.0.0-alpha.1.23180.2 + 8.0.0-alpha.1.23412.1 16.0.5-alpha.1.23408.1 16.0.5-alpha.1.23408.1 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 517401b688bf7..f5c1ec7eafeb2 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" + if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index d8cfec910c77e..a2e0048770452 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -25,7 +25,7 @@ function Install-VersionTools-Cli { Write-Host "Installing the package '$CliToolName' with a version of '$version' ..." $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" - $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version") + $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed") Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait } diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 7aabaa18017bf..7870f93bc1765 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -105,6 +105,11 @@ jobs: downloadPath: $(Build.ArtifactStagingDirectory)\artifacts checkDownloadedFiles: true + - powershell: eng/common/sdl/trim-assets-version.ps1 + -InputPath $(Build.ArtifactStagingDirectory)\artifacts + displayName: Trim the version from the NuGet packages + continueOnError: ${{ parameters.sdlContinueOnError }} + - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 2961313c84973..df5526e3f1158 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -76,6 +76,7 @@ Command="chmod +x $(_DotNetInstallScriptPath); $(_DotNetInstallCommand)" /> diff --git a/global.json b/global.json index cf4ac698e3e8c..4142e57fcf561 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.7.23376.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23419.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23419.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23419.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"