Skip to content

Commit fe0a258

Browse files
committed
Stop using custom version of SDK in source build
1 parent 9ae2545 commit fe0a258

File tree

2 files changed

+0
-31
lines changed

2 files changed

+0
-31
lines changed

.azure/pipelines/ci.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -504,16 +504,6 @@ jobs:
504504
chmod +x $HOME/bin/jq
505505
echo "##vso[task.prependpath]$HOME/bin"
506506
displayName: Install jq
507-
- task: UseDotNet@2
508-
displayName: 'Use .NET Core sdk'
509-
inputs:
510-
packageType: sdk
511-
# The SDK version selected here is intentionally supposed to use the latest release
512-
# For the purpose of building Linux distros, we can't depend on features of the SDK
513-
# which may not exist in pre-built versions of the SDK
514-
version: 3.0.x
515-
installationPath: $(DotNetCoreSdkDir)
516-
includePreviewVersions: true
517507
- script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
518508
displayName: Run ci-source-build.sh
519509
- task: PublishBuildArtifacts@1

eng/scripts/ci-source-build.sh

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,6 @@ set -euo pipefail
99
scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1010
reporoot="$(dirname "$(dirname "$scriptroot")")"
1111

12-
# For local development, make a backup copy of this file first
13-
if [ ! -f "$reporoot/global.bak.json" ]; then
14-
mv "$reporoot/global.json" "$reporoot/global.bak.json"
15-
fi
16-
17-
# Detect the current version of .NET Core installed
18-
export SDK_VERSION=$(dotnet --version)
19-
echo "The ambient version of .NET Core SDK version = $SDK_VERSION"
20-
21-
# Update the global.json file to match the current .NET environment
22-
cat "$reporoot/global.bak.json" | \
23-
jq '.sdk.version=env.SDK_VERSION' | \
24-
jq '.tools.dotnet=env.SDK_VERSION' | \
25-
jq 'del(.tools.runtimes)' \
26-
> "$reporoot/global.json"
27-
28-
# Restore the original global.json file
29-
trap "{
30-
mv "$reporoot/global.bak.json" "$reporoot/global.json"
31-
}" EXIT
32-
3312
export DotNetBuildFromSource='true'
3413

3514
# Build repo tasks

0 commit comments

Comments
 (0)