Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ extends:
/p:ManifestBuildNumber=$(Build.BuildNumber)
/p:VisualStudioDropName=Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
/p:GenerateSbom=true
/p:RestoreInternalTooling=true

steps:
- task: NuGetCommand@2
Expand Down Expand Up @@ -203,6 +204,7 @@ extends:
-prepareMachine
-restore
-nobl
$(_BuildArgs)
name: Restore
displayName: Restore
condition: succeeded()
Expand Down
19 changes: 0 additions & 19 deletions eng/restore-internal-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,3 @@
packageType: runtime
version: 3.1.28
installationPath: '$(Build.SourcesDirectory)\.dotnet'

# Needed because the build fails the NuGet Tools restore without it
- task: UseDotNet@2
displayName: 'Use .NET Core sdk'
inputs:
packageType: sdk
useGlobalJson: true
workingDirectory: '$(Build.SourcesDirectory)'

# Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package
- task: NuGetCommand@2
displayName: Restore internal tools
inputs:
command: restore
feedsToUse: config
restoreSolution: 'eng\common\internal\Tools.csproj'
nugetConfigPath: 'NuGet.config'
restoreDirectory: '$(Build.SourcesDirectory)\.packages'