Skip to content

Commit 85f4dc6

Browse files
Remove workload support from build
1 parent 2301773 commit 85f4dc6

File tree

5 files changed

+1
-182
lines changed

5 files changed

+1
-182
lines changed

eng/Install-DotNetWorkloads.ps1

Lines changed: 0 additions & 165 deletions
This file was deleted.

eng/build-utils.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,6 @@ function Ensure-DotnetSdk() {
187187
throw "Could not find dotnet executable in $dotnetInstallDir"
188188
}
189189

190-
function InitializeDotNetWorkloads()
191-
{
192-
# Install any dotnet workloads specified in global.json
193-
& $PSScriptRoot\Install-DotNetWorkloads.ps1 `
194-
-globalJsonPath (Join-Path $RepoRoot 'global.json') `
195-
-nugetConfigPath (Join-Path $RepoRoot 'NuGet.config') | Out-Null
196-
}
197-
198190
# Walks up the source tree, starting at the given file's directory, and returns a FileInfo object for the first .csproj file it finds, if any.
199191
function Get-ProjectFile([object]$fileInfo) {
200192
Push-Location

eng/build.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,6 @@ try {
723723

724724
if ($restore) {
725725
&(Ensure-DotNetSdk) tool restore
726-
InitializeDotNetWorkloads
727726
}
728727

729728
try

eng/build.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,8 @@ if [[ "$restore" == true || "$test_core_clr" == true ]]; then
293293
install=true
294294
fi
295295
InitializeDotNetCli $install
296-
if [[ "$restore" == true ]]; then
296+
if [[ "$restore" == true && "$source_build" != true ]]; then
297297
dotnet tool restore
298-
299-
# Install any dotnet workloads specified in global.json
300-
dotnet tool run pwsh "$scriptroot/Install-DotNetWorkloads.ps1" \
301-
-globalJsonPath "$repo_root/global.json" \
302-
-nugetConfigPath "$repo_root/NuGet.config"
303298
fi
304299

305300
bootstrap_dir=""

eng/test-determinism.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,6 @@ try {
282282
$script:bootstrapConfiguration = "Release"
283283
$bootstrapDir = Make-BootstrapBuild
284284

285-
InitializeDotNetWorkloads
286-
287285
Run-Test
288286
exit 0
289287
}

0 commit comments

Comments
 (0)