diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0888b5e417677..a03607db1e3a4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -38,9 +38,9 @@ This file should be imported by eng/Versions.props 9.0.0 9.0.0 - 11.0.0-beta.25527.2 - 11.0.0-beta.25527.2 - 11.0.0-beta.25527.2 + 11.0.0-beta.25531.1 + 11.0.0-beta.25531.1 + 11.0.0-beta.25531.1 2.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5156eead09f44..3b151692fb3d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,13 +115,13 @@ - + https://github.com/dotnet/arcade - d48732057be73512b3bac9c01eeacd59398c16d5 + d8816877a6b0e6cb39cb57d92557ad4952715a2e - + https://github.com/dotnet/arcade - d48732057be73512b3bac9c01eeacd59398c16d5 + d8816877a6b0e6cb39cb57d92557ad4952715a2e https://github.com/dotnet/symreader @@ -131,9 +131,9 @@ https://github.com/dotnet/roslyn 5d10d428050c0d6afef30a072c4ae68776621877 - + https://github.com/dotnet/arcade - d48732057be73512b3bac9c01eeacd59398c16d5 + d8816877a6b0e6cb39cb57d92557ad4952715a2e https://github.com/dotnet/roslyn-analyzers diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a03..0664c343b2af1 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -28,6 +28,8 @@ steps: arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index b7fc195915079..fc0218a013d16 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -7,7 +7,9 @@ param( # File with strings to redact - separated by newlines. # For comments start the line with '# ' - such lines are ignored [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/global.json b/global.json index 32ad992db2f33..3e2ca68803b5c 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ "xcopy-msbuild": "17.14.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25527.2", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25527.2", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.1", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25531.1", "Microsoft.Build.Traversal": "3.4.0" } }