Merge pull request #749 from SteveL-MSFT/use-msrustup

Change build to prefer msrustup

Author: SteveL-MSFT

.pipelines/DSC-Official.yml

@@ -207,7 +207,7 @@ extends:
             apt -y install gcc-multilib
             apt -y install libssl-dev
             apt -y install pkg-config
-            rustup default stable-aarch64-unknown-linux-musl
+            msrustup default stable-aarch64-unknown-linux-musl
             if ((openssl version -d) -match 'OPENSSLDIR: "(?<dir>.*?)"') {
               $env:OPENSSL_LIB_DIR = $matches['dir']
             }

build.ps1

@@ -124,14 +124,14 @@ function Find-LinkExe {
 }
 
 $channel = 'stable'
-if ($null -ne (Get-Command rustup -ErrorAction Ignore)) {
-    $rustup = 'rustup'
-} elseif ($null -ne (Get-Command msrustup -ErrorAction Ignore)) {
+if ($null -ne (Get-Command msrustup -CommandType Application -ErrorAction Ignore)) {
     $rustup = 'msrustup'
     $channel = 'ms-stable'
     if ($architecture -eq 'current') {
         $env:MSRUSTUP_TOOLCHAIN = "$architecture"
     }
+} elseif ($null -ne (Get-Command rustup -CommandType Application -ErrorAction Ignore)) {
+        $rustup = 'rustup'
 } else {
     $rustup = 'echo'
 }