diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0e1e8a64e1e..625ca79ec29 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 + 11.0.0-beta.25553.108 + 11.0.0-beta.25553.108 + 11.0.0-beta.25553.108 + 11.0.0-beta.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 10.0.0-rc.1.25552.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3f132fc689..061a2fe1b8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int fbf3653d46ee940938937f6d8ad095e7aacbd921 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a..0664c343b2a 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 b7fc1959150..fc0218a013d 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 c3af8ee3fe9..b430b23121c 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25531.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25553.108", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {