diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 15e075fa8a9..72ba8390269 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,4 +27,4 @@ ] } } -} \ No newline at end of file +} diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f465fa9c214..876c916240f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,17 +206,17 @@ - + https://github.com/dotnet/arcade - ed9b62fbe0647cadb40b25793463110495e19984 + 8e2b32008e4016ac8d333a42d1bc27c5dd29525f - + https://github.com/dotnet/arcade - ed9b62fbe0647cadb40b25793463110495e19984 + 8e2b32008e4016ac8d333a42d1bc27c5dd29525f - + https://github.com/dotnet/arcade - ed9b62fbe0647cadb40b25793463110495e19984 + 8e2b32008e4016ac8d333a42d1bc27c5dd29525f diff --git a/eng/Versions.props b/eng/Versions.props index e25024f8304..ddfa85fdc68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,7 +86,7 @@ 9.0.21 - 10.0.0-beta.26515.1 + 10.0.0-beta.26528.9 diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index adcdfa17536..5e398434ec1 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 bde220ad85b..295f26c351c 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 77fefa3fa5f..5584d0f4eab 100644 --- a/global.json +++ b/global.json @@ -20,7 +20,7 @@ "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "4.1.82", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26515.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26515.1" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26528.9", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26528.9" } }