Merge branch 'stevencohn:main' into main

weissm · Oct 9, 2023 · 65eaa7b · 65eaa7b
2 parents 93bc5d7 + 8588c91
commit 65eaa7b
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/update-sdk.ps1 b/update-sdk.ps1
@@ -50,7 +50,8 @@ Begin
 
     function GetSDKVersion
     {
-        $script:netpath = [System.Runtime.InteropServices.RuntimeEnvironment]::GetRuntimeDirectory()
+        # use powershell explicitly because pwsh will return wrong path
+        $script:netpath = (powershell -c '[System.Runtime.InteropServices.RuntimeEnvironment]::GetRuntimeDirectory()')
 
         $0 = 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots'
         if (!(Test-Path $0))
@@ -69,9 +70,6 @@ Begin
     {
         $updated = $false
 
-        $fullpath = $kitsroot; 'UnionMetadata', $sdkver, 'Windows.winmd' | `
-            ForEach-Object { $fullpath = Join-Path $fullpath $_ }
-
         $lines = @(Get-Content $csproj)
 
         for ($i =0; $i -lt $lines.Count; $i++)
@@ -93,24 +91,20 @@ Begin
                     WriteOK 'NET Framework path is already correct'
                 }
             }
-            # $matches[1]=sdkpath, $matches[2]==version
+            # $matches[1]=sdkpath, $matches[2]=version
             elseif ($line -match '<HintPath>(.+\\)UnionMetadata\\(\d+\.\d+\.\d+\.\d+)\\Windows.winmd</HintPath>')             
             {
-                $p = [System.IO.Path]::GetFullPath($basePath + $matches[1])
-
-                if ((!(Test-Path $p)) -or $forceBase)
+                $p = "$($matches[1])UnionMetadata\\$($matches[2])\\Windows.winmd"
+                if (($matches[2] -ne $sdkver) -or ![System.IO.Path]::Exists($p))
                 {
-                    # replace relative path with absolute path
-                    WriteOK "applying full path to Windows SDK: $fullpath"
+                    # always forces base
+                    $fullpath = $kitsroot; 'UnionMetadata', $sdkver, 'Windows.winmd' | `
+                        foreach { $fullpath = Join-Path $fullpath $_ }
+
+                    WriteOK "patching Windows SDK path: $fullpath"
                     $lines[$i] = "<HintPath>$fullpath</HintPath>"
                     $handled = $true
                 }
-                elseif ($matches[2] -ne $sdkver)
-                {
-                    WriteOK "patching Windows SDK version: $sdkver"
-                    $lines[$i] = $line.Replace($matches[2], $sdkver)
-                    $handled = $true
-                }
                 else
                 {
                     WriteOK 'Windows SDK is already correct'