Skip to content

Commit d97272e

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 290774 (#6949)
[release/7.0.x] Source code updates from dotnet/dotnet
1 parent 1ad7adf commit d97272e

5 files changed

Lines changed: 18 additions & 8 deletions

File tree

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ This file should be imported by eng/Versions.props
2121
<!-- dotnet/corefx dependencies -->
2222
<SystemComponentModelCompositionPackageVersion>4.5.0</SystemComponentModelCompositionPackageVersion>
2323
<!-- dotnet/dotnet dependencies -->
24-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetArcadeSdkPackageVersion>
25-
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetXliffTasksPackageVersion>
24+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetArcadeSdkPackageVersion>
25+
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetXliffTasksPackageVersion>
2626
</PropertyGroup>
2727
<!--Property group for alternate package version names-->
2828
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="e17b0d08def649f30aed9c09cf4a2c5741a3c76c" BarId="289695" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="93970af2dae989c795efb703be9a25ff95079f25" BarId="290774" />
44
<!--
55
Currently this file is required to publish builds to .NET build asset registry.
66
See https://github.com/dotnet/arcade/issues/2396 for details.
@@ -56,13 +56,13 @@
5656
</Dependency>
5757
</ProductDependencies>
5858
<ToolsetDependencies>
59-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25555.106">
59+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25563.104">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
61+
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25555.106">
63+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25563.104">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
65+
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
6666
</Dependency>
6767
</ToolsetDependencies>
6868
</Dependencies>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@ jobs:
180180
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
181181
is1ESPipeline: ${{ parameters.is1ESPipeline }}
182182

183+
# Darc is targeting 8.0, so make sure it's installed
184+
- task: UseDotNet@2
185+
inputs:
186+
version: 8.0.x
187+
183188
- task: AzureCLI@2
184189
displayName: Publish Using Darc
185190
inputs:

eng/common/core-templates/post-build/post-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,11 @@ stages:
307307

308308
- task: NuGetAuthenticate@1
309309

310+
# Darc is targeting 8.0, so make sure it's installed
311+
- task: UseDotNet@2
312+
inputs:
313+
version: 8.0.x
314+
310315
- task: AzureCLI@2
311316
displayName: Publish Using Darc
312317
inputs:

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"pinned": true
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106",
12+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25563.104",
1313
"Microsoft.Build.NoTargets": "3.7.0"
1414
}
1515
}

0 commit comments

Comments
 (0)