Filter VSInsertionMetadata from default.config world

Author: AArnott

azure-pipelines/variables/InsertConfigValues.ps1

@@ -3,7 +3,8 @@ $InsertedPkgs = (& "$PSScriptRoot\..\artifacts\VSInsertion.ps1")
 $icv=@()
 foreach ($kvp in $InsertedPkgs.GetEnumerator()) {
     $kvp.Value |% {
-        if ($_.Name -match "^(.*?)\.(\d+\.\d+\.\d+(?:\.\d+)?(?:-.*?)?)(?:\.symbols)?\.nupkg$") {
+        # Skip VSInsertionMetadata packages for default.config world, which doesn't use it any more.
+        if (($_.Name -match "^(.*?)\.(\d+\.\d+\.\d+(?:\.\d+)?(?:-.*?)?)(?:\.symbols)?\.nupkg$") -and $_.Name -notmatch 'VSInsertionMetadata') {
             $id = $Matches[1]
             $version = $Matches[2]
             $icv += "$id=$version"

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))