Skip to content

Commit 803c90b

Browse files
[main] Update dependencies from dotnet/arcade (#6849)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 6102c3b commit 803c90b

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25530.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25531.1">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>12b7438f565ef480ec77fd3f1ee80521dcafdc2b</Sha>
6+
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25530.1">
8+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25531.1">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>12b7438f565ef480ec77fd3f1ee80521dcafdc2b</Sha>
10+
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25530.1">
12+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25531.1">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>12b7438f565ef480ec77fd3f1ee80521dcafdc2b</Sha>
14+
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0-preview.25507.2">
1717
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
</PropertyGroup>
99
<PropertyGroup Label="MSTest prod dependencies - darc updated">
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25530.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25531.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
1111
<MicrosoftTestingExtensionsCodeCoverageVersion>18.1.0-preview.25507.2</MicrosoftTestingExtensionsCodeCoverageVersion>
1212
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
1313
<MSTestVersion>4.1.0-preview.25531.7</MSTestVersion>

eng/common/core-templates/steps/publish-logs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ steps:
2828
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
2929
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
3030
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
31+
-runtimeSourceFeed https://ci.dot.net/internal
32+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
3133
'$(publishing-dnceng-devdiv-code-r-build-re)'
3234
'$(MaestroAccessToken)'
3335
'$(dn-bot-all-orgs-artifact-feeds-rw)'

eng/common/post-build/redact-logs.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ param(
77
# File with strings to redact - separated by newlines.
88
# For comments start the line with '# ' - such lines are ignored
99
[Parameter(Mandatory=$false)][string] $TokensFilePath,
10-
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
10+
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact,
11+
[Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
12+
[Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey
1113
)
1214

1315
try {

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"runner": "Microsoft.Testing.Platform"
4040
},
4141
"msbuild-sdks": {
42-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25530.1",
42+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.1",
4343
"MSBuild.Sdk.Extras": "3.0.44"
4444
}
4545
}

0 commit comments

Comments
 (0)