Merge branch 'microbuild_staging' into microbuild

microsoft · May 1, 2024 · 3509e4b · 3509e4b
2 parents 8f3f283 + dfd8a82
commit 3509e4b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 23 deletions.
diff --git a/azure-pipelines/OptProf.yml b/azure-pipelines/OptProf.yml
@@ -75,7 +75,7 @@ stages:
         targetType: filePath
         filePath: $(Agent.TempDirectory)/Variables-Windows/_pipelines.ps1
     - task: NuGetCommand@2
-      displayName: Push CoreXT packages to VS feed
+      displayName: Push VS-repo packages to VS feed
       inputs:
         command: push
         packagesToPush: $(Agent.TempDirectory)/VSInsertion-Windows/*.nupkg

diff --git a/azure-pipelines/artifacts/VSInsertion.ps1 b/azure-pipelines/artifacts/VSInsertion.ps1
@@ -28,7 +28,7 @@ $result = @{
 }
 
 if ($env:IsOptProf) {
-    $CoreXTPackages = "$RepoRoot/bin/Packages/$BuildConfiguration/CoreXT"
+    $VSRepoPackages = "$RepoRoot/bin/Packages/$BuildConfiguration/VSRepo"
 
     $ArtifactBasePath = "$RepoRoot\obj\_artifacts"
     $ArtifactPath = "$ArtifactBasePath\VSInsertion"
@@ -47,12 +47,12 @@ if ($env:IsOptProf) {
         # ultimately resulting in a failure of the optprof run.
         $InsertionMetadataVersion += '.' + $env:BUILD_BUILDID
     }
-    & (& "$PSScriptRoot\..\Get-NuGetTool.ps1") pack "$PSScriptRoot\..\InsertionMetadataPackage.nuspec" -OutputDirectory $CoreXTPackages -BasePath $ArtifactPath -Version $InsertionMetadataVersion | Out-Null
+    & (& "$PSScriptRoot\..\Get-NuGetTool.ps1") pack "$PSScriptRoot\..\InsertionMetadataPackage.nuspec" -OutputDirectory $VSRepoPackages -BasePath $ArtifactPath -Version $InsertionMetadataVersion | Out-Null
     if ($LASTEXITCODE -ne 0) {
         exit $LASTEXITCODE
     }
 
-    $result["$CoreXTPackages"] = (Get-ChildItem "$CoreXTPackages\LibraryName.VSInsertionMetadata.$InsertionMetadataVersion.nupkg");
+    $result["$VSRepoPackages"] = (Get-ChildItem "$VSRepoPackages\LibraryName.VSInsertionMetadata.$InsertionMetadataVersion.nupkg");
 }
 
 $result
diff --git a/azure-pipelines/dotnet.yml b/azure-pipelines/dotnet.yml
@@ -17,7 +17,7 @@ steps:
     condition: and(succeeded(), ${{ parameters.RunTests }})
 
 - ${{ if parameters.IsOptProf }}:
-  # We have to artifically run this script so that the extra .nupkg is produced for variables/InsertConfigValues.ps1 to notice.
+  # We have to artifically run this script so that the extra .nupkg is produced for variables/InsertPropsValues.ps1 to notice.
   - powershell: azure-pipelines\artifacts\VSInsertion.ps1
     displayName: 🔧 Prepare VSInsertion artifact
 

diff --git a/azure-pipelines/variables/InsertConfigValues.ps1 b/azure-pipelines/variables/InsertConfigValues.ps1
diff --git a/azure-pipelines/variables/InsertPropsValues.ps1 b/azure-pipelines/variables/InsertPropsValues.ps1
@@ -1,2 +1,14 @@
-# These values are commonly the same.
-& "$PSScriptRoot/InsertConfigValues.ps1"
+$InsertedPkgs = (& "$PSScriptRoot\..\artifacts\VSInsertion.ps1")
+
+$icv=@()
+foreach ($kvp in $InsertedPkgs.GetEnumerator()) {
+    $kvp.Value |% {
+        if ($_.Name -match "^(.*?)\.(\d+\.\d+\.\d+(?:\.\d+)?(?:-.*?)?)(?:\.symbols)?\.nupkg$") {
+            $id = $Matches[1]
+            $version = $Matches[2]
+            $icv += "$id=$version"
+        }
+    }
+}
+
+Write-Output ([string]::join(',',$icv))
diff --git a/azure-pipelines/vs-insertion.yml b/azure-pipelines/vs-insertion.yml
@@ -41,7 +41,7 @@ extends:
           artifact: VSInsertion-Windows
           displayName: 🔻 Download VSInsertion-Windows artifact
         - task: 1ES.PublishNuget@1
-          displayName: 📦 Push CoreXT packages to VS feed
+          displayName: 📦 Push VS-repo packages to VS feed
           inputs:
             packagesToPush: '$(Pipeline.Workspace)/CI/VSInsertion-Windows/*.nupkg'
             packageParentPath: $(Pipeline.Workspace)/CI/VSInsertion-Windows

diff --git a/azure-pipelines/vs-validation.yml b/azure-pipelines/vs-validation.yml
@@ -62,7 +62,7 @@ extends:
           artifact: VSInsertion-Windows
           displayName: 🔻 Download VSInsertion-Windows artifact
         - task: 1ES.PublishNuget@1
-          displayName: 📦 Push CoreXT packages to VS feed
+          displayName: 📦 Push VS-repo packages to VS feed
           inputs:
             packagesToPush: '$(Pipeline.Workspace)/VSInsertion-Windows/*.nupkg'
             packageParentPath: $(Pipeline.Workspace)/VSInsertion-Windows