Skip to content

Commit 0a2782b

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20210723.11 (llvm#125)
[release/11.x] Update dependencies from dotnet/arcade
1 parent 0b7a170 commit 0a2782b

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21366.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21373.11">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
8+
<Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21366.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21373.11">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
12+
<Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21366.1">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21373.11">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
16+
<Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21366.1</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21373.11</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

eng/common/templates/steps/source-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ steps:
2929
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
3030
fi
3131
32+
internalRuntimeDownloadArgs=
33+
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
34+
internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
35+
fi
36+
3237
targetRidArgs=
3338
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
3439
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -43,6 +48,7 @@ steps:
4348
--configuration $buildConfig \
4449
--restore --build --pack $publishArgs -bl \
4550
$officialBuildArgs \
51+
$internalRuntimeDownloadArgs \
4652
$targetRidArgs \
4753
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
4854
/p:ArcadeBuildFromSource=true

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.100-preview.4.21255.9"
3+
"dotnet": "6.0.100-preview.6.21355.2"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21366.1",
7-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21366.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11",
7+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21373.11",
88
"Microsoft.Build.Traversal": "2.0.2"
99
}
1010
}

0 commit comments

Comments
 (0)