Skip to content

Commit ccb49ae

Browse files
[main] Update dependencies from dotnet/arcade (#682)
[main] Update dependencies from dotnet/arcade - Bump .NET SDK in the bootstrap script
1 parent 34e0c0d commit ccb49ae

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

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="6.0.0-beta.21366.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21372.16">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
8+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</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.21372.16">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
12+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

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,9 +1,9 @@
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.21372.16",
7+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16"
88
}
99
}

tools/xharness-bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ chmod u+x "$dotnet_install"
3636
dotnet_dir="$here/.dotnet"
3737

3838
printf "Installing .NET SDK locally to \033[0;33m%s\033[0m..\n" "$dotnet_dir"
39-
$dotnet_install --install-dir "$dotnet_dir" --version "6.0.100-preview.4.21255.9"
39+
$dotnet_install --install-dir "$dotnet_dir" --version "6.0.100-preview.6.21355.2"
4040
echo 'dotnet installed'
4141

4242
export DOTNET_ROOT="$here/.dotnet"

0 commit comments

Comments
 (0)