Skip to content

Commit f887e97

Browse files
[dotnet/main] Update dependencies from dotnet/arcade
1 parent 68d3dc2 commit f887e97

5 files changed

Lines changed: 13 additions & 9 deletions

File tree

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25524.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25531.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
8+
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="11.0.0-beta.25524.1">
10+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="11.0.0-beta.25531.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
12+
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>11.0.0-beta.25524.1</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>11.0.0-beta.25531.1</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
<PropertyGroup>
1212
<PythonHexVersion>0x030B04F0</PythonHexVersion>

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25420.111",
3+
"version": "10.0.100-rc.2.25502.107",
44
"allowPrerelease": true,
55
"rollForward": "major",
66
"paths": [
@@ -10,10 +10,10 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100-rc.1.25420.111"
13+
"dotnet": "10.0.100-rc.2.25502.107"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25524.1",
16+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.1",
1717
"Microsoft.Build.NoTargets": "3.5.0",
1818
"Microsoft.Build.Traversal": "3.4.0"
1919
}

0 commit comments

Comments
 (0)