Skip to content

Commit 9a6bfda

Browse files
authored
Merge pull request #396 from dotnet/darc-release/10.0-08737566-0c1f-4678-bf3f-66682b8d9ff8
[release/10.0] Source code updates from dotnet/dotnet
2 parents bd2da3b + f878598 commit 9a6bfda

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26125.128</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26157.106</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="f37535073ddded8cecd2e824cce25fbef9e39514" BarId="303525" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="1e08372d41f7d2a5e1e19071dd0d695cf460a9dd" BarId="305074" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26125.128">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26157.106">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>f37535073ddded8cecd2e824cce25fbef9e39514</Sha>
9+
<Sha>1e08372d41f7d2a5e1e19071dd0d695cf460a9dd</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="Version.Details.props" />
44

55
<PropertyGroup>
6-
<VersionPrefix>2.2.5</VersionPrefix>
6+
<VersionPrefix>2.2.6</VersionPrefix>
77
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
88
<PreReleaseVersionIteration></PreReleaseVersionIteration>
99
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ steps:
3131
-runtimeSourceFeed https://ci.dot.net/internal
3232
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
3333
'$(publishing-dnceng-devdiv-code-r-build-re)'
34-
'$(MaestroAccessToken)'
3534
'$(dn-bot-all-orgs-artifact-feeds-rw)'
3635
'$(akams-client-id)'
3736
'$(microsoft-symbol-server-pat)'

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"dotnet": "10.0.103"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26125.128"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26157.106"
1717
}
1818
}

0 commit comments

Comments
 (0)