add clarifying comments; move source-build RID prop in CI

Author: oleksandr-didyk

azure-pipelines.yml

@@ -145,7 +145,7 @@ stages:
           steps:
           - checkout: self
             clean: true
-          - script: eng/cibuild.sh --configuration $(_BuildConfig) --prepareMachine /p:SourceBuildIntermediateNupkgRid='linux-x64'
+          - script: eng/cibuild.sh --configuration $(_BuildConfig) --prepareMachine
             displayName: Build and Test
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

eng/Versions.props

@@ -9,13 +9,13 @@
     <!-- Opt-in repo features -->
     <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
     <UsingToolSymbolUploader>true</UsingToolSymbolUploader>
-    <!-- latest versions -->
-    <MicrosoftBuildVersion>16.8.0</MicrosoftBuildVersion>
-    <MicrosoftBuildTasksCoreVersion>16.8.0</MicrosoftBuildTasksCoreVersion>
+    <!-- latest versions auto-updated by Maestro/Darc tooling -->
     <MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
     <MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22627.1</MicrosoftDotNetXliffTasksVersion>
     <SystemTextJsonVersion>8.0.0-alpha.1.22631.1</SystemTextJsonVersion>
     <!-- Pinned versions -->
+    <MicrosoftBuildVersion>16.8.0</MicrosoftBuildVersion>
+    <MicrosoftBuildTasksCoreVersion>16.8.0</MicrosoftBuildTasksCoreVersion>
     <MicrosoftTeamFoundationServerExtendedClientVersion>19.210.0-preview</MicrosoftTeamFoundationServerExtendedClientVersion>
     <NuGetVersioningVersion>5.7.0</NuGetVersioningVersion>
     <SystemCommandLineVersion>2.0.0-beta1.20371.2</SystemCommandLineVersion>

eng/cibuild.sh

@@ -13,4 +13,5 @@ while [[ -h $source ]]; do
 done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
-. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci $@
+# SourceBuildIntermediateNupkgRid indicates to source-build that portable intermediates should be restored (required for runtime dependency)
+. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci /p:SourceBuildIntermediateNupkgRid="linux-x64" "$@"

src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj

@@ -6,7 +6,8 @@
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <DebugType>none</DebugType>
     <GenerateDependencyFile>false</GenerateDependencyFile>
-    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings> <!-- For System.Text.Json 8.x.y reference -->
+    <!-- For System.Text.Json 8.x.y reference. Caused and should be removed by https://github.com/dotnet/sourcelink/issues/938-->
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
 
     <!-- NuGet -->
     <IsPackable>true</IsPackable>