Install dotnet SDK during integration runs

dotnet · May 31, 2020 · 527b5f2 · 527b5f2
1 parent cc17cf1
commit 527b5f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 36 deletions.
diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
@@ -50,6 +50,12 @@ jobs:
         _sha: "9099ad2f6e5936ecdf549f88394b5a59fa75c869"
   timeoutInMinutes: 20
   steps:
+    - task: UseDotNet@2
+      displayName: 'Install .NET Core SDK 3.1.300'
+      inputs:
+        packageType: 'sdk'
+        version: '3.1.300'
+
     - script: eng\integration-test.cmd -repo '$(_repo)' -sha '$(_sha)' -testPath '$(Build.SourcesDirectory)\temp' -stage 'prepare'
       displayName: Prepare $(_repoName) for formatting
 

diff --git a/eng/format-verifier.ps1 b/eng/format-verifier.ps1
@@ -39,6 +39,11 @@ try {
         .\eng\common\Build.ps1 -restore
     }
 
+    if ($stage -eq "format-folder" -or $stage -eq "format-workspace") {
+        Write-Output "$(Get-Date) - Running dotnet-format Build.ps1 -restore"
+        iex "$currentLocation\eng\common\Build.ps1 -restore"
+    }
+
     if ($stage -eq "prepare" -or $stage -eq "format-workspace") {
         Write-Output "$(Get-Date) - Finding solutions."
         $solutions = Get-ChildItem -Filter *.sln -Recurse -Depth 2 | Select-Object -ExpandProperty FullName | Where-Object { $_ -match '.sln$' }

diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1