diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 284108bae6..e363c091bb 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -20,12 +20,12 @@ This file should be imported by eng/Versions.props 10.0.0-alpha.1.26505.2 10.0.0-alpha.1.26505.2 - 10.0.0-beta.26513.102 - 10.0.0-beta.26513.102 - 10.0.0-beta.26513.102 - 10.0.0-beta.26513.102 - 10.0.0-beta.26513.102 - 10.0.0-beta.26513.102 + 10.0.0-beta.26530.118 + 10.0.0-beta.26530.118 + 10.0.0-beta.26530.118 + 10.0.0-beta.26530.118 + 10.0.0-beta.26530.118 + 10.0.0-beta.26530.118 10.0.0-alpha.1.26505.2 @@ -67,14 +67,14 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25461.1 19.1.0-alpha.1.25461.1 - 10.0.0-alpha.1.26505.3 - 10.0.0-alpha.1.26505.3 - 10.0.0-alpha.1.26505.3 - 10.0.0-alpha.1.26505.3 - 10.0.0-alpha.1.26505.3 - 10.0.0-alpha.1.26505.3 - 10.0.0-alpha.1.26505.3 - 10.0.0-alpha.1.26505.3 + 10.0.0-alpha.1.26517.2 + 10.0.0-alpha.1.26517.2 + 10.0.0-alpha.1.26517.2 + 10.0.0-alpha.1.26517.2 + 10.0.0-alpha.1.26517.2 + 10.0.0-alpha.1.26517.2 + 10.0.0-alpha.1.26517.2 + 10.0.0-alpha.1.26517.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8f014e684..49ed1b4118 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/binaryen @@ -50,37 +50,37 @@ https://github.com/dotnet/cpython cd4a0b1eb736704b1c9f599da671fa441e58baea - + https://github.com/dotnet/node - a15aa6617703d942512a7ad93881f9337d37f621 + 01652b7fe3f5201c8e4c90fead0f03f8fb1247b5 - + https://github.com/dotnet/node - a15aa6617703d942512a7ad93881f9337d37f621 + 01652b7fe3f5201c8e4c90fead0f03f8fb1247b5 - + https://github.com/dotnet/node - a15aa6617703d942512a7ad93881f9337d37f621 + 01652b7fe3f5201c8e4c90fead0f03f8fb1247b5 - + https://github.com/dotnet/node - a15aa6617703d942512a7ad93881f9337d37f621 + 01652b7fe3f5201c8e4c90fead0f03f8fb1247b5 - + https://github.com/dotnet/node - a15aa6617703d942512a7ad93881f9337d37f621 + 01652b7fe3f5201c8e4c90fead0f03f8fb1247b5 - + https://github.com/dotnet/node - a15aa6617703d942512a7ad93881f9337d37f621 + 01652b7fe3f5201c8e4c90fead0f03f8fb1247b5 - + https://github.com/dotnet/node - a15aa6617703d942512a7ad93881f9337d37f621 + 01652b7fe3f5201c8e4c90fead0f03f8fb1247b5 - + https://github.com/dotnet/node - a15aa6617703d942512a7ad93881f9337d37f621 + 01652b7fe3f5201c8e4c90fead0f03f8fb1247b5 https://github.com/dotnet/llvm-project @@ -236,29 +236,29 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - f128bc8c39de781e3a8b700345b49f9400c5d2f9 + 51ecbbf20ee54a61e50d53be03c1fcbec3983a0a - + https://github.com/dotnet/dotnet - f128bc8c39de781e3a8b700345b49f9400c5d2f9 + 51ecbbf20ee54a61e50d53be03c1fcbec3983a0a - + https://github.com/dotnet/dotnet - f128bc8c39de781e3a8b700345b49f9400c5d2f9 + 51ecbbf20ee54a61e50d53be03c1fcbec3983a0a - + https://github.com/dotnet/dotnet - f128bc8c39de781e3a8b700345b49f9400c5d2f9 + 51ecbbf20ee54a61e50d53be03c1fcbec3983a0a - + https://github.com/dotnet/dotnet - f128bc8c39de781e3a8b700345b49f9400c5d2f9 + 51ecbbf20ee54a61e50d53be03c1fcbec3983a0a - + https://github.com/dotnet/dotnet - f128bc8c39de781e3a8b700345b49f9400c5d2f9 + 51ecbbf20ee54a61e50d53be03c1fcbec3983a0a diff --git a/eng/Versions.props b/eng/Versions.props index bee5a66e26..3930d1dea9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ 10 0 - 14 + 15 $(MajorVersion).$(MinorVersion).$(PatchVersion) servicing diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index adcdfa1753..5e398434ec 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -107,7 +107,7 @@ jobs: outputVariableName: 'GitHubAppInstallationToken' condition: ${{ parameters.condition }} - - task: OneLocBuild@2 + - task: OneLocBuild@3 displayName: OneLocBuild env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bde220ad85..295f26c351 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -517,7 +517,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { }) if (!(Test-Path $packagePath)) { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1074/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild" + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1857/Operations/FR/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild" throw } Unzip $packagePath $packageDir diff --git a/global.json b/global.json index 4df3ec2999..136c69d22d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.112", + "version": "10.0.114", "allowPrerelease": true, "rollForward": "major", "paths": [ @@ -10,11 +10,11 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.112" + "dotnet": "10.0.114" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26513.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26513.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26530.118", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26530.118", "Microsoft.Build.Traversal": "3.4.0" } }