Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20210…
Browse files Browse the repository at this point in the history
…723.11 (#1164)

[main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Jul 26, 2021
1 parent 219a2fe commit 8113419
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21366.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21373.11">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
<Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21366.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21373.11">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
<Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ steps:
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
fi

internalRuntimeDownloadArgs=
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
fi

targetRidArgs=
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
Expand All @@ -43,6 +48,7 @@ steps:
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
$officialBuildArgs \
$internalRuntimeDownloadArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "6.0.100-preview.6.21271.8"
"version": "6.0.100-preview.6.21355.2"
},
"tools": {
"dotnet": "6.0.100-preview.6.21271.8",
"dotnet": "6.0.100-preview.6.21355.2",
"runtimes": {
"dotnet": [
"3.1.16",
Expand All @@ -16,7 +16,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21366.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21366.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21373.11"
}
}

0 comments on commit 8113419

Please sign in to comment.