Merge pull request #1332 from microsoft/dev/andarno/libtemplateUpdate

Merge latest Library.Template

Author: AArnott

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.305",
+    "version": "9.0.306",
     "rollForward": "patch",
     "allowPrerelease": false
   },

tools/variables/InsertJsonValues.ps1

@@ -8,11 +8,25 @@ $BasePath = "$PSScriptRoot\..\..\bin\Packages\$BuildConfiguration\Vsix"
 
 if (Test-Path $BasePath) {
     $vsmanFiles = @()
-    Get-ChildItem $BasePath *.vsman -Recurse -File |% {
+    Get-ChildItem $BasePath *.vsman -Recurse -File | % {
         $version = (Get-Content $_.FullName | ConvertFrom-Json).info.buildVersion
+        $fullPath = (Resolve-Path $_.FullName).Path
+        $basePath = (Resolve-Path $BasePath).Path
+        # Cannot use RelativePath or GetRelativePath due to Powershell Core v2.0 limitation
+        if ($fullPath.StartsWith($basePath, [StringComparison]::OrdinalIgnoreCase)) {
+            # Get the relative paths then make sure the directory separators match URL format.
+            $rfn = $fullPath.Substring($basePath.Length).TrimStart('\', '/').Replace('\', '/')
+        }
+        else {
+            $rfn = $fullPath  # fallback to full path if it doesn't start with base path
+        }
+
         $fn = $_.Name
-        $vsmanFiles += "$fn{$version}=https://vsdrop.corp.microsoft.com/file/v1/$vstsDropNames;$fn"
+
+        # The left side is filename followed by the version and the right side is the drop url and the relative filename
+        $thisVsManFile = "$fn{$version}=https://vsdrop.corp.microsoft.com/file/v1/$vstsDropNames;$rfn"
+        $vsmanFiles += $thisVsManFile
     }
 
-    [string]::join(',',$vsmanFiles)
+    [string]::join(',', $vsmanFiles)
 }