Reworked asset comparison (#47428)

Author: mmitche

eng/CompareVMRArtifactsToManifest.ps1

@@ -1,10 +1,27 @@
 steps:
-- task: DownloadBuildArtifacts@1
-  inputs:
-    artifactName: 'AssetManifests'
-    downloadPath: '$(Build.ArtifactStagingDirectory)\AssetManifests'
-    checkDownloadedFiles: true
+- task: DownloadPipelineArtifact@2
   displayName: Download Asset Manifest
+  continueOnError: true
+  enabled: true
+  inputs:
+    artifact: AssetManifests
+    downloadPath: '$(Build.ArtifactStagingDirectory)/AssetManifests'
+
+- task: DownloadPipelineArtifact@2
+  displayName: Download Blob Artifacts
+  continueOnError: true
+  enabled: true
+  inputs:
+    artifact: BlobArtifacts
+    downloadPath: '$(Build.ArtifactStagingDirectory)/vmr-assets/BlobArtifacts'
+
+- task: DownloadPipelineArtifact@2
+  displayName: Download Package Artifacts
+  continueOnError: true
+  enabled: true
+  inputs:
+    artifact: PackageArtifacts
+    downloadPath: '$(Build.ArtifactStagingDirectory)/vmr-assets/PackageArtifacts'
 
 - powershell: $(Build.SourcesDirectory)\eng\common\darc-init.ps1 -toolpath $(Build.SourcesDirectory)\artifacts\tools\darc
   displayName: Install darc
@@ -17,14 +34,20 @@ steps:
     scriptType: 'pscore'
     scriptLocation: 'scriptPath'
     scriptPath: $(Build.SourcesDirectory)\src\sdk\eng\GatherDrops.ps1
-    arguments: -filePath '$(Build.SourcesDirectory)\src\source-manifest.json' -outputPath '$(Build.ArtifactStagingDirectory)\assets\'
+    arguments: -filePath '$(Build.SourcesDirectory)\src\source-manifest.json' -outputPath '$(Build.ArtifactStagingDirectory)\base-assets\'
       -darcPath '$(Build.SourcesDirectory)\artifacts\tools\darc\darc.exe' -githubPat $(BotAccount-dotnet-bot-repo-PAT) -azdevPat $(dn-bot-all-drop-rw-code-rw-release-all)
 
 - task: PowerShell@2
   inputs:
-    filePath: $(Build.SourcesDirectory)\src\sdk\eng\CompareVMRArtifactsToManifest.ps1
-    arguments: -manifestPath '$(Build.ArtifactStagingDirectory)\AssetManifests\MergedManifest.xml' -assetBasePath '$(Build.ArtifactStagingDirectory)\assets\'
-      -outputFilePath '$(Build.SourcesDirectory)\artifacts\AssetBaselines\'
+    filePath: $(Build.SourcesDirectory)\eng\common\build.ps1
+    arguments: -ci -projects $(Build.SourcesDirectory)\eng\tools\BuildComparer\BuildComparer.csproj -restore -build
+
+- script: $(Build.SourcesDirectory)\.dotnet\dotnet.exe
+    $(Build.SourcesDirectory)\artifacts\bin\BuildComparer\Debug\BuildComparer.dll
+    -vmrManifestPath "$(Build.ArtifactStagingDirectory)\AssetManifests\MergedManifest.xml"
+    -vmrAssetBasePath "$(Build.ArtifactStagingDirectory)\vmr-assets"
+    -msftAssetBasePath "$(Build.ArtifactStagingDirectory)\base-assets"
+    -report "$(Build.SourcesDirectory)\artifacts\AssetBaselines\BaselineComparison.xml"
   displayName: Validate Asset Baselines
 
 - task: 1ES.PublishPipelineArtifact@1
@@ -34,4 +57,4 @@ steps:
     path: $(Build.SourcesDirectory)\artifacts\AssetBaselines\
     artifactName: AssetBaselineFiles
     artifactType: Container
-    parallel: true
+    parallel: true

eng/pipelines/templates/steps/vmr-validate-asset-baseline.yml

@@ -8,6 +8,7 @@
     <clear />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

src/SourceBuild/content/NuGet.config

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>$(NetCurrent)</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>disable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.DotNet.VersionTools" />
+		<PackageReference Include="System.CommandLine" />
+	</ItemGroup>
+</Project>