Move libraries internal restore before repo restore, produce a restore binlog and...

* Move libraries internal restore before repo restore, produce a restore binlog and increase verbosity

* Use SDK from global.json

diff --git a/eng/pipelines/common/restore-internal-tools.yml b/eng/pipelines/common/restore-internal-tools.yml
index 50cae78..b04b6e0 100644 (file)
--- a/eng/pipelines/common/restore-internal-tools.yml
+++ b/eng/pipelines/common/restore-internal-tools.yml
@@ -24,4 +24,4 @@ steps:
       projects: 'eng/common/internal/Tools.csproj'
       nugetConfigPath: 'eng/internal/NuGet.config'
       restoreDirectory: '$(Build.SourcesDirectory)\.packages'
-      verbosityRestore: 'normal'
\ No newline at end of file
+      verbosityRestore: 'diagnostic'
\ No newline at end of file

diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
index 9da0c6f..cbbd735 100644 (file)
--- a/eng/pipelines/libraries/build-job.yml
+++ b/eng/pipelines/libraries/build-job.yml
@@ -85,13 +85,13 @@ jobs:
               ./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
             displayName: Install Emscripten
 
-        - script: $(_buildScript) -restore $(_buildArguments) $(_skipTestRestoreArg)
-          displayName: Restore
-
         - ${{ if eq(parameters.isOfficialBuild, true) }}:
           - template: /eng/pipelines/common/restore-internal-tools.yml
             parameters:
-              installDotnet: false
+              installDotnet: true
+
+        - script: $(_buildScript) -restore $(_buildArguments) $(_skipTestRestoreArg) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Restore.binlog
+          displayName: Restore
 
         - script: $(_buildScript)
                 $(_buildAction)